优化测试bug

components/cm-module/cm-seller/user.vue

@@ -18,7 +18,7 @@
 				<view class="user-order">
 					<view class="tab-title" @click="navigator('/seller/pages/order/order-list?listType=0')">
 						<text class="cell-tit">我的订单</text>
-						<text class="cell-more">查看全部</text>
+						<text class="cell-more">全部订单</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="order-section">

components/cm-module/orderDetails/orderInformation.vue

@@ -5,7 +5,7 @@
 			<view class="information-view num">
 				<view class="view-num">
 					<text class="bage-buss" v-if="orderData.orderSubmitType == 3">协销</text>
-					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 2">自主</text>
+					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text>
 					<text class="bage-text">订单编号：{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</text>
 				</view>
 			</view>

pages.json

@@ -190,7 +190,7 @@
 		},{
 			"path": "pages/login/logincode",
 			"style": {
-				"navigationBarTitleText": "授权登录"
+				"navigationBarTitleText": "邀请码登录"
 			}
 		},{
 			"path": "pages/login/login",

pages/goods/cart.vue

@@ -200,7 +200,7 @@
 					if(wxResponse == 1){
 						this.$api.redirectTo('/pages/login/login?type=4')
 					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
+						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})	
 			},
@@ -224,7 +224,7 @@
 					this.skeletonShow = false
 					this.$store.commit('updateAllNum',response.data.cartQuantity)
 					const responseData = response.data
-					if(responseData.pageDate.length > 0 && responseData.failureList.length > 0){
+					if(responseData.pageDate.length > 0 || responseData.failureList.length>0){
 						this.isEmpty =false
 					}else{
 						this.isEmpty =true

pages/login/bindwechat.vue

@@ -182,6 +182,7 @@
 						}
 						console.log(params)
 						bindingWechat(params).then(response =>{
+							this.storeUpdataeStatus(response.data)
 							wxLogin.wxLoginAuthorize()
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}).catch(error =>{
@@ -190,6 +191,11 @@
 					}
 				})
 			},
+			storeUpdataeStatus(data){
+				uni.setStorageSync('token',data.token)
+				this.$store.commit('updateStatus',data)
+				this.login(data);
+			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){
 				this.isUserInfo = false;

pages/login/logincode.vue

@@ -13,8 +13,8 @@
 				   placeholder="请输入邀请码"
 			/>
 		</view>
-		<view class="login-row"><text>免费注册</text></view>
-		<view class="login-btn"  @click="goLogin">登录</view>
+		<view class="login-row" @click.stop="this.$api.navigateTo('/pages/login/register')"><text>免费注册</text></view>
+		<view class="login-btn"  @click.stop="goLogin">登录</view>
 		<view class="login-btn-last" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
 	</view>
 </template>

pages/search/search-order.vue

@@ -33,7 +33,7 @@
 							<view class="order-title">
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 2">自主</text>
+									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
 								</view>
 								<view class="order-title-b">

pages/tabBar/cart/cart.vue

@@ -192,7 +192,7 @@
 					if(wxResponse == 1){
 						this.$api.redirectTo('/pages/login/login?type=4')
 					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
+						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})	
 			},
@@ -216,7 +216,7 @@
 					this.skeletonShow = false
 					this.$store.commit('updateAllNum',response.data.cartQuantity)
 					const responseData = response.data
-					if(responseData.pageDate.length > 0 && responseData.failureList.length > 0){
+					if(responseData.pageDate.length > 0 || responseData.failureList.length > 0){
 						this.isEmpty =false
 					}else{
 						this.isEmpty =true

pages/tabBar/home/home.vue

@@ -357,7 +357,6 @@
 			this.modallayer = false;
 			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 				if(res == 1){
-					
 					this.getWxAuthorize()
 				}
 			})			

pages/tabBar/user/user.vue

@@ -34,7 +34,7 @@
 				<view class="user-order">
 					<view class="tab-title" @click="navigator('/pages/user/order/order-list?state=0')">
 						<text class="cell-tit">我的订单</text>
-						<text class="cell-more">查看全部</text>
+						<text class="cell-more">全部订单</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="order-section">
@@ -138,6 +138,8 @@
 	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex'
 	import { personalInfo,cancelPrompt } from "@/api/use.js"
+	import { queryAfterSale } from "@/api/other.js"
+	
 	
 	export default{
 		components: {
@@ -185,7 +187,7 @@
 			}
 		},
 		onLoad(){
-
+			
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -237,6 +239,13 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
+			getPhone(){
+				queryAfterSale().then(response =>{
+					this.contactNumber = response.data.contactNumber
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
 			toPhone(){
 				uni.makePhoneCall({
 				    phoneNumber:this.contactNumber //仅为示例
@@ -322,6 +331,7 @@
 					this.getUserInfo()
 				})
 			}else{
+				this.getPhone()
 				this.$store.commit('updateAllNum',0)
 			}
 		}	
@@ -410,7 +420,6 @@
 		}
 		.header-icon{
 			flex: 2;
-			margin-right: 20rpx;
 			image{
 				float: right;
 				width: 128rpx;
@@ -458,12 +467,12 @@
 				.u-btn{
 					width: 160rpx;
 					height: 40rpx;
-					background: rgba(255,255,255,.5);
-					border-radius: 5rpx;
+					background: rgba(255,255,255,.8);
+					border-radius: 8rpx;
 					line-height: 40rpx;
 					text-align: center;
 					font-size: $font-size-24;
-					color: #FFFFFF;
+					color: $color-system;
 					display: block;
 					margin-top: 5rpx;
 					padding-left: 6rpx;

pages/user/order/order-list.vue

@@ -23,7 +23,7 @@
 								<view class="order-title">
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
-										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 2">自主</text>
+										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
 									</view>
 									<view class="order-title-b">

seller/pages/login/apply.vue

@@ -196,12 +196,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLike" >
-						<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLike" >
+							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -225,12 +227,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLikes">
-						<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLikes">
+							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -967,6 +971,9 @@ import { mapMutations } from 'vuex';
 							border-radius: 10rpx;
 							line-height: 88rpx;
 							text-align: center;
+							&.other{
+								width: 213rpx;
+							}
 							&.none{
 								color: #FFFFFF;
 								background: $btn-confirm;
@@ -985,6 +992,7 @@ import { mapMutations } from 'vuex';
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

seller/pages/login/information.vue

@@ -176,12 +176,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLike" >
-						<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLike" >
+							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -205,12 +207,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLikes">
-						<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLikes">
+							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -809,6 +813,7 @@
 						display: flex;
 						flex-flow: row wrap;
 						justify-content: space-between;
+						align-items: center;
 						&.btn{
 							margin: 0 auto;
 							margin-left: 116rpx;
@@ -829,6 +834,9 @@
 							border-radius: 10rpx;
 							line-height: 88rpx;
 							text-align: center;
+							&.other{
+								width: 213rpx;
+							}
 							&.none{
 								color: #FFFFFF;
 								background: $btn-confirm;
@@ -847,6 +855,7 @@
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

seller/pages/login/register.vue

@@ -163,12 +163,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLike" >
-						<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group  @change="chooseMaleLike" >
+							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -192,12 +194,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @change="chooseMaleLikes">
-						<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-						   <checkbox :value="item.value"></checkbox>
-						   <text class="item-text">{{item.name}}</text>
-						</label>
-				    </checkbox-group>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLikes">
+							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>
 				</view>	
 				<view class="register-from group btn">
 					<view class="content-class btn">
@@ -894,6 +898,7 @@
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

seller/pages/order/order-historylist.vue

@@ -26,7 +26,7 @@
 									<view class="order-title-name">这里是机构的名称</view>
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
-										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 2">自主</text>
+										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 									</view>
 									<view class="order-title-b">

seller/pages/order/order-list.vue

@@ -34,7 +34,7 @@
 									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
-										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 2">自主</text>
+										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 									</view>
 									<view class="order-title-b">

seller/pages/search/search-order.vue

@@ -33,7 +33,7 @@
 								<view class="order-title-name">这里是机构的名称</view>
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 2">自主</text>
+									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
 								</view>
 								<view class="order-title-b">