细节

pages/gamll/index.vue

@@ -15,7 +15,7 @@
 							{{userInfo.mobile}}
 						</view>
 						<view class="image-text_1" @click="goLogin()">
-							{{retail==0?'您暂未开通商城哦～':'您已经开通商城啦～'}}
+							{{retailShow==0?'您暂未开通商城哦～':'您已经开通商城啦～'}}
 						</view>
 					</view>
 					<image :src="$picUrl+'/static/user/gmallZuan.png'" class="image_1"></image>
@@ -262,7 +262,7 @@
 				],
 				equityList: [],
 				userInfo: '',
-				retail: null,
+				retailShow: null,
 				show: false,
 				content_description: '',
 				feature_name: '',
@@ -273,8 +273,7 @@
 			}
 		},
 		onLoad() {
-
-			this.retail = uni.getStorageSync('userInfo').retail
+			this.retailShow = uni.getStorageSync('userInfo').retail
 			this.getRetailList()
 			this.getDescribe()
 			uni.$on('appShow', this.solveShowMsg);

pages/news1/MerchantSettlement.vue

@@ -178,7 +178,7 @@
 					text: '3C数码',
 					id: 1
 				}, {
-					text: '家用电蒸',
+					text: '家用电器',
 					id: 2
 				}, {
 					text: '家居家装',

pages/news1/MerchantSupplier.vue

@@ -50,7 +50,7 @@
 					</view>
 					<view class="describe">
 						品牌工厂、授权代理、电商平台
-						（有货或有优质上游资源皆可）的复位
+						（有货或有优质上游资源皆可）
 					</view>
 				</view>
 				<view class="box">
@@ -191,7 +191,10 @@
 			<u-checkbox active-color="#08CC57" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
 			已阅读并同意<text @click="toTextPage(1)">《商家入驻协议》</text>
 		</view>
-		<view class="park-button" @click="nextStep">
+		<view class="park-button" v-if="card_just_imgage_ids.length>0&&card_back_imgage_ids.length>0&&card_hold_imgage_ids.length>0&&prove_imgage_ids.length>0" @click="nextStep">
+			下一步
+		</view>
+		<view class="park-button" v-else style="opacity:0.5">
 			下一步
 		</view>
 		<addShuiyin />