lilei 2 lat temu
rodzic
commit
f787f565b9

+ 2 - 1
pages/index/index.vue

@@ -22,7 +22,7 @@
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 您有待取货的货架订单哦!</view> <text class="text">立即处理>></text>
 			</view>
 			</view>
 			<!-- 门店审核不通过 -->
 			<!-- 门店审核不通过 -->
-			<view class="notices flex align_center" v-if="storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
+			<view class="notices flex" v-if="storeApply.auditStatus=='REFUSE'&&storeApply.readFlag=='0'">
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 				<view><u-icon name="volume" color="#f2a557" :size="28" :margin-right='15'></u-icon> 门店认证资料审核不通过,请重新提交审核!</view> <text class="text" @click="toKnow">知道了</text>
 			</view>
 			</view>
 			<!-- 名片 -->
 			<!-- 名片 -->
@@ -406,6 +406,7 @@
 				font-size: 1em;
 				font-size: 1em;
 				view{
 				view{
 					color: #ffaf46;
 					color: #ffaf46;
+					max-width: 80%;
 				}
 				}
 				.text{
 				.text{
 					color: #ffffff;
 					color: #ffffff;

+ 16 - 0
pages/morePage/morePage.vue

@@ -101,6 +101,7 @@
 		},
 		},
 		methods: {
 		methods: {
 			toPage(path){
 			toPage(path){
+				const _this = this
 				if(this.hasLogin){
 				if(this.hasLogin){
 					// 游客未认证
 					// 游客未认证
 					if(this.userInfo.sysUserFlag == '0'){
 					if(this.userInfo.sysUserFlag == '0'){
@@ -111,6 +112,21 @@
 								confirmText: '知道了',
 								confirmText: '知道了',
 								showCancel: false
 								showCancel: false
 							})
 							})
+						}
+						// 如果审核已通过
+						else if(this.storeApply.auditStatus=='PASS'){
+							uni.showModal({
+								title: '提示',
+								content: '门店认证审核已通过,请重新登录!',
+								confirmText: '去登录',
+								showCancel: false,
+								success() {
+									_this.$store.dispatch('userLogout');
+									uni.redirectTo({
+										url: '/pages/login/login'
+									});
+								}
+							})						
 						}else{
 						}else{
 							this.showPopup = true
 							this.showPopup = true
 						}
 						}

+ 14 - 8
pages/storeManage/storeAuth.vue

@@ -84,7 +84,7 @@
 			</u-form>
 			</u-form>
 		</view>
 		</view>
 		<view class="form-btn-con flex justify_center" v-if="!isRead">
 		<view class="form-btn-con flex justify_center" v-if="!isRead">
-			<u-button class="form-btn" shape="circle" type="info" :custom-style="{ background: '#066cff', color: '#fff',width:'350rpx' }" @click="formSubmit">提交审核</u-button>
+			<u-button class="form-btn" shape="circle" type="info" :loading="loading" :custom-style="{ background: '#066cff', color: '#fff',width:'350rpx' }" @click="formSubmit">提交审核</u-button>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -103,7 +103,7 @@
 		},
 		},
 		data(){
 		data(){
 			return{
 			return{
-				theme: '',
+				loading: false,
 				form: {
 				form: {
 					storeImage:'',
 					storeImage:'',
 					licenseImage:'',
 					licenseImage:'',
@@ -164,15 +164,13 @@
 				storePhotoList: [],
 				storePhotoList: [],
 				yyzzPhotoList: [],
 				yyzzPhotoList: [],
 				storeApply: null,
 				storeApply: null,
-				isRead: false,
+				isRead: true,
 				tipTit: ''
 				tipTit: ''
 			}
 			}
 		},
 		},
 		// 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
 		// 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
 		onReady() {
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 			this.$refs.uForm.setRules(this.rules);
-		},
-		onLoad() {
 			// 判断是否审核中
 			// 判断是否审核中
 			this.storeApply = this.$store.state.vuex_storeAuthInfo
 			this.storeApply = this.$store.state.vuex_storeAuthInfo
 			if(this.storeApply){
 			if(this.storeApply){
@@ -188,6 +186,7 @@
 			}else{
 			}else{
 				this.form.contactPhone = this.$store.state.vuex_userInfo.mobile
 				this.form.contactPhone = this.$store.state.vuex_userInfo.mobile
 				this.tipTit = ''
 				this.tipTit = ''
+				this.isRead = false
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -224,7 +223,7 @@
 					if(res.status == 200){
 					if(res.status == 200){
 						this.form.inviteName = res.data&&res.data.dealerName
 						this.form.inviteName = res.data&&res.data.dealerName
 					}else{
 					}else{
-						this.form.inviteCode = ''
+						// this.form.inviteCode = ''
 					}
 					}
 					uni.showToast({icon: 'none',title: res.message,duration:5000})
 					uni.showToast({icon: 'none',title: res.message,duration:5000})
 					uni.hideLoading()
 					uni.hideLoading()
@@ -242,6 +241,7 @@
 				});
 				});
 			},
 			},
 			submitData(){
 			submitData(){
+				const _this = this
 				let obj = this.form
 				let obj = this.form
 				obj.addrProvince = this.areaIdArr[0]  //  省id
 				obj.addrProvince = this.areaIdArr[0]  //  省id
 				obj.addrCity = this.areaIdArr[1]  //  市id
 				obj.addrCity = this.areaIdArr[1]  //  市id
@@ -249,14 +249,20 @@
 				obj.addrProvinceName = this.labelArr[0]  //  省
 				obj.addrProvinceName = this.labelArr[0]  //  省
 				obj.addrCityName = this.labelArr[1]  //  市
 				obj.addrCityName = this.labelArr[1]  //  市
 				obj.addrDistrictName = this.labelArr[2]  //  区
 				obj.addrDistrictName = this.labelArr[2]  //  区
+				_this.loading = true
 				//  申请试用
 				//  申请试用
 				xprhStoreApply(obj).then(res => {
 				xprhStoreApply(obj).then(res => {
 					console.log(res)
 					console.log(res)
+					uni.showToast({icon: 'none',title: res.message,duration:3000})
 					if(res.status == 200){
 					if(res.status == 200){
-						 uni.navigateBack()
 						 uni.$emit("updateAuthState")
 						 uni.$emit("updateAuthState")
+						 setTimeout(()=>{
+							 uni.navigateBack()
+							 _this.loading = false
+						 },3000)
+					}else{
+						_this.loading = false
 					}
 					}
-					uni.showToast({icon: 'none',title: res.message})
 				})
 				})
 			},
 			},
 			//  选择省区市
 			//  选择省区市

+ 2 - 2
pages/vinRecord/vinRecord.vue

@@ -70,7 +70,7 @@
 				// endDate: moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59'),
 				// endDate: moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59'),
 			    pageNo: this.pageNo,
 			    pageNo: this.pageNo,
 			    pageSize: this.pageSize,
 			    pageSize: this.pageSize,
-				identifyType: this.userInfo.identifyType
+				identifyType: this.userInfo ? this.userInfo.identifyType : ''
 			  }
 			  }
 			  this.status = "loading"
 			  this.status = "loading"
 			  getScanVinLogList(params).then(res => {
 			  getScanVinLogList(params).then(res => {
@@ -85,7 +85,7 @@
 				} else {
 				} else {
 				  _this.list = []
 				  _this.list = []
 				  _this.total = 0
 				  _this.total = 0
-				  _this.noDataText = res.message
+				  _this.noDataText = '暂无数据'
 				}
 				}
 				_this.status = _this.total>=_this.list.length ? "nomore" : 'loadmore'
 				_this.status = _this.total>=_this.list.length ? "nomore" : 'loadmore'
 			  })
 			  })

+ 17 - 1
store/index.js

@@ -131,6 +131,22 @@ const store = new Vuex.Store({
 			xprhStoreApplyFindLast({contactPhone: mobile}).then(res => {
 			xprhStoreApplyFindLast({contactPhone: mobile}).then(res => {
 				console.log(res)
 				console.log(res)
 				context.commit('setStoreAuthInfo',res.data || null)
 				context.commit('setStoreAuthInfo',res.data || null)
+				if(res.status == 200){
+					if(res.data.auditStatus=='PASS'){
+						uni.showModal({
+							title: '提示',
+							content: '门店认证审核已通过,请重新登录!',
+							confirmText: '去登录',
+							showCancel: false,
+							success() {
+								context.commit('logout');
+								uni.redirectTo({
+									url: '/pages/login/login'
+								});
+							}
+						})						
+					}
+				}
 			})
 			})
 		},
 		},
 		// 获取查询次数
 		// 获取查询次数
@@ -174,7 +190,7 @@ const store = new Vuex.Store({
 					context.commit('setHasLogin',true)
 					context.commit('setHasLogin',true)
 					callback&&callback()
 					callback&&callback()
 				}else{
 				}else{
-					// context.commit('logout')
+					context.commit('logout')
 				}
 				}
 			})
 			})
 		},
 		},