Merge remote-tracking branch 'remotes/origin/developer' into developerA

App.vue

@@ -94,6 +94,7 @@
 						this.getWxAuthorize()
 					}else{
 						console.log(new Date +'用户未授权微信信息')
+						this.$api.navigateTo('/pages/authorization/authorization')
 					}	
 				},TIME)
 			},

pages/authorization/authorization.vue

@@ -62,7 +62,6 @@
 								self.WxGetUserInfo()
 							},
 							fail(err) {
-								console.log('新asdadsasda',err)	
 								self.$util.msg(err, 2000)
 							}
 						})

pages/goods/goods-classify.vue

@@ -245,6 +245,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			this.SetScrollHeight()

pages/goods/instrument-details.vue

@@ -210,6 +210,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 		},

pages/goods/product.vue

@@ -373,6 +373,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			this.getWinHeight()
@@ -410,24 +411,22 @@
 						this.retailPrice = this.product.retailPrice.toFixed(2);
 						this.buyRetailPrice = this.product.retailPrice;
 					}
+					
 					//处理下架商品和售罄商品
-					if(this.product.validFlag =='3' || this.product.validFlag =='10' || this.stock == 0 ){
+					
+					if(this.product.validFlag =='3' || this.product.validFlag =='10' || this.stock == 0 || this.product.price1TextFlag == "1"){
 						this.disabled = true
 						this.isNoneDisabled = true
-					}else{
-						this.disabled = false
-						this.isNoneDisabled = false
-						this.goodsData.disabledText = ''
-					}
-					if(this.product.price1TextFlag == "1"){
-						this.disabled = true
-					}
-					if(this.product.price1TextFlag == "2"){
-						if(this.userIdentity == 4){	
+					}else if(this.product.price1TextFlag == "2"){
+						if(this.userIdentity == 4){
 							this.disabled = true
 						}else{
 							this.disabled = false
 						}
+					}else{
+						this.disabled = false
+						this.isNoneDisabled = false
+						this.goodsData.disabledText = ''
 					}
 					this.goodsData.disabled = this.disabled
 					this.goodsData.isNoneDisabled = this.isNoneDisabled

pages/login/logincode.vue

@@ -82,12 +82,12 @@
 			InitAuthorize(){ //是否已授权 0:为取消授权 1:为已授权 2:为未操作
 				if(uni.getStorageSync('_WX_State')){
 					wxLogin.wxLoginQuick()
-				}	
+				}
 			}
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.params.unionId = resolve.unionId
+				this.params.unionId = resolve.unionId ? resolve.unionId : 0
 			})
 			this.InitAuthorize()
 		}

search/pages/search/search-instrument.vue

@@ -77,6 +77,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			if(option.keyWord){

search/pages/search/search-supplier.vue

@@ -116,6 +116,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			if(option.keyWord){

search/pages/search/search.vue

@@ -219,6 +219,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			this.$api.getStorage().then((resolve) =>{

second/pages/product/product-details.vue

@@ -227,6 +227,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 		},

services/ajax.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'

services/config.env.js

@@ -3,7 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //采美测试地址
 	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
+	// URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://core-b.caimei365.com'

supplier/pages/login/share-info.vue

@@ -95,6 +95,7 @@
 				this.infoMiniShipments();
 			}else{
 				console.log(new Date +'用户未授权微信信息')
+				this.$api.navigateTo('/pages/authorization/authorization')
 			}	
 		}
 	}

supplier/pages/user/my-shop.vue

@@ -281,6 +281,7 @@
 					wxLogin.wxLoginAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
+					this.$api.navigateTo('/pages/authorization/authorization')
 				}	
 			}
 			this.listQuery.id = this.supplierId = option.shopId