lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
f72889dea2
Modificáronse 2 ficheiros con 45 adicións e 7 borrados
  1. 40 6
      pages/digitalShelf/choosePart.vue
  2. 5 1
      pages/index/index.vue

+ 40 - 6
pages/digitalShelf/choosePart.vue

@@ -240,6 +240,9 @@
 			},
 			userInfo(){
 				return this.$store.state.vuex_userInfo
+			},
+			storeApply(){
+				return this.$store.state.vuex_storeAuthInfo || null
 			}
 		},
 		onLoad(opts) {
@@ -249,9 +252,12 @@
 			// 获取vin 对应code
 			this.getCarCodeByVin()
 			
-			// 游客去认证
+			// 游客
 			if(this.userInfo.sysUserFlag == '0'){
-				this.showPopup = true
+				// 未认证
+				if(!storeApply.auditStatus){
+					this.showPopup = true
+				}
 			}
 		},
 		onShow() {
@@ -509,14 +515,42 @@
 				})
 				return [partList,tempList]
 			},
-			// 立即提交
-			submitForm(){
+			validRz(){
 				// 游客去认证
 				if(this.userInfo.sysUserFlag == '0'){
-					this.showPopup = true
-					return
+					// 未认证
+					if(!storeApply.auditStatus){
+						this.showPopup = true
+						return true
+					}
+					// 认证中
+					if(storeApply&&storeApply.auditStatus=='WAIT'){
+						uni.showModal({
+							title: '提示',
+							content: '门店认证资料审核中,请耐心等待!',
+							confirmText: '好的',
+							showCancel: false
+						})
+					}
+					
+					// 认证通过
+					if(storeApply&&(storeApply.auditStatus=='WAIT' || storeApply.auditStatus == 'REFUSE')){
+						uni.showModal({
+							title: '提示',
+							content: storeApply.auditStatus=='WAIT' ? '门店认证资料审核中,请耐心等待!' : '门店认证资料审核不通过,请重新提交审核!',
+							confirmText: '好的',
+							showCancel: false
+						})
+					}
 				}
 				
+				return false
+			},
+			// 立即提交
+			submitForm(){
+				if(this.validRz()){
+					return
+				}
 				if(this.partListData.length==0){
 					uni.showToast({
 						icon: 'none',

+ 5 - 1
pages/index/index.vue

@@ -27,7 +27,7 @@
 			</view>
 			<!-- 名片 -->
 			<view class="userCard flex align_center justify_between">
-				<view class="userCard-info flex align_center justify_between">
+				<view class="userCard-info flex align_center">
 					<view>
 						<u-image shape='circle' v-if="!hasLogin" src="/static/def_personal_avatar.png" width="90" height="90"></u-image>
 						<u-image shape='circle' v-else :src="avatarUrl||'/static/def_personal_avatar.png'" width="90" height="90"></u-image>
@@ -450,6 +450,7 @@
 				border-radius: 0.5em;
 				box-shadow: 0.3em 0.3em 1em #c4e5ee;
 				.userCard-info{
+					flex-grow:1;
 					> view{
 						&:last-child{
 							margin-left: 0.5em;
@@ -462,6 +463,9 @@
 							}
 						}
 					}
+					.user-info{
+						flex-grow:1;
+					}
 				}
 				.user-rz{
 					font-size: 0.8rem;