lilei il y a 2 ans
Parent
commit
1dd25c1aad
2 fichiers modifiés avec 38 ajouts et 30 suppressions
  1. 31 30
      pages/storeManage/storeAuth.vue
  2. 7 0
      store/index.js

+ 31 - 30
pages/storeManage/storeAuth.vue

@@ -5,7 +5,7 @@
 		</view>
 		</view>
 		<view class="login-form">
 		<view class="login-form">
 			<u-form v-if="!isRead" :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
 			<u-form v-if="!isRead" :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">
-				<u-form-item label="门头照片" required prop="storeImage">
+				<u-form-item label="门头照片" prop="storeImage">
 					<u-upload 
 					<u-upload 
 					@on-success="uploadStorePhoto" 
 					@on-success="uploadStorePhoto" 
 					@on-remove="removeStorePhoto" 
 					@on-remove="removeStorePhoto" 
@@ -32,11 +32,11 @@
 				<u-form-item label="门店名称" required prop="storeName">
 				<u-form-item label="门店名称" required prop="storeName">
 					<u-input v-model="form.storeName" maxlength="30" placeholder="请输入门店名称(最多30个字符)"/>
 					<u-input v-model="form.storeName" maxlength="30" placeholder="请输入门店名称(最多30个字符)"/>
 				</u-form-item>
 				</u-form-item>
-				<u-form-item label="所在地区" required prop="label">
+				<u-form-item label="所在地区" prop="label">
 					<u-input v-model="form.label" placeholder="请选择省市区" :disabled="true" @click="openAddress"/>
 					<u-input v-model="form.label" placeholder="请选择省市区" :disabled="true" @click="openAddress"/>
 					<Address ref="applyAddress" @onConfirm="areaConfirm"></Address>
 					<Address ref="applyAddress" @onConfirm="areaConfirm"></Address>
 				</u-form-item>
 				</u-form-item>
-				<u-form-item label="详细地址" required prop="addrDetail">
+				<u-form-item label="详细地址" prop="addrDetail">
 					<u-input type="textarea" maxlength="100" v-model="form.addrDetail" placeholder="请输入详细地址"/>
 					<u-input type="textarea" maxlength="100" v-model="form.addrDetail" placeholder="请输入详细地址"/>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item label="联系人姓名" required prop="contactName">
 				<u-form-item label="联系人姓名" required prop="contactName">
@@ -125,13 +125,13 @@
 					inviteName:''
 					inviteName:''
 				},
 				},
 				rules: {
 				rules: {
-					storeImage:[
-						{
-							required: true, 
-							message: '请选择门头照片', 
-							trigger: 'change'
-						}
-					],
+					// storeImage:[
+					// 	{
+					// 		required: true, 
+					// 		message: '请选择门头照片', 
+					// 		trigger: 'change'
+					// 	}
+					// ],
 					storeName: [
 					storeName: [
 						{ 
 						{ 
 							required: true, 
 							required: true, 
@@ -139,20 +139,20 @@
 							trigger: ['change','blur'],
 							trigger: ['change','blur'],
 						}
 						}
 					],
 					],
-					label: [
-						{
-							required: true, 
-							message: '请选择所在地区', 
-							trigger: 'change'
-						}
-					],
-					addrDetail: [
-						{
-							required: true, 
-							message: '请输入详细地址', 
-							trigger: 'change'
-						}
-					],
+					// label: [
+					// 	{
+					// 		required: true, 
+					// 		message: '请选择所在地区', 
+					// 		trigger: 'change'
+					// 	}
+					// ],
+					// addrDetail: [
+					// 	{
+					// 		required: true, 
+					// 		message: '请输入详细地址', 
+					// 		trigger: 'change'
+					// 	}
+					// ],
 					contactName: [
 					contactName: [
 						{
 						{
 							required: true, 
 							required: true, 
@@ -250,12 +250,13 @@
 			submitData(){
 			submitData(){
 				const _this = this
 				const _this = this
 				let obj = this.form
 				let obj = this.form
-				obj.addrProvince = this.areaIdArr[0]  //  省id
-				obj.addrCity = this.areaIdArr[1]  //  市id
-				obj.addrDistrict = this.areaIdArr[2]  //  区id
-				obj.addrProvinceName = this.labelArr[0]  //  省
-				obj.addrCityName = this.labelArr[1]  //  市
-				obj.addrDistrictName = this.labelArr[2]  //  区
+				obj.addrProvince = this.areaIdArr[0]||''  //  省id
+				obj.addrCity = this.areaIdArr[1]||''  //  市id
+				obj.addrDistrict = this.areaIdArr[2]||''  //  区id
+				obj.addrProvinceName = this.labelArr[0]||''  //  省
+				obj.addrCityName = this.labelArr[1]||''  //  市
+				obj.addrDistrictName = this.labelArr[2]||''  //  区
+				 
 				_this.loading = true
 				_this.loading = true
 				//  申请试用
 				//  申请试用
 				xprhStoreApply(obj).then(res => {
 				xprhStoreApply(obj).then(res => {

+ 7 - 0
store/index.js

@@ -152,6 +152,13 @@ const store = new Vuex.Store({
 							}
 							}
 						})						
 						})						
 					}
 					}
+				}else{
+					if(res.errCode == 'ACCOUNT_0001'){
+						context.commit('logout');
+						uni.navigateTo({
+							url: '/pages/login/login'
+						});
+					}
 				}
 				}
 			})
 			})
 		},
 		},