shish пре 2 година
родитељ
комит
7fbf3573eb
2 измењених фајлова са 12 додато и 104 уклоњено
  1. 6 57
      ghsApp/src/pagesClient/official/apply.vue
  2. 6 47
      hdApp/src/pagesClient/official/apply.vue

+ 6 - 57
ghsApp/src/pagesClient/official/apply.vue

@@ -14,10 +14,9 @@
           <div class="tui-input" v-if="form.province" >{{ form.province + '-' + form.city }}</div>
           <div class="tui-placeholder" v-else >请选择</div>
         </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn" >
+        <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">所在地址</div>
-          <div class="tui-input" v-if="form.address" >{{ form.address }}</div>
-          <div class="tui-placeholder" v-else >详细地址</div>
+          <input v-model="form.address" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="address" placeholder="请填写" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" >
           <div class="tui-title">楼号门牌</div>
@@ -25,18 +24,6 @@
         </tui-list-cell>
       </view>
 
-      <view class="module-com">
-        <view class="module-tit">
-          <span>门店照片</span>
-          <span class="app-color-3">(选填)</span>
-        </view>
-        <view class="module-det">
-          <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers" :quality="80"
-           @uploadSuccess="imgUploadSuccess" @imgDelete="imgDeleteFn" :action="uploadImgUrl">
-          </htz-image-upload>
-        </view>
-      </view>
-
       <view class="module-com">
           <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title required">姓名</div>
@@ -83,8 +70,6 @@
         <button class="admin-button-com blue big" formType="submit" >确认</button>
       </div>
 
-      <!-- 选择地区 -->
-      <app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city" />
       <!-- 省市联动 -->
       <simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm" ></simple-address>
 
@@ -132,16 +117,14 @@ export default {
         main: 1,
         licenseNo: "",
         license: "",
-        // floor: "",
-        longitude: "",
-        latitude: "",
+        floor: "",
+        longitude: 10,
+        latitude: 11,
         showAddress:"",
         authCode:"",
         cover:''
       },
       showRegion: false,
-      // 省市联动
-      regionData: [],
       cityPickerValueDefault: [0, 0],
       adminName: "",
       logo: '',
@@ -164,25 +147,6 @@ export default {
     clearInterval(this.INT)
   },
 	onShow() {
-    
-		// let self = this
-		// uni.getLocation({
-		// 	type: 'wgs84',
-		// 	success: function (res) {
-		// 		mapResolve({lat:res.latitude,long:res.longitude}).then((obj) => {
-    //       if(!util.isEmpty(obj.data)){
-    //         console.log(obj)
-    //         self.form.longitude=res.longitude,
-    //         self.form.latitude=res.latitude,
-    //         self.form.province = obj.data.province
-    //         self.form.city = obj.data.city
-    //         self.form.address = obj.data.address
-    //         self.form.showAddress = obj.data.showAddress
-    //         uni.showToast({ title: '已自动填写地址', duration: 2500 })
-    //       }
-		// 		})
-		// 	}
-		// })
 
 	},
   methods: {
@@ -239,22 +203,6 @@ export default {
         this.merchantData = res.data.introduce
       });
     },
-    // 选择地址
-    selRegionFn () {
-      if (!this.form.city) {
-        this.$msg("请先选择城市");
-        return false;
-      }
-      this.showRegion = true;
-    },
-    changeAreaFn (e) {
-      this.form.address = e.title;
-      this.form.showAddress = e.address;
-      this.form.latitude = e.location.lat;
-      this.form.longitude = e.location.lng;
-      this.form.dist = e.district
-    },
-    // 省市联动
     openAddres () {
       this.$refs.simpleAddress.open();
     },
@@ -307,6 +255,7 @@ export default {
     },
     confirmFn () {
       let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
+      this.form.showAddress = this.form.city+this.form.address+this.form.floor
       uni.showLoading({mask:true})
       applyRegister({
         hdShopAdminId: this.option.hdShopAdminId,

+ 6 - 47
hdApp/src/pagesClient/official/apply.vue

@@ -30,10 +30,9 @@
           <div class="tui-input" v-if="form.province" >{{ form.province + '-' + form.city }}</div>
           <div class="tui-placeholder" v-else >请选择</div>
         </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn" >
+        <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">所在地址</div>
-          <div class="tui-input" v-if="form.address" >{{ form.address }}</div>
-          <div class="tui-placeholder" v-else >详细地址</div>
+          <input v-model="form.address" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="address" placeholder="请填写地址" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" >
           <div class="tui-title">楼号门牌</div>
@@ -68,8 +67,6 @@
         <button class="admin-button-com blue big" formType="submit" >确认</button>
       </div>
 
-      <!-- 选择地区 -->
-      <app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city" />
       <!-- 省市联动 -->
       <simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm" ></simple-address>
 
@@ -121,16 +118,13 @@ export default {
         main: 1,
         licenseNo: "",
         license: "",
-        // floor: "",
-        longitude: "",
-        latitude: "",
+        floor: "",
+        longitude: 10,
+        latitude: 11,
         showAddress:"",
         authCode:"",
         cover:''
       },
-      showRegion: false,
-      // 省市联动
-      regionData: [],
       cityPickerValueDefault: [0, 0],
       adminName: "",
       logo: '',
@@ -153,26 +147,6 @@ export default {
     clearInterval(this.INT)
   },
 	onShow() {
-    
-		// let self = this
-		// uni.getLocation({
-		// 	type: 'wgs84',
-		// 	success: function (res) {
-		// 		mapResolve({lat:res.latitude,long:res.longitude}).then((obj) => {
-    //       if(!util.isEmpty(obj.data)){
-    //         console.log(obj)
-    //         self.form.longitude=res.longitude,
-    //         self.form.latitude=res.latitude,
-    //         self.form.province = obj.data.province
-    //         self.form.city = obj.data.city
-    //         self.form.address = obj.data.address
-    //         self.form.showAddress = obj.data.showAddress
-    //         uni.showToast({ title: '已自动填写地址', duration: 2500 })
-    //       }
-		// 		})
-		// 	}
-		// })
-
 	},
   methods: {
     ...mapActions(['setUserShopAll']),
@@ -243,22 +217,6 @@ export default {
         this.merchantData = res.data.introduce
       });
     },
-    // 选择地址
-    selRegionFn () {
-      if (!this.form.city) {
-        this.$msg("请先选择城市");
-        return false;
-      }
-      this.showRegion = true;
-    },
-    changeAreaFn (e) {
-      this.form.address = e.title;
-      this.form.showAddress = e.address;
-      this.form.latitude = e.location.lat;
-      this.form.longitude = e.location.lng;
-      this.form.dist = e.district
-    },
-    // 省市联动
     openAddres () {
       this.$refs.simpleAddress.open();
     },
@@ -308,6 +266,7 @@ export default {
       let style = this.option.style || 0
       let from = this.option.from || 0
       let that = this
+      this.form.showAddress = this.form.city+this.form.address+this.form.floor
       uni.showLoading({mask:true})
       applyRegister({hdShopAdminId:this.option.hdShopAdminId,ghsShopAdminId:this.option.ghsShopAdminId,...this.form,style:style,from:from,miniOpenId:currentMiniOpenId}).then(subRes => {
         uni.hideLoading()