入驻修改

pages/login/settled.vue

@@ -172,17 +172,20 @@
 					</view>
 					<view class="cu-form-group">
 						<view class="title"><span>*</span>所在地区</view>
-						<view class="u-flex-1 u-flex u-row-between" @click="$refs.picker.show()">
+						<view class="u-flex-1 u-flex u-row-between">
 							<view style="font-size: 30rpx;">
-								<text v-if="form.locality"> {{ form.locality }}</text>
+								<text  class='title' v-if="form.locality"> {{ form.locality }}</text>
 								<text v-else class="phone-placeholder">请选择所在地区</text>
 							</view>
-							<u-icon name="arrow-right" style="margin-left: 17rpx;color: #999"></u-icon>
+							<!-- <u-icon name="arrow-right" style="margin-left: 17rpx;color: #999"></u-icon> -->
 						</view>
 					</view>
 					<view class="cu-form-group">
 						<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>
+			
 					</view>
 					<view class="cu-form-group">
 						<view class="title"><span>*</span>店铺面积</view>
@@ -216,7 +219,7 @@
 						<view class="title"><span>*</span>分类</view>
 						<view class="u-flex-1 u-flex u-row-between">
 							<view style="font-size: 30rpx;">
-								<text v-if="classItem.title"> {{ classItem.title }}</text>
+								<text v-if="form.categoryName"> {{ form.categoryName }}</text>
 								<text v-else class="phone-placeholder">请选择分类</text>
 							</view>
 							<u-icon name="arrow-right" style="margin-left: 17rpx;color: #999"></u-icon>
@@ -346,7 +349,7 @@
 					qualificationList:[],
 					leaderName:"",
 					storePhone:"",
-					classId: '',
+					categoryId: '',
 				},
 				formName: {
 					// name: '姓名',
@@ -366,7 +369,7 @@
 					storePhone: '负责人手机号',
 					storeExtent: '店铺面积',
 					// typeLabel: '主体类型'
-					classId: '分类',
+					categoryId: '分类',
 				
 				},
 				tab: 1,
@@ -389,10 +392,6 @@
 				classShow:false,
 				fileObj:{},
 				treeData:[],
-				classItem:{
-					title:"",
-					id:"",
-				},
 				dynamicList:[],
 				paramsObj:{},
 				optionData:null,
@@ -412,9 +411,11 @@
 				iconPath: '../../static/boiaoji.png'
 			})] : []
 			let storageData = uni.getStorageSync('address');
-			// this.form.address = storageData.address
+			this.form.address = storageData.address
 			this.form.latitude = storageData.lat
 			this.form.longitude = storageData.lng
+			this.form.locality=`${storageData.province || ''}${storageData.city || ''}${storageData.county || ''}`
+			this.form.country=storageData.countyCode
 		},
 		async onLoad(option) {
 			this.optionData=option;
@@ -457,9 +458,13 @@
 			},
 			//选择位置
 			selectAddress() {
-				uni.navigateTo({
-					url: '/pages/store/selectTdMap?url=' + '/pages/store/editStore'
-				})
+				let data=this.form.localMerchantInfoExamine
+				if(data && data.status==2 || !this.merchantId){
+					uni.navigateTo({
+							url: '/pages/store/selectTdMap?url=' + '/pages/store/editStore'
+						})
+					}
+				
 			},
 			//选择主题类型
 			confirmLocality(data) {
@@ -787,7 +792,7 @@
 									}
 								}
 							}
-							if (this.form.classId) {
+							if (this.form.categoryId) {
 								const hasError = this.dynamicList.some(e => {
 									for (var i in this.fileObj) {
 										if (i == e.key && !this.fileObj[i]) {
@@ -815,18 +820,17 @@
 							if (!isbusinessLicense) {
 								this.form.businessLicense = configService.apiUrl + '/' + this.form.businessLicense
 							}
-							// this.form.address = uni.getStorageSync('address').address
-							this.form.latitude = uni.getStorageSync('address').lat
-							this.form.longitude = uni.getStorageSync('address').lng
+							//  let storageData = uni.getStorageSync('address');
+							//  this.form.latitude = storageData.lat
+							//  this.form.longitude = storageData.lng
 
-					
 							const imgArr = []
 							this.dynamicList.forEach((e => {
 								for (var key in this.fileObj) {
 									if (key == e.key) {
 										imgArr.push({
-											categoryId: this.classItem.id,
-											categoryName: this.classItem.title,
+											categoryId: this.form.categoryId,
+											categoryName: this.form.categoryName,
 											special: this.fileObj[key],
 											qualificationName: e.qualificationName
 										})
@@ -838,8 +842,8 @@
 								...this.form,
 								source: 2,
 								// headPhoto: Array.isArray(this.form.headPhoto) ? this.form.headPhoto.join(',') : this.form.headPhoto,
-								longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
-								latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
+								// longitude: this.markers.length > 0 ? this.markers[0].longitude : '',
+								// latitude: this.markers.length > 0 ? this.markers[0].latitude : ''
 							}
 							//去重
                this.checkInit()
@@ -862,7 +866,6 @@
 			},
 			//分类查询
 			suerPop(item) {
-				this.classItem = item;
 				this.classShow = false
 				this.$http.get('/merchant/register/queryQualificationByCategoryId?categoryId=' + item.id).then(res => {
 					const data = res.data.result
@@ -879,7 +882,8 @@
 						this.dynamicList = []
 					}
 				})
-				this.form.classId = item.id
+				this.form.categoryId = item.id
+				this.form.categoryName = item.title
 			},
 			//查询信息
 			getInfoBus(){
@@ -892,8 +896,8 @@
 					this.switchType(data.type)
 					if(data.qualificationList.length){
 						let obj=data.qualificationList[0]
-						this.classItem.title=obj.categoryName
-						this.classItem.id=obj.categoryId
+						this.form.categoryName=obj.categoryName
+						this.form.categoryId=obj.categoryId
 						  data.qualificationList.forEach((element,index) => {
 								element.specialArr=[]
 								element.key='key'+index
@@ -909,7 +913,7 @@
 			openClass(){
 				this.classShow=true;
 				this.$nextTick(()=>{
-					this.$refs.classification.init(this.classItem.id)
+					this.$refs.classification.init(this.form.categoryId)
 				})
 			},
 			loadIng(val){

pages/store/adVideo.vue

@@ -3,9 +3,8 @@
     <cu-custom bgColor="bg-fff" :isBack="true">
       <block slot="content" style="font-size: 36rpx;"> 广告素材</block>
     </cu-custom>
-    <status v-if="form && form.videoStatus !== null" :status="form.videoStatus" :updateTime="form.videoUpdateTime"
-      :remark="form.videoRemark"></status>
-    <view class="tab-top" :style="form && form.videoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
+    <status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+    <view class="tab-top">
       <view class="borderRadiu">
 
         <view class="customize">
@@ -38,7 +37,7 @@
       <button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'settings' })"
         style="width: 205rpx;">取消</button>
       <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>
 </template>
@@ -57,7 +56,7 @@ export default {
     return {
       video: '',
       photoList: [],
-      form: {},
+      form: {renovationStatus:{status:null}},
       src: '',
       businessData: []
     }
@@ -66,8 +65,8 @@ export default {
     if (data.params) {
       let obj = JSON.parse(decodeURIComponent(data.params));
       this.video = obj.video ? obj.video : ''
-      obj.photo = obj.photo ? obj.photo.split(',').filter(id => id !== '') : []
       this.form = obj
+      this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 3)[0] //1入口图 2经营相册 3视频
     }
 
   },
@@ -120,61 +119,6 @@ export default {
         }
       })
     },
-    DelImg(e) {
-      uni.showModal({
-        title: '提示',
-        content: '确定要删除？',
-        cancelText: '取消',
-        confirmText: '确定',
-        success: res => {
-          if (res.confirm) {
-            // this.photoList.splice(e.currentTarget.dataset.index, 1)
-            this.form.photo.splice(e.currentTarget.dataset.index, 1)
-
-          }
-        }
-      })
-    },
-    ChooseImage() {
-      uni.chooseImage({
-        // count: 4, //默认9
-        sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album'], //从相册选择
-        success: (res) => {
-          if (res) {
-            // this[type + 'Img'] = chooseImageRes.tempFilePaths[0];
-            uni.uploadFile({
-              url: configService.apiUrl + '/sys/common/upload',
-              filePath: res.tempFilePaths[0],
-              name: "file",
-              formData: {
-                'biz': 'temp',
-              },
-              success: (files) => {
-                let data = JSON.parse(files.data);
-                if (data.success) {
-                  if (this.form.photo.length != 0) {
-                    // this.photoList = this.photoList.concat(res.tempFilePaths)
-                    this.form.photo.push(configService.apiUrl + '/' + data.message)
-
-                  } else {
-                    // this.photoList =res.tempFilePaths
-                    this.form.photo = [configService.apiUrl + '/' + data.message]
-                  }
-                }
-              }
-            })
-          }
-
-        }
-      });
-    },
-    ViewImage(e) {
-      uni.previewImage({
-        urls: this.form.photo,
-        current: e.currentTarget.dataset.url
-      });
-    },
     chooseVideo() {
       // 上传视频
       console.log('上传视频')

pages/store/advertising.vue

@@ -3,9 +3,8 @@
 		<cu-custom bgColor="bg-fff" :isBack="true">
 			<block slot="content" style="font-size: 36rpx;"> 广告素材</block>
 		</cu-custom>
-		<status v-if="form && form.videoStatus !== null" :status="form.videoStatus" :updateTime="form.videoUpdateTime"
-			:remark="form.videoRemark"></status>
-		<view class="tab-top" :style="form && form.videoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
+		<status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+		<view class="tab-top">
 			<view class="borderRadiu">
 				<view class="customize">
 					<view class=" cu-form-group justify-between">
@@ -40,7 +39,7 @@
 			<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'settings' })"
 				style="width: 205rpx;">取消</button>
 			<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>
 </template>
@@ -59,7 +58,7 @@
 			return {
 				video: '',
 				photoList: [],
-				form: {photo:[]},
+				form: {photo:[],renovationStatus:{status:null}},
 				src: '',
 				cameraList: [{
 						value: 'back',
@@ -80,6 +79,7 @@
 				this.video = obj.video ? obj.video : ''
 				obj.photo = obj.photo ? obj.photo.split(',').filter(id => id !== '') : []
 				this.form = obj
+				this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 2)[0] //1入口图 2经营相册 3视频
 			}
 
 		},
@@ -296,6 +296,7 @@
 
 	.borderRadiu {
 		border-radius: 8px;
+		margin-top:24rpx;
 		.customize {
 			padding: 0 18upx 18upx;
 			margin-bottom: 16rpx;

pages/store/components/status.vue

@@ -1,86 +1,91 @@
 <template>
-    <view class="progress-statu" 
-        :style="obj.status == null ? '' : 'padding: 20upx 42upx;'">
-        <view v-if="obj.status == 0">
-            <view class="flex justify-between">
-                <view class="status">
-                    <image src="/static/login/status1.png" mode="aspectFit"></image>
-                    <text style="font-weight: 500;">待审核</text>
-                </view>
-                <!-- <text style="color: #999;">{{updateTime }}</text> -->
-            </view>
-            <view  style="color: #666666;"> 提交的店铺信息待审核中</view>
-        </view>
-        <view v-if="obj.status== 1">
-            <view class="flex justify-between">
-                <view class="status">
-                    <image src="/static/login/status2.png" mode="aspectFit"></image>
-                    <text style="font-weight: 500;color: #509B45;">审核通过</text>
-                </view>
-                <!-- <text style="color: #999;">{{updateTime }}</text> -->
-            </view>
-            <view style="color: #666666;">{{ obj.updateTime }} 提交的店铺信息审核通过</view>
-        </view>
-        <view v-if="obj.status == 2">
-            <view class="flex justify-between">
-                <view class="status">
-                    <image src="/static/login/status3.png" mode="aspectFit"></image>
-                    <text style="color: #F34F4F;font-weight: 500;">审核驳回</text>
-                </view>
-                <!-- <text style="color: #999;">{{updateTime }}</text> -->
-            </view>
-            <view>驳回原因：{{ obj.remark }}</view>
+  <view class="progress-statu">
+
+    <view class="pub-box">
+      <view class="flex justify-between">
+        <!-- //0：待审核，1:通过，2：驳回 -->
+        <view class="status">
+          <image :src="statusMap[obj.status].icon" mode="aspectFit"></image>
+          <text :class="statusMap[obj.status].class">{{ statusMap[obj.status].text }}</text>
         </view>
+      </view>
+      <view class="des" v-if='obj.status==2'>
+        说明：{{obj.remark}}
+      </view>
+      <view class="des" v-if='obj.status==0'>
+        提交的信息待审核中
+      </view>
+      <view class="des" v-if='obj.status==1'>
+        {{obj.updateTime}} 提交的信息审核通过
+      </view>
+
     </view>
+  </view>
 </template>
 <script>
 export default {
-    props:{
-        status: {
-            type: Number,
-            default: null
-        },
-				reason: {
-				    type: String,
-				    default: null
-				},
-        updateTime: {
-            type: String,
-            default: ''
-        },
-        remark: {
-            type: String,
-            default: ''
-        },
-        obj:{
-            type:Object,
-            default:()=>{}
-        }
-}
+  props: {
+    obj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  computed: {
+    statusMap() {
+      return {
+        0: { icon: '/static/login/status1.png', class: 'blue', text: '待审核' },
+        1: { icon: '/static/login/status2.png', class: 'green', text: '审核通过' },
+        2: { icon: '/static/login/status3.png', class: 'red', text: '审核驳回' }
+      };
+    }
+  },
 }
 </script>
 <style scoped lang="scss">
 .progress-statu {
-    // position: none;
-    width: 100%;
-    // z-index: 9999;
-    background: #FFFFFF;
-    border-top: 1px solid #EEEEEE;
-    .status {
-        font-size: 38upx;
-        color: #596ABB;
-        font-weight: 500;
-        margin-bottom: 10upx;
+  border-top: 1rpx solid #eee;
+}
+.pub-box {
+  background: #fff;
+  padding: 0 40rpx;
+  margin-bottom: 16rpx;
+}
+.status {
+  font-size: 36upx;
+  color: #596abb;
+  font-weight: 500;
+  margin-bottom: 10upx;
+  padding-top: 18rpx;
 
-        text {
-            margin-left: 5upx
-        }
+  text {
+    margin-left: 5upx;
+  }
 
-        image {
-            vertical-align: text-top;
-            width: 42upx;
-            height: 42upx;
-        }
-    }
+  image {
+    vertical-align: text-top;
+    width: 40upx;
+    height: 40upx;
+  }
+}
+.des {
+  color: #666;
+  font-size: 24rpx;
+  padding-bottom: 18rpx;
+}
+.title {
+  font-size: 28rpx;
+  color: #333;
+}
+.red {
+  color: #f34f4f;
+  font-weight: 500;
+}
+.blue {
+  color: #596abb;
+  font-weight: 500;
+}
+.green {
+  color: #53cc48;
+  font-weight: 500;
 }
 </style>

pages/store/headPhoto.vue

@@ -3,9 +3,8 @@
 		<cu-custom bgColor="bg-fff" :isBack="true">
 			<block slot="content" style="font-size: 36rpx;"> 商户形象</block>
 		</cu-custom>
-		<status v-if="form && form.headPhotoStatus !== null" :status="form.headPhotoStatus" :updateTime="form.headPhotoUpdateTime"
-			:remark="form.headPhotoRemark"></status>
-		<view class="tab-top" :style="form && form.headPhotoStatus == null ? 'margin-top: 14upx;' : 'margin-top: 144upx;'">
+		<status v-if="form && form.renovationStatus !== null" :obj='form.renovationStatus'></status>
+		<view class="tab-top">
 			<view class="borderRadiu">
 				<view class="customize">
 					<view class=" cu-form-group justify-between">
@@ -38,10 +37,10 @@
 			</view>
 		</view>
 		<view class="padding flex sub-bottom" style="justify-content: space-around;">
-			<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'settings' })"
+			<button class="cu-btn round line-gray shadow" @click="$Router.push({ name: 'newSettings' })"
 				style="width: 205rpx;">取消</button>
 			<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>
 </template>
@@ -59,7 +58,7 @@
 		data() {
 			return {
 				photoList: [],
-				form: {headPhoto:''},
+				form: {headPhoto:'',renovationStatus:{status:null}},
 				src: '',
 				cameraList: [{
 						value: 'back',
@@ -80,8 +79,8 @@
 				// this.video = obj.video ? obj.video : ''
 				obj.photo = obj.photo ? obj.headPhoto.split(',').filter(id => id !== '') : []
 				this.form = obj
-				console.log(obj)
-				
+        this.form.renovationStatus=obj.renovationStatus.filter(item => item.type === 1)[0] //1入口图 2经营相册 3视频
+				console.log( this.form)
 			}
 
 		},
@@ -143,7 +142,7 @@
 								success: (files) => {
 									let data = JSON.parse(files.data);
 									if (data.success) {
-										let temp = this.form.headPhoto.split(',')
+										let temp = this.form.headPhoto && this.form.headPhoto.split(',') || []
 										if (this.form.headPhoto.split(',').length > 0) {
 											// this.photoList = this.photoList.concat(res.tempFilePaths)
 											this.form.photo.push(configService.apiUrl + '/' + data.message)
@@ -267,6 +266,7 @@
 	.borderRadiu {
 		border-radius: 8px;
 		background-color: #ffffff;
+		margin-top:24rpx;
 
 		.customize {
 			padding: 0 18upx 18upx;

pages/store/newSettings.vue

@@ -135,7 +135,8 @@ export default {
       nameStatus: {
         status: null
       }, //门店名称审核状态
-      renovationStatus: "", //装修审核状态
+      renovationStatusAll:null , //装修审核状态
+      renovationStatus:null,
       typeArr: [{
         type: 0,
         name: '待审核'
@@ -170,6 +171,7 @@ export default {
           class: `${data.logo ? 'active' : 'item-p'}`,
           status: false, //是否有状态
           isMore: true, //是否显示更多 
+          status: this.filterType(this.renovationStatusAll),
           type: 1
         },
         {
@@ -202,8 +204,8 @@ export default {
         // },
         {
           title: '门店分类',
-          content: data.qualificationList && data.qualificationList[0].categoryName,
-          class: `${data.qualificationList && data.qualificationList[0].categoryName ? 'active' : 'item-p'}`,
+          content: data.categoryName,
+          class: `${data.categoryName ? 'active' : 'item-p'}`,
           isMore: false,
           type: 6
         },
@@ -239,6 +241,9 @@ export default {
     infoClick(item) {
       this.indexOption.shopStatus = this.shopStatus
       this.indexOption.nameStatus = this.nameStatus
+      this.indexOption.renovationStatus = this.renovationStatus
+      
+
       const queryString = encodeURIComponent(JSON.stringify(this.indexOption))
       if (item.type == 1) {
         uni.navigateTo({
@@ -257,7 +262,7 @@ export default {
           })
         }
       } else if (item.type == 3) {
-        if (this.renovationStatus == 1 && this.indexOption.localMerchantInfoExamine.status == 1) {
+        if ( this.renovationStatusAll == 1 && this.indexOption.localMerchantInfoExamine.status == 1) {
           this.selectedBus = this.businessShowList.filter((e => e.value == this.indexOption.merchantStatus))
           this.businessShow = true
         } else {
@@ -370,7 +375,8 @@ export default {
     },
     //0：待审核，1:通过，2：驳回
     filterType(type) {
-      if (this.typeArr && type != undefined && type != null) {
+
+      if (this.typeArr && type != undefined && type != null && type!=1) {
         return this.typeArr.find(item => item.type == type).name;
       }
 
@@ -384,9 +390,9 @@ export default {
         params: params
       })
       if (type == 1) {
-        this.shopStatus = res.data.result || { status: null }  //0：待审核，1:通过，2：驳回
+        this.shopStatus = res.data.result || { status: 1 }  //0：待审核，1:通过，2：驳回
       } else {
-        this.nameStatus = res.data.result || { status: null }
+        this.nameStatus = res.data.result || { status: 1 }
       }
     },
     //装修
@@ -394,12 +400,20 @@ export default {
       let res = await this.$http.get('/LocalMerchantInfoTrimExamine/localMerchantInfoTrimExamine/queryByMerchantId', {
         params: { merchantId: this.merchantId }
       })
-      this.renovationStatus = res.data.result
+      this.renovationStatus = res.data.result || []
+      this.renovationStatusAll=this.getPriorityStatus(res.data.result || [])
+      console.log( this.renovationStatusAll)
     },
     async editInfo(params) {
       params.id = this.merchantId
       let res = await this.$http.post('/merchant/register/updateInfo', params)
     },
+     getPriorityStatus(arr) {
+        if (arr.some(item => item.status === 2)) return 2;
+        if (arr.some(item => item.status === 0)) return 0;
+        if (arr.some(item => item.status === 1)) return 1;
+        return null;
+      },
     //营业状态
     async openSure(val) {
       await this.editInfo({ merchantStatus: this.selectedBus[0].value })

pages/store/selectTdMap.vue

@@ -260,7 +260,7 @@
 			},
 			
 			// 提交选择
-			submit(item) {
+			async submit(item) {
 				const coords = this.extractCoordinates(item);
 				if (!coords) {
 					uni.showToast({
@@ -269,18 +269,39 @@
 					});
 					return;
 				}
-				
-				const params = {
-					lng: coords.lng,
-					lat: coords.lat,
-					address: item.name,
-					name: item.name
-				};
-				
-				console.log('提交参数:', params);
-				uni.setStorageSync('address', params);
-				uni.navigateBack({
-					delta: 1
+				//获取城市数据
+				uni.request({
+					url: `https://api.tianditu.gov.cn/geocoder?postStr={"lon":${coords.lng},"lat":${coords.lat}}&type=geocode&tk=${this.tk}`,
+					success: (res) => {
+						if (res.statusCode === 200 && res.data) {
+						let cityParams = res.data.result.addressComponent
+						const params = {
+								lng: coords.lng,
+								lat: coords.lat,
+								address: item.name,
+								name: item.name,
+								province:cityParams.province,
+								city:cityParams.city,
+								county:cityParams.county,
+								provinceCode:cityParams.province_code,
+								cityCode:cityParams.city_code,
+								countyCode:cityParams.county_code,
+							};
+							
+							console.log('提交参数:', params);
+							uni.setStorageSync('address', params);
+							uni.navigateBack({
+								delta: 1
+							});
+						}
+					},
+					fail: (error) => {
+						console.error('搜索请求失败:', error);
+						uni.showToast({
+							title: '网络错误，请重试',
+							icon: 'none'
+						});
+					}
 				});
 			},
 			

pages/store/shopQualifications.vue

@@ -293,7 +293,7 @@ export default {
     font-weight: 500;
   }
   .green {
-    color: green;
+    color: #53CC48;
     font-weight: 500;
   }
   .title-box {

pages/store/storeAdress.vue

@@ -6,27 +6,27 @@
       <view class="form-box">
         <view class="cu-form-group">
           <view class="title">所在地区</view>
-          <view class="u-flex" @click="$refs.picker.show()">
+          <view class="u-flex">
             <view class='content-text'>
               <text v-if="form.locality"> {{ form.locality }}</text>
               <text v-else>请选择所在地区</text>
             </view>
-            <u-icon class="arrow-right" name="arrow-right"></u-icon>
+            <!-- <u-icon class="arrow-right" name="arrow-right"></u-icon> -->
           </view>
         </view>
 
-        <view class="cu-form-group" @click='selectAddress'>
+        <view class="cu-form-group">
           <view class="title">门店地址</view>
           <view class="u-flex u-flex-1 u-row-right">
             <view class='content-text one-line-text'>
               <text>{{form.address}}</text>
             </view>
-            <u-icon class="arrow-right" name="arrow-right"></u-icon>
+            <!-- <u-icon class="arrow-right" name="arrow-right"></u-icon> -->
           </view>
         </view>
       </view>
     </form>
-    <view class="map">
+    <view class="map" @click='selectAddress'>
       <Tmap :allowSelection="false" :showCoordinates="false" :key="mapKey" class='map-cont'></Tmap>
     </view>
     <view class="padding flex sub-bottom">
@@ -60,18 +60,29 @@ export default {
     };
   },
   onShow() {
-    this.$nextTick(() => {
-      let storageData = uni.getStorageSync('address');
-      this.form.address = storageData.address
-      this.form.longitude = storageData.lng
-      this.form.latitude = storageData.lat
-    })
-
+    let storageData = uni.getStorageSync('address');
+    this.form.address = storageData.address
+    this.form.longitude = storageData.lng
+    this.form.latitude = storageData.lat
   },
   onLoad(Option) {
     this.objInfo = JSON.parse(decodeURIComponent(Option.params));
-    this.form.locality = this.objInfo.locality;
-    this.form.country = this.objInfo.country;
+    for (var i in this.form) {
+      this.form[i] = this.objInfo[i]
+    }
+
+    //更新一下
+    const params = {
+      lng: this.form.longitude,
+      lat: this.form.latitude,
+      address: this.form.address,
+      name: this.form.address,
+      countyCode: this.form.country,
+      locality: this.form.locality
+    };
+
+    uni.setStorageSync('address', params);
+
   },
   methods: {
     onConfirm(e) {
@@ -80,8 +91,13 @@ export default {
     },
     async submit() {
       let addressObj = uni.getStorageSync('address')
+      let locality = addressObj.locality ? addressObj.locality : `${addressObj.province}${addressObj.city}${addressObj.county}`
       let params = {
-        ...this.form,
+        locality: locality,
+        country: addressObj.countyCode,
+        address: addressObj.address,
+        longitude: addressObj.lng,
+        latitude: addressObj.lat,
         id: this.objInfo && this.objInfo.merchantId
       }
       let res = await this.$http.post('/merchant/register/updateInfo', params)

pages/store/storeInfo.vue

@@ -167,7 +167,7 @@ export default {
     font-weight: 500;
   }
   .green {
-    color: green;
+    color: #53CC48;
     font-weight: 500;
   }
 }

pages/store/storeQualification.vue

@@ -28,7 +28,7 @@
         <i class="text-bg-w "></i>
       </view>
       <view class="business-img flex align-center">
-        <image class='img' v-if='infoObj.shopStatus.status==2 || infoObj.shopStatus.status==0'
+        <image class='img' v-if='infoObj.shopStatus.status==0'
           :src="item.special ? item.special : '/static/login/shiping.png'" mode="">
         </image>
         <Upload v-else width="332" height="190" :maxCount="1" :fileList.sync="item.specialArr" delIcon='trash'
@@ -106,6 +106,7 @@ export default {
         return false;
       });
       if (hasError) return;
+      this.disabled = true
       const imgArr = []
       this.dynamicList.forEach((e => {
         for (var key in this.fileObj) {
@@ -133,12 +134,14 @@ export default {
             icon: 'none',
             title: '提交成功'
           })
+          this.disabled = false
           this.goPage()
         } else {
           uni.showToast({
             icon: 'none',
             title: res.data.message
           })
+          this.disabled = false
         }
       })
     },
@@ -213,7 +216,7 @@ export default {
     font-weight: 500;
   }
   .green {
-    color: green;
+    color: #53cc48;
     font-weight: 500;
   }
   .title-box {