commit-m 商品模块

App.vue

@@ -121,12 +121,6 @@
 							this.$api.navigateTo('/pages/authorization/authorization')
 						}
 					})
-					// if(uni.getStorageSync('_WX_State')){
-					// 	this.getWxAuthorize()
-					// }else{
-					// 	console.log(new Date +'用户未授权微信信息')
-					// 	this.$api.navigateTo('/pages/authorization/authorization')
-					// }	
 				},TIME)
 			},
 			diffTime(t){

h5/pages/activity/activity_mid.vue

@@ -248,12 +248,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',9)
-				// 	this.$api.navigateTo('/pages/login/login?type=0')
-				// }else{
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},	
 			toFixedFn(text){//处理小数点后两位数
 				return Number(text).toFixed(2);

pages/goods/cart.vue

@@ -245,12 +245,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$api.redirectTo('/pages/login/login?type=4')
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/goods/good-floor.vue

@@ -62,11 +62,6 @@
 						console.log(new Date +'用户未授权微信信息')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// }	
 			}
 			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{

pages/goods/goods-classify.vue

@@ -249,12 +249,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.SetScrollHeight()
 			this.InitOption(option)

pages/goods/instrument-details.vue

@@ -215,12 +215,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 		},
 		methods:{

pages/goods/product.vue

@@ -377,12 +377,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }
 			}
 			this.getWinHeight()
 		},
@@ -518,16 +512,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.$api.navigateTo('/pages/goods/cart')
-				// 	}else{
-				// 		this.$api.navigateTo('/pages/login/login?type=1')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
 				authorize.getSetting().then(res =>{
@@ -542,16 +526,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.showSpec(type);
-				// 	}else{
-				// 		this.$api.navigateTo('/pages/login/login?type=1')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
 				if(this.buyRetailPriceStep == 2){
@@ -656,14 +630,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',8)
-				// 	this.$store.commit('setLoginProductId',this.productID)
-				// 	this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

pages/login/bindOperator.vue

@@ -114,13 +114,6 @@
 					this.isUserInfo = true
 				}
 			})	
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-			// 	this.isUserInfo = true
-			// }	
 		},
 		methods:{
 			...mapMutations(['login','logout']),
@@ -186,12 +179,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.bindingWechatLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			},
 			getVerificationCode(){//图形验证
 				this.PublicService.GetImgVerifyCode().then(res => {

pages/login/binding.vue

@@ -252,12 +252,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// }	
 		}
 	}
 </script>

pages/login/login.vue

@@ -72,12 +72,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.AorganizationLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			AorganizationLogin(){
 				this.UserService.AorganizationLogin(this.params)
@@ -113,12 +107,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})	
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			}
 		},
 		onShow() {

pages/login/logincode.vue

@@ -86,9 +86,6 @@
 						wxLogin.wxLoginQuick()
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }
 			}
 		},
 		onShow() {

pages/login/register-supplier.vue

@@ -654,12 +654,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	wxLogin.wxLoginQuick()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-			// }	
 		}
 	}
 </script>

pages/login/register.vue

@@ -239,12 +239,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			}
 		},
 		onShow() {

pages/tabBar/cart/cart.vue

@@ -233,12 +233,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$api.redirectTo('/pages/login/login?type=4')
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/tabBar/home/index.vue

@@ -193,16 +193,6 @@
 						})
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.GetWxAuthorize()
-				// }else{
-				// 	this.$api.getComStorage('userInfo').then((resolve) =>{
-				// 		this.userID = resolve.userId ? resolve.userId :0;
-				// 		this.getHomeInformation()
-				// 	}).catch(error =>{
-				// 		this.getHomeInformation()
-				// 	})
-				// }
 			}
 		},
 		onPageScroll(e){//实时获取到滚动的值

pages/tabBar/user/user.vue

@@ -290,16 +290,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.$api.navigateTo(url)
-				// 	}else{
-				// 		this.$api.navigateTo('/pages/login/login?type=0')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},	
 			navigatorNex(url,type){
 				console.log(this.isWxAuthorize)
@@ -314,14 +304,6 @@
 						this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(!this.hasLogin){
-				// 		this.$api.navigateTo(url)
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
-				// }	
 			},		
 			showBadge(n){
 				let num ='';

search/pages/search/search-instrument.vue

@@ -80,12 +80,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord

search/pages/search/search-supplier.vue

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

search/pages/search/search.vue

@@ -224,12 +224,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.$api.getStorage().then((resolve) =>{
 				this.userId = resolve.userId ? resolve.userId : 0;

second/pages/product/product-details.vue

@@ -232,12 +232,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 		},
 		methods:{
@@ -303,14 +297,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',8)
-				// 	this.$store.commit('setLoginProductId',this.productID)
-				// 	this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

second/pages/product/product-list.vue

@@ -165,11 +165,6 @@
 						console.log(new Date +'用户未授权微信信息')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// }
 			}
 		},
 		methods:{

seller/pages/login/login.vue

@@ -104,12 +104,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.SellerLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			SellerLogin(){
 				this.SellerService.SellerLogin(this.params)
@@ -153,12 +147,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization?type=1')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// 	this.isSeller= true
-			// }	
 		}
 	}
 </script>

services/ajax.env.js

@@ -9,7 +9,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-	// 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'
 }
 export default URL_CONFIG

services/config.env.js

@@ -7,7 +7,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
-	// URL_CONFIG = 'https://core-b.caimei365.com'
-	URL_CONFIG = 'https://core.caimei365.com'
+	URL_CONFIG = 'https://core-b.caimei365.com'
+	// URL_CONFIG = 'https://core.caimei365.com'
 }
 export default URL_CONFIG

supplier/pages/login/share-info.vue

@@ -50,14 +50,6 @@
 					},2000)
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.infoMiniShipments();
-			// }else{
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=4')
-			// 	setTimeout(()=>{
-			// 		this.isRequest = true
-			// 	},2000)
-			// }	
 		},
 		methods:{
 			infoMiniShipments(){
@@ -111,13 +103,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.isRequest = false;
-			// 	this.infoMiniShipments();
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// }	
 		}
 	}
 </script>

supplier/pages/user/my-shop.vue

@@ -286,12 +286,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }
 			}
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{