111

pages.json

@@ -7,6 +7,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/user/scanCode",
+			"style": {
+				"navigationBarTitleText": "扫码"
+			}
+		},
 		{
 			"path": "pages/login/empower",
 			"style": {
@@ -31,12 +37,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/user/scanCode",
-			"style": {
-				"navigationBarTitleText": "扫码"
-			}
-		},
+		
 		{
 			"path": "pages/pay/pay",
 			"style": {

pages/login/iphoneLogin.vue

@@ -210,7 +210,7 @@
 					} else {
 						this.$http('km66MiniApp/sys/sendSms', {
 							phone: this.phone,
-							shopID:'1B43BADD-B670-4B27-B6C1-604523287EAF',
+							shopID:this.wxOpendata.shopID,
 						}, 'GET').then(res => {
 							this.isYzm = false;
 							/* uni.showToast({

pages/user/scanCode.vue

@@ -24,8 +24,17 @@
 			           console.log('条码内容：' + res.result);
 					   that.url=res.result;
 					   that.shopId=that.getHashQuery('shopId')
+					   if(that.shopId){
+						    that.gologin()
+					   }else{
+						   uni.showToast({
+						   	title: '请扫码正确的二维码',
+						   	icon: 'none',
+						   	duration: 3000
+						   });
+					   }
 					   console.log(that.shopId)
-					   that.gologin()
+					  
 			       }
 			   });
 		   },