修改loading

env.js

@@ -10,8 +10,9 @@ export const IMG_URL = 'http://file.shopro.top' //全局网络图片地址变量
 export const MAP_KEY = '426ebc3f1bbaced***89ee6061a98'; //高德地图开发者Web服务key,逆坐标解析
 export const HAS_LIVE = false //后台是否开通直播权限,根据情况在manifest.json中，开启注释相应组件的引入，pages.json中打开直播
 // http://172.18.1.66:9001/api/a1/mall/homePage/mp?code={前端传入的code}
-export const MALL_ID ="189099911100589";
-export const COMPANY_ID ="20230328";
-export const APP_ID = "wx91fa336def077983"; //小程序APPID
-export const APP_KEY = "a20511dcfd6b07114afacbb482b2e7e0"; //appkey
+export const MALL_ID ="159339311100563";
+export const COMPANY_ID ="00000730";
+export const APP_ID = "wxa8257c2ee2213e3e"; //小程序APPID
+export const APP_KEY = "a20511dcfd6b07114afacbb482b2e7e0"; //勿改
+ 
  
\ No newline at end of file

manifest.json

@@ -54,10 +54,10 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx91fa336def077983",
+        "appid" : "wxa8257c2ee2213e3e",
         "setting" : {
             "urlCheck" : false,
-            "minified" : false,
+            "minified" : true,
             "es6" : true,
             "postcss" : false
         },

md.md

@@ -71,6 +71,7 @@ APPsecret：78e7f63bb15c8238c6baef7c393d0050
 企业id：00000775
 商城id：179480211100680
 
+下面这个是不是没用？
 APPID：wxbcd69823dff3146e
 appsecrect：b54c621093db1abcecac2882e42abb43
 商城id：101277511100685

pages/h5/index.vue

@@ -16,7 +16,9 @@
 		data() {
 			return {
 				webUrl:'',
-				appointPage:''
+				appointPage:'',
+				getMsg:"",
+				goodsId:''
 			}
 		} ,
 		onReady(){
@@ -24,9 +26,8 @@
 		},
 		methods:{
 			handleMsg(e){
-				// uni.navigateToMiniProgram({
-				// 	orderId: data.orderId,
-				// });
+				// this.getMsg = e.detail.data
+				// console.log('收到来自webview的消息：', e.detail.data);
 			},
 			saveMiniCode(){
 				let fsCode =  uni.getStorageSync('token');
@@ -34,7 +35,7 @@
 					if (!res.code && res.data) {
 						let code = res.data.sfCode;
 						let time = new Date().getTime();
-						this.webUrl= `${BASE_URL}/webpage/wxdist/index.html#/${this.appointPage?this.appointPage:""}?mallId=${MALL_ID}&companyId=${COMPANY_ID}&time=${time}&sfCode=${code}&authMode=force`
+						this.webUrl= `${BASE_URL}/webpage/wxdist/index.html#/${this.appointPage?this.appointPage:""}?mallId=${MALL_ID}&companyId=${COMPANY_ID}&time=${time}&sfCode=${code}&authMode=force&goodsId=${this.goodsId}`
 						console.log(this.webUrl)
 						console.log(this.webUrl)
 					}  
@@ -43,12 +44,25 @@
 			}
 		},
 		onLoad(option){
-			this.appointPage = option.appointPage;//指定页面
-			// uni.hideTabBar();
+			console.log("先拿到")
+			console.log(option)
+			this.appointPage = option.appointPage?option.appointPage:"";//指定页面
+			this.goodsId = option.goodsId
 			this.saveMiniCode();
 		},
+		// onShareAppMessage(res){
+		// 	let path = "pages/index/defalutScreen"
+		// 	if(this.getMsg){
+		// 		path = `pages/index/defalutScreen?${this.getMsg[0].action}`
+		// 	}
+		// 	return {
+		// 	  path: path
+		// 	}
+		// },
 		onLaunch(){
+			 
 		}
+		
 	
 	}
 </script>

pages/index/defalutScreen.vue

@@ -3,14 +3,14 @@
 		<view class="load">
 			<u-loading-page loading-color="#61b077" color="#61b077" :loading="loading"></u-loading-page>
 		</view>
-		<view class="screen-container">
+		<view class="screen-container" v-show="!loading">
 			<!-- 康喜日鲜 -->
 			<image class="bg" :src="defalutBg" mode="scaleToFill" />
 			<!-- 康喜生鲜 -->
 			<!-- <image class="bg" src="https://img.zhonghuihaotai.com/file_20230711101151AaeuQ.png" mode="scaleToFill" /> -->
 			<!-- :disabled="loading" -->
-			<button @click="enter" class="btn">
-				马上进入
+			<button  @click="enter" :disabled="butDis" class="btn"> 
+				{{butTips}}
 			</button>
 		</view>
 		<sh-privacy></sh-privacy>
@@ -40,9 +40,12 @@
 				unregistered: false,
 				checkSessionStatus: false,
 				loading: true,
-				companyId: "",
 				defalutBg: defalutBg,
-				showPrivacy:false
+				showPrivacy:false,
+				companyId:"" ,
+				butTips:"马上进入",
+				butDis:false,
+				path:"/pages/h5/index"
 			}
 		},
 		computed: {
@@ -52,9 +55,11 @@
 			...mapActions(['getPhoneNumber', 'registerInfoFn', 'authCheck', 'getUserInfo', 'enterprise']),
 			// 马上进入
 			enter() {
+				this.butTips="请稍候..."
+				this.butDis = true
 				if (this.unregistered && !this.loading) {
 					uni.navigateTo({
-						url: '/pages/h5/index',
+						url: this.path,
 					})
 				} else {
 					this.getInfoPhoneNumber()
@@ -66,8 +71,10 @@
 				if (register) { //注册成功
 					this.unregistered = true;
 					uni.navigateTo({
-						url: '/pages/h5/index',
+						url: this.path,
 					})
+				}else{
+					this.butDis = false
 				}
 			},
 			// 获取手机号
@@ -195,6 +202,8 @@
 		},
 		onHide() {},
 		onShow() {
+			this.butDis = false
+			this.butTips = "马上进入"
 			// uni.hideTabBar();
 		},
 		onReady() {
@@ -219,9 +228,19 @@
 				path: 'pages/index/defalutScreen'
 			}
 		},
-		onLoad(options) {
-
-
+		onLoad(option){
+			// console.log("分享过来的")
+			// console.log(this.$Route.query)
+			// console.log(this.$Route)
+			// console.log("结束拉.....")
+			// // fullPath: "/pages/index/defalutScreen?goodsId=9817&mallId=106975910000477&path=%2FdetailPage
+			// if(this.$Route.query.path == '/detailPage') {
+			// 	// if(this.$Route.fullPath.indexOf('detailPage') >-1) {
+			// 		this.path = `/pages/h5/index?appointPage=detailPage&goodsId=${this.$Route.query.goodsId}`
+			// 	// }
+			// }
+			// console.log(this.path)
+		 
 		}
 
 	}

shopro/store/modules/user.js

@@ -206,7 +206,7 @@ const actions = {
 						duration: 2000,
 						icon:'none'
 					});
-					reject(res.data);
+					reject(0);
 				}
 			})
 		})