From 2c325ad5b1bc39488785a41f90b414b2b081fb90 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 12 Feb 2025 17:26:50 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3177=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=89=B9=E4=BA=A7=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E7=8E=A9=EF=BC=8C=E7=89=B9=E8=89=B2=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=8F=88=E8=A2=AB?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9E=E5=8E=BB=E4=BA=86=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=85=88=E5=BC=B9=E5=87=BA=E5=85=A5=E9=A9=BB=E9=A1=BB=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/supplier.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 1030908..852af77 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -149,7 +149,7 @@
               <text class="required">*</text>
             </template>
             <template #value>
-              <view class="u-text__value" :class="{'area-item':formSupplier.area.length===0}">
+              <view class="u-text__value" :class="{'area-item':formSupplier.area && formSupplier.area.length===0}">
               <CitySelect
                 ref="cityselect"
                 :defaultValue="formSupplier.area"
@@ -729,8 +729,8 @@ export default {
   onLoad(options) {
     this.partnerId = options.partnerId || ''
     const type = options.type
-    const local = uni.getStorageSync(type)
-    const local_form = uni.getStorageSync(type + '_form')
+    const local = uni.getStorageSync(type) || {}
+    const local_form = uni.getStorageSync(type + '_form') || {}
     this.quaPics = uni.getStorageSync(type + '_quaPics') || []
     if(!local_form.serviceTime)  {
       local_form.serviceTime = '00:00'
@@ -851,7 +851,11 @@ export default {
       })
     },
     initInfo() {
-      getShopInfo().then(({data}) => {
+      // 是否缺少参数区分文玩和特产？
+      getShopInfo().then((res) => {
+        const {data} = res
+        // console.log(res, 'initInfo--------');
+        // console.log(data, 'data--------');
         if (data.partnerId != null) {
           this.partnerId = data.partnerId
         }
@@ -902,20 +906,23 @@ export default {
           this.indexType = this.columnsType.findIndex(item => item.id === this.form.type)
           this.form.typeText = this.columnsType[this.indexType].name
           this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6)
-          this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`
+          this.form.area = `${this.form.provinceName || ''} ${this.form.cityName || ''} ${this.form.areaName || ''}` 
+          console.log(this.form, 'form--------');
           if (data.hotelInfo.coverType === 2) {
             this.form.coverVideo = data.hotelInfo.cover
             this.form.cover = ''
           }
         }
+        // console.log(data.supplierInfo, 'supplierInfo--------');
         if (data.supplierInfo) {
           if (this.infoTitle === "特产" && data.applyType !== 1) return
           if (this.infoTitle === "文玩" && data.applyType !== 3) return
           this.formSupplier = data.supplierInfo
-          this.indexSupplierType = this.columnsSupplierType.findIndex(item => item.key === this.formSupplier.subType)
           this.formSupplier.typeText = this.columnsSupplierType[this.indexSupplierType].value
           this.formSupplier.position = this.$forceToDecimal(this.formSupplier.longitude, 6) + ',' + this.$forceToDecimal(this.formSupplier.latitude, 6)
-          this.formSupplier.area = `${this.formSupplier.provinceName} ${this.formSupplier.cityName} ${this.formSupplier.areaName}`
+          this.formSupplier.area = `${this.formSupplier.provinceName || ''} ${this.formSupplier.cityName || ''} ${this.formSupplier.areaName || ''}`
+          this.indexSupplierType = this.columnsSupplierType.findIndex(item => item.key === this.formSupplier.subType)
+          // console.log(this.formSupplier);
         }
       })
     },
@@ -1016,7 +1023,7 @@ export default {
         cityId: values.city.id,
         areaId: values.district.id
       }
-      this.formSupplier.area = `${address.province} ${address.city} ${address.district}`
+      this.formSupplier.area = `${address.province || ''} ${address.city || ''} ${address.district || ''}`
       this.formSupplier.provinceId = values.province.id
       this.formSupplier.cityId = values.city.id
       this.formSupplier.areaId = values.district.id
@@ -1031,7 +1038,7 @@ export default {
         cityId: values.city.id,
         areaId: values.district.id
       }
-      this.form.area = `${address.province} ${address.city} ${address.district}`
+      this.form.area = `${address.province || ''} ${address.city || ''} ${address.district || ''}`
       this.form.provinceId = values.province.id
       this.form.cityId = values.city.id
       this.form.areaId = values.district.id