commit -m 修复用户模块问题

main.js

@@ -4,6 +4,9 @@ import App from './App'
 import './services/index.js'
 import * as Api from '@/common/config/caimeiApi.js'
 import * as Regs from '@/common/config/common.js'
+import { umtrackWxKey } from '@/utils/config.js'
+import uma from 'umtrack-wx';
+
 import { msg, modal,prePage } from'./utils/util'
 import cuCustom from './components/cm-custom/cu-custom.vue'
 import auCustom from './components/cm-custom/au-custom.vue'
@@ -25,10 +28,8 @@ Vue.prototype.$getStorage = function(key){
 /**
  * 友盟+小程序统计
  */
-// #ifdef MP-WEIXIN
-import { umtrackWxKey } from '@/utils/config.js'
-import uma from 'umtrack-wx';
 if(process.env.NODE_ENV != 'development'){
+// #ifdef MP-WEIXIN
 	uma.init({
 		appKey: umtrackWxKey, //由友盟分配的APP_KEY
 		// 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
@@ -44,8 +45,8 @@ if(process.env.NODE_ENV != 'development'){
 		Vue.prototype.$uma = uma;
 	}
 	Vue.use(uma);
-}
 // #endif
+}
 
 // Vue实例化
 Vue.config.productionTip = false
@@ -54,6 +55,7 @@ Vue.prototype.$store = store;
 Vue.prototype.$util = {msg,prePage,modal};
 Vue.prototype.$api = Api;
 Vue.prototype.$reg = Regs;
+
 App.mpType = 'app'
 
 const app = new Vue({

pages/login/apply.vue

@@ -146,7 +146,7 @@
 					<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>
+							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
 							   <text class="item-text">{{item.name}}</text>
 							</label>
 						</checkbox-group>
@@ -168,7 +168,7 @@
 					<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>
+							   <checkbox class="item-checkbox" :value="item.value" :checked="item.checked"></checkbox>
 							   <text class="item-text">{{item.name}}</text>
 							</label>
 						</checkbox-group>
@@ -919,7 +919,8 @@
 						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
-						  margin-left: 40rpx;
+						  margin-left: 20rpx;
+						  margin-bottom: 10rpx;
 						  box-sizing: border-box;
 						  // border: 1rpx solid #EFEFEF;
 						  float: left;
@@ -927,9 +928,24 @@
 							// display: none;
 						 //  }
 						}
+						.item-checkbox{
+							display: none;
+						}
+						.item-text{
+							border: 2rpx solid #e1e1e1;
+							display: inline-block;
+							font-size: 26rpx;
+							color: #999999;
+							padding: 0 30rpx;
+							border-radius: 28rpx;
+							line-height: 50rpx;
+							float: left;
+						}
 						.on {
-						  border-color: $color-system;
-						  color:$color-system;
+							.item-text{
+								border-color: $color-system;
+								color:$color-system;
+							}
 						}
 					}
 				}

pages/login/information.vue

@@ -149,7 +149,7 @@
 					<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>
+							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
 							   <text class="item-text">{{item.name}}</text>
 							</label>
 						</checkbox-group>
@@ -179,7 +179,7 @@
 					<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" :checked="item.checked"></checkbox>
+							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
 							   <text class="item-text">{{item.name}}</text>
 							</label>
 						</checkbox-group>
@@ -933,9 +933,24 @@
 						  box-sizing: border-box;
 						  float: left;
 						}
+						.item-checkbox{
+							display: none;
+						}
+						.item-text{
+							border: 2rpx solid #e1e1e1;
+							display: inline-block;
+							font-size: 26rpx;
+							color: #999999;
+							padding: 0 30rpx;
+							border-radius: 28rpx;
+							line-height: 50rpx;
+							float: left;
+						}
 						.on {
-						  border-color: $color-system;
-						  color:$color-system;
+							.item-text{
+								border-color: $color-system;
+								color:$color-system;
+							}
 						}
 					}
 				}

seller/pages/login/login.vue

@@ -81,9 +81,11 @@
 					this.$store.commit('updateStatus',response.data)
 					uni.setStorageSync('token',response.data.token)
 					uni.setStorageSync('unionId',response.data.unionId)
-					setTimeout(()=>{
-						this.$api.navigateTo('/seller/pages/index/index')
-					},1500)
+					if(response.data.userIdentity === 1){
+						setTimeout(()=>{
+							this.$api.navigateTo('/seller/pages/index/index')
+						},1500)
+					}
 				}).catch(error =>{
 					this.logout()
 					uni.setStorageSync('unionId',error.data.unionId)

seller/pages/order/order-list.vue

@@ -31,7 +31,7 @@
 						<view v-else class="tui-order-content">
 							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 								<view class="order-title">
-									<view class="order-title-name">{{order.clubName}}</view>
+									<view class="order-title-name">{{order.clubName ? order.clubName : ''}}</view>
 									<view class="order-title-t">
 										<view class="Rebate " v-if="order.rebateFlag==1">返佣</view>
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>

seller/pages/search/search-order.vue

@@ -30,7 +30,7 @@
 					<view v-else class="tui-order-content">
 						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 							<view class="order-title">
-								<view class="order-title-name">{{order.clubName}}</view>
+								<view class="order-title-name">{{order.clubName ? order.clubName : ''}}</view>
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>

supplier/pages/user/information.vue

@@ -415,12 +415,12 @@
 						this.params.operationLicence = shop.operationLicence;
 						this.params.hygienicLicense = shop.hygienicLicense;
 						this.params.taxLicense = shop.taxLicense;
-						this.HonorImagesList = response.data.honorCertification;
-						this.productImagesList = response.data.productCertification;
-						if( response.data.honorCertification!=''&& response.data.honorCertification!=null){
+						this.HonorImagesList = shop.honorCertification;
+						this.productImagesList = shop.productCertification;
+						if( shop.honorCertification!=''&& shop.honorCertification!=null){
 							this.params.honorCertification =this.HonorImagesList.toString()+',';
 						}
-						if( response.data.productCertification!=''&& response.data.productCertification!=null){
+						if( shop.productCertification!=''&& shop.productCertification!=null){
 							this.params.productCertification =this.productImagesList.toString()+',';
 						}
 						if(shop.mainProduct == "" || shop.mainProduct == null){