test

api/use.js

@@ -354,7 +354,7 @@ export function emailPassword(params) {
 	})
 }
 /**
- *跟换手机号
+ *修改手机号
  */
 export function changeMobile(params) {
 	return new Promise(function(resolve,reject) {

common/config/config.js

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

pages/tabBar/cart/cart.vue

@@ -7,7 +7,7 @@
 					<view class="goods-list">
 						<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
 							<view class="shoptitle">
-								<!--选择商店的全部商品 :disabled="isNnder"-->
+								<!--选择商店的全部商品"-->
 								<view class="checkbox-box" @click.stop="checkShop(item)">
 									<button class="checkbox iconfont" 
 											:class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']" 									
@@ -17,10 +17,7 @@
 								<view class="text">{{item.name}}</view> 
 							</view>
 							<view class="productlist">
-								<view 	class="goods-pros" 
-										v-for="(pros,idx) in item.productsList" 
-										:key="idx"														
-								>
+								<view 	class="goods-pros" v-for="(pros,idx) in item.productsList" :key="idx" >
 									<view class="goods-pros-t">
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)" :class="[pros.validFlag == '3' && !isshowDelbtn ?'disabled' : '']">
@@ -37,9 +34,9 @@
 											<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
 											<view class="productprice">
 												<!--使用过滤器对总价改变-->
-												<view 	class="price" 
-														:class="[pros.validFlag == '3' ?'disabled' : '']">
-														<text :class="[pros.validFlag == '3' ?'disabled' : 'money-sign']">￥</text>{{pros.retailPrice?pros.retailPrice.toFixed(2):''}}
+												<view class="price" :class="[pros.validFlag == '3' ?'disabled' : '']">
+													<text :class="[pros.validFlag == '3' ?'disabled' : 'money-sign']">￥</text>
+													{{pros.retailPrice?pros.retailPrice.toFixed(2):''}}
 												</view>
 												<view class="count" v-if="pros.validFlag == '2'"  :class="[isshowDelbtn ? 'none':'show']">
 													<view class="number-box">
@@ -198,7 +195,7 @@
 								invalidLength = 0;
 							item.productsList.forEach(pros => {
 								pros.shopID = item.shopID;
-								if(pros.validFlag == '3') {invalidLength++;}
+								if(pros.validFlag == '3' ) {invalidLength++;}
 							})
 							item.isDisabled = invalidLength === productsListLength;
 						})
@@ -264,9 +261,7 @@
 						if(pros.productsChecked && pros.validFlag != '3') {
 							productsCheckedLength++;
 						}
-						if(pros.validFlag == '3') {
-							disabledLength++;
-						}
+						if(pros.validFlag == '3') {disabledLength++;}
 					})
 				}
 				item.checked = productsCheckedLength === productsList.length - disabledLength;
@@ -401,7 +396,6 @@
 					this.processActivityPrice(pros)
 					this.isStock =false
 				}
-				
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},

pages/tabBar/home/home.vue

@@ -254,11 +254,7 @@
 					this.thirdModulesName= data.thirdModulesName
 					this.productsClassifyList = data.productsClassifyList
 					this.skeletonShow = false;
-					if(this.isWxAuthorize){
-						this.$store.commit('updateAllNum',data.shoppingCartCount)
-					}else{
-						this.$store.commit('updateAllNum',0)
-					}
+					this.$store.commit('updateAllNum',data.shoppingCartCount)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -360,6 +356,7 @@
 			this.modallayer = false;
 			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 				if(res == 1){
+					
 					this.getWxAuthorize()
 				}
 			})			

pages/user/operator/addoperator.vue

@@ -13,7 +13,7 @@
 			<view class="operator-text">
 				<view class="text-main">
 					<view>1. 添加运营人员后，运营人员会收到一条邀请码短信</view>
-					<view>2. 运营人员在微信搜索【采美采购商城】小程序，或者搜索关注【采美365网】，从底部菜单进入【采美采购商城】小程序</view>
+					<view>2. 运营人员在微信搜索【采美采购商城】小程序，或者搜索关注【采美365】公众号，从底部菜单进入【采美采购商城】小程序</view>
 					<view>3. 使用邀请码进行登录并绑定微信</view>
 					<view>4. 绑定后，运营人员可通过微信直接登录采美365网</view>
 				</view>

seller/pages/login/login.vue

@@ -7,12 +7,7 @@
 		</view>
 		<view class="login-form">
 			<view class="login-input">
-				<input type="text" 
-					   v-model="accountNumber"  
-					   maxlength="11" 
-					   class="input" 
-					   placeholder="请输入手机号"
-				/>
+				<input type="number" v-model="accountNumber"  maxlength="11" class="input" placeholder="请输入手机号"/>
 			</view>
 			<view class="login-input">
 				<input v-show="isShowEye" type="text" v-model="password"  maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
@@ -128,7 +123,7 @@
 						uni.setStorageSync('token',response.data.token)
 						uni.removeStorageSync('sessionid')
 						uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-						this.$api.navigateTo('/seller/pages/index/index')
+						this.$api.redirectTo('/seller/pages/index/index')
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

seller/pages/login/register.vue

@@ -299,21 +299,6 @@
 					});
 				})
 			},
-			registerCheckEmail(){
-				if(this.registerEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.registerEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				sellerClubCheck({mobileOrEmail:this.registerEmail}).then(response =>{
-					this.$util.msg(response.data,2000);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
 			registerCheckMobile(){
 				if( this.registerMobile == ''){
 					this.$util.msg('请输入手机号',2000);

seller/pages/order/order-history.vue

@@ -237,7 +237,7 @@
 					font-size: $font-size-24;
 					text-align: center;
 					color: #FFFFFF;
-					border-radius: 14rpx;
+					border-radius: 10rpx;
 					background: #166CE1;
 					margin-top: 24rpx;
 				}