代码提交

pages/index/confirmRescue.vue

@@ -217,9 +217,9 @@
 						 		   })
 						         } else if (res.cancel) {
 									// uni.hideLoading();
-						          /* uni.redirectTo({
+						           uni.redirectTo({
 						           		url:'../subPack/rescueOrderOrderDetail?id='+id
-						           }) */
+						           }) 
 						 		   
 						         }
 						     }

pages/index/index.vue

@@ -331,6 +331,7 @@
 				this.queryHomeCardList()
 				this.queryManagerInfo()
 			}else{
+				console.log("uniLogin")
 				this.uniLogin()
 			}
 			//版本更新
@@ -494,7 +495,12 @@
 							uni.navigateTo({
 								url:'receiveCoupon'
 							})
-						}
+						}else if(item.sortId==19){ //救援测试
+						 
+							 uni.navigateTo({
+							 	url:'rescue'
+							 }) 
+					   }
 						
 						else{
 							uni.showToast({

pages/index/rescue.vue

@@ -284,14 +284,14 @@
 				})
 			},
 			sure(){
-				if(!this.shopInfo){
+				 if(!this.shopInfo){
 					uni.showToast({
 						 title: this.msg||'暂未找到救援门店',
 						 icon:'none',
 						 duration: 3000
 					});
 					return false
-				}
+				} 
 				if(this.tabIndex==0){
 					const yy = new Date().getFullYear()
 					  const MM = (new Date().getMonth() + 1) < 10 ? '0' + (new Date().getMonth() + 1) : (new Date().getMonth() + 1)

pages/shop/wp.vue

@@ -59,8 +59,14 @@
 			//this.canvasW = uni.getSystemInfoSync().windowWidth
 			//this.canvasH = this.calculateCanvasHeight()
 			this.avatar=opt.img;
+			console.log(this.avatar.slice(0,5))
+			/* if(this.avatar.slice(0,5)=='https'){
+				
+			}else{
+			this.avatar=this.avatar.replace('http','https');
+			} */
 			this.time=opt.time
-			//this.avatar=this.avatar.replace('http','https');
+			
 			console.log(this.avatar)
 			this.nickname=opt.name;
 			

utils/common.js

@@ -72,8 +72,8 @@ function noMultipleClicks(methods, info) {
 
 function getExtStoreId(type){
 	try{
-		var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
-		 /* extConfig={
+	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
+		 	/* extConfig={
 		  	"shopId": "1F12DB68-D8E8-4B76-9E20-287ACB72889F",
 		  	"url":"https://apidms.66km.com",
 		  	"unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",