caiyuqin 4 ヶ月 前
親
コミット
4f45489792

+ 2 - 2
pages/login/settled.vue

@@ -183,8 +183,8 @@
 					<view class="cu-form-group">
 					<view class="cu-form-group">
 						<view class="title"><span>*</span>门店地址</view>
 						<view class="title"><span>*</span>门店地址</view>
 						<!-- <input placeholder="请输入门店地址详细地址" v-model="form.address" name="input" placeholder-class="phone-placeholder" ></input> -->
 						<!-- <input placeholder="请输入门店地址详细地址" v-model="form.address" name="input" placeholder-class="phone-placeholder" ></input> -->
-						<text class='title' v-if='form.address'> {{ form.address }}</text>
-						<text  v-else class="phone-placeholder one-line-text u-flex-1">请选择门店地址</text>
+						<text class='u-flex-1 one-line-text' v-if='form.address'> {{ form.address }}</text>
+						<text  v-else class="phone-placeholder">请选择门店地址</text>
 			
 			
 					</view>
 					</view>
 					<view class="cu-form-group">
 					<view class="cu-form-group">

+ 2 - 2
pages/store/adVideo.vue

@@ -3,7 +3,7 @@
     <cu-custom bgColor="bg-fff" :isBack="true">
     <cu-custom bgColor="bg-fff" :isBack="true">
       <block slot="content" style="font-size: 36rpx;"> 广告素材</block>
       <block slot="content" style="font-size: 36rpx;"> 广告素材</block>
     </cu-custom>
     </cu-custom>
-    <status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+    <status v-if="form.renovationStatus && form.renovationStatus.status !== null" :obj='form.renovationStatus'></status>
     <view class="tab-top">
     <view class="tab-top">
       <view class="borderRadiu">
       <view class="borderRadiu">
 
 
@@ -65,7 +65,7 @@ export default {
     if (data.params) {
     if (data.params) {
       let obj = JSON.parse(decodeURIComponent(data.params));
       let obj = JSON.parse(decodeURIComponent(data.params));
       this.form = obj
       this.form = obj
-      this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 3)[0] //1入口图 2经营相册 3视频
+      this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 3)[0] || {status:null}//1入口图 2经营相册 3视频
       this.video  = this.form.renovationStatus ? this.form.renovationStatus.context:""
       this.video  = this.form.renovationStatus ? this.form.renovationStatus.context:""
     }
     }
 
 

+ 4 - 3
pages/store/advertising.vue

@@ -3,7 +3,7 @@
 		<cu-custom bgColor="bg-fff" :isBack="true">
 		<cu-custom bgColor="bg-fff" :isBack="true">
 			<block slot="content" style="font-size: 36rpx;"> 广告素材</block>
 			<block slot="content" style="font-size: 36rpx;"> 广告素材</block>
 		</cu-custom>
 		</cu-custom>
-		<status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+		<status v-if="form.renovationStatus && form.renovationStatus.status !== null" :obj='form.renovationStatus'></status>
 		<view class="tab-top">
 		<view class="tab-top">
 			<view class="borderRadiu">
 			<view class="borderRadiu">
 				<view class="customize">
 				<view class="customize">
@@ -77,8 +77,9 @@
 			if (data.params) {
 			if (data.params) {
 				let obj = JSON.parse(decodeURIComponent(data.params));
 				let obj = JSON.parse(decodeURIComponent(data.params));
 				this.form = obj
 				this.form = obj
-				this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 2)[0] //1入口图 2经营相册 3视频
-				const photoArr= this.form.renovationStatus ? this.form.renovationStatus.context.split(',') : []
+				this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 2)[0]|| {status:null} //1入口图 2经营相册 3视频
+				let content=this.form.renovationStatus.context
+				const photoArr= this.form.renovationStatus ? content && content.split(',') : []
 				 this.$set(this.form, 'photo', photoArr);
 				 this.$set(this.form, 'photo', photoArr);
 			}
 			}
 
 

+ 5 - 4
pages/store/headPhoto.vue

@@ -3,7 +3,7 @@
 		<cu-custom bgColor="bg-fff" :isBack="true">
 		<cu-custom bgColor="bg-fff" :isBack="true">
 			<block slot="content" style="font-size: 36rpx;"> 商户形象</block>
 			<block slot="content" style="font-size: 36rpx;"> 商户形象</block>
 		</cu-custom>
 		</cu-custom>
-		<status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+		<status v-if="form.renovationStatus && form.renovationStatus.status !== null" :obj='form.renovationStatus'></status>
 		<view class="tab-top">
 		<view class="tab-top">
 			<view class="borderRadiu">
 			<view class="borderRadiu">
 				<view class="customize">
 				<view class="customize">
@@ -40,7 +40,7 @@
 			<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'newSettings' })"
 			<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'newSettings' })"
 				style="width: 205rpx;">取消</button>
 				style="width: 205rpx;">取消</button>
 			<button style="width:443rpx;background: linear-gradient( 90deg, #77B6FF 0%, #449AFF 100%);border-radius:53rpx ;"
 			<button style="width:443rpx;background: linear-gradient( 90deg, #77B6FF 0%, #449AFF 100%);border-radius:53rpx ;"
-				class="cu-btn bg-blue round " @click="sumbit" >提交审核</button>
+				class="cu-btn bg-blue round " @click="sumbit" v-if='form.renovationStatus.status || form.renovationStatus.status==null'>提交审核</button>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -77,8 +77,9 @@
 			if (data.params) {
 			if (data.params) {
 				let obj = JSON.parse(decodeURIComponent(data.params));
 				let obj = JSON.parse(decodeURIComponent(data.params));
 				this.form = obj
 				this.form = obj
-        this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 1)[0] //1入口图 2经营相册 3视频
-				this.form.headPhoto = this.form.renovationStatus ? this.form.renovationStatus.context.split(',') : []
+        this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 1)[0] || {status:null} //1入口图 2经营相册 3视频
+				let content=this.form.renovationStatus.context
+				this.form.headPhoto = this.form.renovationStatus ? content && content.split(',') : []
 			}
 			}
 
 
 		},
 		},