zhangdan 4 years ago
parent
commit
42259b74b2
2 changed files with 8 additions and 10 deletions
  1. 4 8
      pages/store/addStore.vue
  2. 4 2
      pages/store/storeList.vue

+ 4 - 8
pages/store/addStore.vue

@@ -23,7 +23,8 @@
 				<view class="flex flex_column data-item">
 					<text>地址</text>
 					<view class="list-item-right flex_1 flex justify_between" >
-						<u-input class="flex_1" :custom-style="inputClass" :disabled="isView" v-model="reverseReceiveAddress.receiveAreasName" @click="selectAddress" :disabled="true" placeholder="请选择通信地址" placeholder-style="color:'#bbb';font-size:18px"/>
+						<u-input v-if="!isView" class="flex_1" :custom-style="inputClass" v-model="reverseReceiveAddress.receiveAreasName" @click="selectAddress" :disabled="true" placeholder="请选择通信地址" placeholder-style="color:'#bbb';font-size:18px"/>
+						<view v-if="isView">{{reverseReceiveAddress.receiveAreasName}}</view>
 						<u-icon class="back-img" name="arrow-right" color="#9DA8B5"  @click="selectAddress" v-show="!isView"></u-icon>
 					</view>
 				</view>
@@ -44,7 +45,7 @@
 					</view>
 					<view v-if="isView &&photograph.length==0" style="margin-top: 10rpx;">暂无门头照</view>
 					<view v-show="photograph.length" v-for="(item,index) in photograph" :key="index" class="photograph-con">
-						<u-icon  name="close-circle-fill" color="#fa3534" size="50" class="close-circle-icon" @click="cancelPhotograph(index)"></u-icon>
+						<u-icon  v-show="!isView" name="close-circle-fill" color="#fa3534" size="50" class="close-circle-icon" @click="cancelPhotograph(index)"></u-icon>
 						<u-image width="100%" height="100%" :src="item" @click="previewPictures(item)"></u-image>
 					</view>
 				</view>
@@ -101,11 +102,6 @@
 						this.form.name=res.data.name? res.data.name:''
 						this.form.mobile=res.data.mobile
 						this.reverseReceiveAddress=Object.assign(this.reverseReceiveAddress,res.data.reverseReceiveAddress?res.data.reverseReceiveAddress:null)
-						// this.form.receiveAddress.provinceName=res.data.receiveAddressVO?res.data.receiveAddressVO.provinceName:''
-						// this.form.receiveAddress.cityName=res.data.receiveAddressVO?res.data.receiveAddressVO.cityName:''
-						// this.form.receiveAddress.districtName=res.data.receiveAddressVO?res.data.receiveAddressVO.districtName:''
-						// this.form.receiveAddress.receiveAddress=res.data.receiveAddressVO?res.data.receiveAddressVO.receiveAddress:''
-						// this.form.receiveAddress.receiveAreasName=res.data.receiveAddressVO?res.data.receiveAddressVO.receiveAreasName:''
 						this.photograph=res.data.reverseReceiveAddress?res.data.reverseReceiveAddress.headerImageList:[]
 					}else{
 						uni.showToast({
@@ -218,7 +214,7 @@
 					return false
 				}
 				const params=Object.assign(this.form,{sourceTypeReserve:'rider'},{reverseReceiveAddress:this.reverseReceiveAddress}) 
-				if(this.photograph.length>0){
+				if(this.photograph){
 					params.reverseReceiveAddress.headerImageList=this.photograph
 				}
 				if(this.itemId){

+ 4 - 2
pages/store/storeList.vue

@@ -115,8 +115,10 @@
 				shopList(params).then(res => {
 					if (res.status == 200) {
 						res.data.list.map(item=>{
-							if(item.reverseReceiveAddress.receiveAreasName){
-								item.cityAddress=this.getArea(item.reverseReceiveAddress.receiveAreasName,1)
+							if(item.reverseReceiveAddress){
+								if(item.reverseReceiveAddress.receiveAreasName){
+									item.cityAddress=this.getArea(item.reverseReceiveAddress.receiveAreasName,1)
+								}
 							}
 							console.log(item.cityAddress,'-----------item.cityAddress=============')
 							item.address=item.reverseReceiveAddress ? ((item.reverseReceiveAddress.receiveAddress? item.reverseReceiveAddress.receiveAddress:'')+(item.cityAddress? '('+item.cityAddress+')':'')) : ''