bug修复

components/check-popup.vue

@@ -5,7 +5,7 @@
 				完善信息
 			</view>
 			<view class="title flex" v-if="status == 2">
-				提示
+				提 示
 			</view>
 			<view class="title flex" v-if="status == 4">
 				审核不通过
@@ -13,7 +13,10 @@
 			<view class="content flex" v-if="status == 4">
 				驳回原因：{{describe}}
 			</view>
-			<view class="content flex" v-else>
+			<view class="content flex" v-if="status == 2">
+				审核中，请等待...
+			</view>
+			<view class="content flex" v-if="status == 1">
 				{{describe}}
 			</view>
 			
@@ -22,10 +25,8 @@
 					去完善
 				</view>
 			</view>
-			<view class="btn flex" v-if="status == 2">
-				<view class="add flex" @click="">
-					确定
-				</view>
+			<view class=" flex" v-if="status == 2">
+			
 			</view>
 			<view class="btn between" v-if="status == 4">
 				<view class="cancel flex" @click="cancel">
@@ -52,10 +53,16 @@ export default {
 			default: ''
 		},
 	},
+	data(){
+		return{
+			show:true
+		}
+	},
 	methods: {
 		// 取消
 		cancel(){
 			this.$emit('cutPopup')
+			uni.showTabBar()
 		},
 		//去设置
 		goEdit(){
@@ -80,6 +87,7 @@ export default {
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		
 	}
 
 	.popup {
@@ -90,7 +98,7 @@ export default {
 		position: fixed;
 		top: 0;
 		left: 0;
-
+		z-index: 9999999999 !important;
 		.center {
 			width: 570rpx;
 			height: 410rpx;
@@ -104,7 +112,7 @@ export default {
 			.title {
 				width: 100%;
 				height: 86rpx;
-				font-weight: 500;
+				font-weight: 600;
 				font-size: 32rpx;
 				border-bottom: 1px solid #EEEEEE;
 			}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.3.7",
-    "versionCode" : 1137,
+    "versionName" : "1.1.3.9",
+    "versionCode" : 1139,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/index/index.vue

@@ -165,16 +165,12 @@
 				this.$http.get("/merchant/app/checkMerchantInfo?userId=" + this.userId).then(res => {
 					if (res.data.code == 200) {
 						//message == 3（审核已通过）
-						if (res.data.result == 3) {
-							uni.showToast({
-								icon: 'none',
-								title: "审核已通过"
-							})
-						} else {
+						if (res.data.result != 3)  {
 							this.storeStatus = res.data.result
 							this.describe = res.data.message
 							// this.referenceId = res.data.result.referenceId
 							res.data.result == 3 ? this.isPopup = false : this.isPopup = true
+							uni.hideTabBar()
 						}
 					}
 				})

pages/login/settled.vue

@@ -186,7 +186,7 @@
 					</view>
 					<view class="cu-form-group">
 						<view class="title">店铺面积</view>
-						<input placeholder="请输入门店名称" style="width: 200rpx !important;" v-model="form.storeExtent"
+						<input placeholder="请输入店铺面积" style="width: 200rpx !important;" v-model="form.storeExtent"
 							name="input"></input>㎡
 					</view>
 					<view class=" booder-top" style="padding-bottom: 16upx" :style="{ display: mapIsHidden }"
@@ -434,6 +434,7 @@
 					this.headPhotoImg = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
 					obj.headPhoto = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
 					obj.locality = obj.locality ? obj.locality : ''
+					this.switchType(obj.type)
 					this.form = obj
 				}
 			}