APP样式兼容,跳转兼容

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"default" : 
      	{
      		"launchtype" : "local"

common/utils/requset.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-27 14:03:47
+ * @LastEditTime: 2022-04-27 21:37:21
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
@@ -11,8 +11,8 @@ import $store from '@/common/store';
 
 const ENV = 'prod';
 const BASE_URL = {
-	// 'test' : 'https://k8s-horse-gateway.mashibing.cn',
-	'test' : '',
+	'test' : 'https://k8s-horse-gateway.mashibing.cn',
+	'dev' : '',
 	'release' : '',
 	'prod' : '//like-gateway.mashibing.com'
 };
@@ -105,9 +105,15 @@ MsbRequestTk.use('request', (option) => {
 	const token = $store.state.token;
 	if(!token){
 		// 登录状态处理，没有token直接跳转至登录
-		const pages = getCurrentPages();
-		const page = pages[pages.length - 1];
-		page.$Router.replace('/login');
+		uni.redirectTo({
+			url: '/login',
+			success(res){
+				console.log(res,'s');
+			},
+			fail (e){
+				console.log(e,'e');
+			}
+		});
 		return Promise.reject({message:'要先登录才能操作哦~'});
 	}else{
 		option.header = {...option.header, Authorization:token};

components/UiPageHeader.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-25 10:11:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 15:36:57
+ * @LastEditTime: 2022-04-27 18:17:28
  * @Description: file content
 -->
 <template>
@@ -32,8 +32,16 @@ export default {
 </script>
 <style lang="scss" scoped>
 .header{
+
+	/*  #ifdef  H5  */
 	height: 88rpx;
 	padding: 0 40rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	height: 176rpx;
+	padding: 88rpx 40rpx 0;
+	/*  #endif  */
+	
 	display: flex;
 	justify-content: space-between;
 	align-items: center;

manifest.json

@@ -43,7 +43,9 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */

pages/account/index.vue

@@ -3,7 +3,7 @@
 	components: { UiCell },: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 19:40:24
+ * @LastEditTime: 2022-04-27 18:19:34
  * @Description: file content
 -->
 <template>
@@ -104,8 +104,16 @@ page{
 	background-size: 100%;
 }
 .header{
+	
+	/*  #ifdef  H5  */
 	height: 88rpx;
 	padding: 0 40rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	height: 176rpx;
+	padding: 88rpx 40rpx 0;
+	/*  #endif  */
+	
 	position: relative;
 	width: 100%;
 	&--msg{

pages/cart/components/PageCtx.vue

@@ -19,7 +19,7 @@
 		<BsEmpty v-if="!list.length && !isLoading" class="empty"
 			tips="去挑点喜欢的好货吧~">
 			<image slot="icon" class="empty--icon" src="@/static/goods/cart.png"></image>
-			<view slot="btn" class="empty--btn" @click="$Router.push('/')">去逛逛</view>
+			<view slot="btn" class="empty--btn" @click="$Router.pushTab('/')">去逛逛</view>
 		</BsEmpty>
 
 		<!-- 购物车商品列表 -->
@@ -50,7 +50,7 @@
 		
 		<template v-if="!isLoading">
 			<view class="title">为您推荐</view>
-			<BsChoiceGoods></BsChoiceGoods>
+			<!-- <BsChoiceGoods></BsChoiceGoods> -->
 		</template>
 
 		<!-- 底部操作栏 -->
@@ -142,6 +142,7 @@ export default {
 		 * 组件缺少onShow onLoad生命周期，提供一个open方法给页面及组件使用
 		 */
 		open(options) {
+			
 			// 获取购物车商品列表
 			this.getCartList();
 			this.isLoading = false;
@@ -154,6 +155,10 @@ export default {
 		 */
         async getCartList() {
 			this.isLoading = true;
+			// APP有Bug到拦截器里跳转不了 待研究问题
+			if(!this.$store.state.token){
+				uni.redirectTo({url: '/login'});
+			}
 			const {error, result} = await ApiGetCartList();
 			if(error){
 				uni.$u.toast(error.message);

pages/cart/tabBarCart.vue

@@ -11,14 +11,17 @@
 
 <script>
 import PageCtx from './components/PageCtx';
+import {ApiGetCartList} from '@/common/api/cart';
 export default {
 	components : {PageCtx},
 	onShow(){
 		this.$refs.page && this.$refs.page.open()
 	},
-	mounted(){
+	async mounted(){
 		this.$refs.page.open();
 		
+		// const {error, result} = await ApiGetCartList();
+		
 	}
 }
 </script>

pages/goods/category.vue

@@ -118,7 +118,14 @@ page {
 </style>
 <style lang="scss" scoped>
 .search{
+	/*  #ifdef  H5  */
+	height: 88rpx;
 	padding: 0 30rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	height: 176rpx;
+	padding: 88rpx 30rpx 0;
+	/*  #endif  */
 	background: $color-grey0;
 }
 .search--input{

pages/goods/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 14:07:04
+ * @LastEditTime: 2022-04-27 21:16:21
  * @Description: file content
 -->
 <template>
@@ -123,8 +123,6 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			result[0].stock = 0;
-			console.log(result);
 			this.skuInfoData = result;
 		},
 		/**
@@ -149,7 +147,14 @@ page{
 	width: 50rpx;
 	height: 50rpx;
 	left: 40rpx;
+
+	/*  #ifdef  H5  */
 	top: 40rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	top: 128rpx;
+	/*  #endif  */
+	
 	background: rgba($color: #000000, $alpha: .1);
 	z-index: 999;
 	border-radius: 50%;

pages/index/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 19:40:33
+ * @LastEditTime: 2022-04-27 16:56:16
  * @Description: file content
 -->
 <template>
@@ -120,12 +120,19 @@ page{
 	position: sticky;
 	top: var(--window-top);
 	z-index:999;
+	/*  #ifdef  H5  */
 	height: 88rpx;
+	padding: 0 30rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	height: 176rpx;
+	padding: 88rpx 30rpx 0;
+	/*  #endif  */
+	
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 	background: $color-blue5;
-	padding: 0 30rpx;
 }
 .logo{
 	width: 265rpx;

pages/login.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 15:36:46
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 10:19:42
+ * @LastEditTime: 2022-04-27 18:46:42
  * @Description: file content
 -->
 <template>
@@ -132,7 +132,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 .header{
+
+	/*  #ifdef  H5  */
 	height: 88rpx;
+	/*  #endif  */
+	/*  #ifndef  H5  */
+	height: 176rpx;
+	padding-top: 88rpx;
+	/*  #endif  */
+	
 	padding-left: 40rpx;
 	display: flex;
 	align-items: center;

unpackage/cache/apk/apkurl

@@ -0,0 +1 @@
+https://ide.dcloud.net.cn/build/download/6bf1de60-c602-11ec-a312-ef91de2103d2

unpackage/cache/certdata

@@ -0,0 +1,3 @@
+andrCertfile=/Applications/HBuilderX.app/Contents/HBuilderX/plugins/app-safe-pack/Test.keystore
+andrCertAlias=android
+andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/cache/wgt/__UNI__3FB31B6/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/cache/wgt/__UNI__3FB31B6/app-config-service.js

@@ -0,0 +1,8 @@
+
+var isReady=false;var onReadyCallbacks=[];
+var isServiceReady=false;var onServiceReadyCallbacks=[];
+var __uniConfig = {"pages":["pages/index/index","pages/login","pages/seckill","pages/goods/category","pages/goods/search","pages/goods/list/index","pages/goods/detail/index","pages/account/index","pages/cart/cart","pages/cart/tabBarCart","pages/account/setting/index","pages/account/setting/setUserInfo","pages/account/setting/setName","pages/account/address/list","pages/account/address/create","pages/account/address/edit","pages/order/submit","pages/order/list","pages/order/detail/index","pages/order/logisitcsInfo","pages/order/orderSuccess","pages/order/paySuccess","pages/order/payFail","pages/order/saleAfter/saleAfterList","pages/order/saleAfter/saleAfterDetail/index","pages/order/saleAfter/saleAfterSelect","pages/order/saleAfter/saleAfterApply","pages/order/saleAfter/saleAfterEdit","pages/account/message/group","pages/account/message/list"],"window":{"navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#BBBBBB","selectedColor":"#FF875B","backgroundColor":"#FFF","borderStyle":"#eee","fontSize":"24rpx","height":"120rpx","list":[{"pagePath":"pages/index/index","iconPath":"static/common/tabbar/home.png","selectedIconPath":"static/common/tabbar/home-active.png","text":"首页"},{"pagePath":"pages/goods/category","iconPath":"static/common/tabbar/category.png","selectedIconPath":"static/common/tabbar/category-active.png","text":"分类"},{"pagePath":"pages/cart/tabBarCart","iconPath":"static/common/tabbar/shopping-cart.png","selectedIconPath":"static/common/tabbar/shopping-cart-active.png","text":"购物车"},{"pagePath":"pages/account/index","iconPath":"static/common/tabbar/account.png","selectedIconPath":"static/common/tabbar/account-active.png","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"weex","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"马士兵严选","compilerVersion":"3.3.13","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选","backgroundColor":"#69ADE5"}},{"path":"/pages/login","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/seckill","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/goods/category","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/goods/search","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/goods/list/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/goods/detail/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/account/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/cart/cart","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/cart/tabBarCart","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom","navigationBarTitleText":"马士兵严选"}},{"path":"/pages/account/setting/index","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/account/setting/setUserInfo","meta":{},"window":{"navigationBarTitleText":"个人资料"}},{"path":"/pages/account/setting/setName","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"设置昵称"}},{"path":"/pages/account/address/list","meta":{},"window":{"navigationBarTitleText":"收货地址"}},{"path":"/pages/account/address/create","meta":{},"window":{"navigationBarTitleText":"新增收货地址"}},{"path":"/pages/account/address/edit","meta":{},"window":{"navigationBarTitleText":"编辑收货地址"}},{"path":"/pages/order/submit","meta":{},"window":{"navigationBarTitleText":"提交订单"}},{"path":"/pages/order/list","meta":{},"window":{"navigationBarTitleText":"我的订单"}},{"path":"/pages/order/detail/index","meta":{},"window":{"navigationBarTitleText":"订单详情","navigationBarBackgroundColor":"#F8F8F8"}},{"path":"/pages/order/logisitcsInfo","meta":{},"window":{"navigationBarTitleText":"物流详情","navigationBarBackgroundColor":"#F8F8F8"}},{"path":"/pages/order/orderSuccess","meta":{},"window":{"navigationBarTitleText":"交易成功"}},{"path":"/pages/order/paySuccess","meta":{},"window":{"navigationBarTitleText":"支付成功"}},{"path":"/pages/order/payFail","meta":{},"window":{"navigationBarTitleText":"支付失败"}},{"path":"/pages/order/saleAfter/saleAfterList","meta":{},"window":{"navigationBarTitleText":"售后订单"}},{"path":"/pages/order/saleAfter/saleAfterDetail/index","meta":{},"window":{"navigationBarTitleText":"售后详情","navigationBarBackgroundColor":"#F8F8F8"}},{"path":"/pages/order/saleAfter/saleAfterSelect","meta":{},"window":{"navigationBarTitleText":"申请售后"}},{"path":"/pages/order/saleAfter/saleAfterApply","meta":{},"window":{"navigationBarTitleText":"申请退款"}},{"path":"/pages/order/saleAfter/saleAfterEdit","meta":{},"window":{"navigationBarTitleText":"修改申请退款"}},{"path":"/pages/account/message/group","meta":{},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/account/message/list","meta":{},"window":{"navigationBarTitleText":"马士兵严选"}}];
+__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/cache/wgt/__UNI__3FB31B6/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

unpackage/cache/wgt/__UNI__3FB31B6/manifest.json

@@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__3FB31B6","name":"马士兵严选","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueStyleCompiler":"马士兵严选","compilerVersion":3,"distribute":{"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI3FB31B6","password":"","aliasname":"","keystore":"html5plus://test","custompermissions":true},"apple":{"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":["portrait-primary"],"icons":{"ios":{"prerendered":"false","iphone":{"app@2x":"","app@3x":"","spotlight@2x":"","spotlight@3x":"","settings@2x":"","settings@3x":"","notification@2x":"","notification@3x":""},"appstore":"","ipad":{"app":"","app@2x":"","proapp@2x":"","spotlight":"","spotlight@2x":"","settings":"","settings@2x":"","notification":"","notification@2x":""}},"android":{"hdpi":"","xhdpi":"","xxhdpi":"","xxxhdpi":""}},"splashscreen":{}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.3.13","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#BBBBBB","selectedColor":"#FF875B","backgroundColor":"#FFF","borderStyle":"#eee","fontSize":"24rpx","height":"120px","list":[{"pagePath":"pages/index/index","iconPath":"static/common/tabbar/home.png","selectedIconPath":"static/common/tabbar/home-active.png","text":"首页"},{"pagePath":"pages/goods/category","iconPath":"static/common/tabbar/category.png","selectedIconPath":"static/common/tabbar/category-active.png","text":"分类"},{"pagePath":"pages/cart/tabBarCart","iconPath":"static/common/tabbar/shopping-cart.png","selectedIconPath":"static/common/tabbar/shopping-cart-active.png","text":"购物车"},{"pagePath":"pages/account/index","iconPath":"static/common/tabbar/account.png","selectedIconPath":"static/common/tabbar/account-active.png","text":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"126770270804"}}