From 8f28c33ba242d8b0801d2d6a9439fde8ae49cd9a Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 2 Jun 2025 12:51:25 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3829=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=E9=A6=96=E6=AC=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=A5=E9=A9=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9C=81=E5=B8=82=E5=8C=BA=E9=80=89=E9=A1=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E2=80=9Cnull=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innApply.vue     |  2 +-
 pkg_join/views/shop.vue       |  2 +-
 pkg_join/views/supplier.vue   | 10 +++++-----
 pkg_join/views/wholesaler.vue |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pagesInn/inn/innApply.vue b/pagesInn/inn/innApply.vue
index c91e1f9..bb949ae 100644
--- a/pagesInn/inn/innApply.vue
+++ b/pagesInn/inn/innApply.vue
@@ -44,7 +44,7 @@
           <view class="">
             <CitySelect
                 ref="cityselect"
-                :defaultValue="addressText"
+                :defaultValue="addressText || ''"
                 @callback="result"
                 :items="district"
             ></CitySelect>
diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index e7fd4c9..31c6605 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -268,7 +268,7 @@
             <view class="u-text__value" :class="{'area-item':form.area && form.area.length===0}">
               <CitySelect
                 ref="cityselect"
-                :defaultValue="form.area"
+                :defaultValue="form.area || ''"
                 :disabled="reviewing"
                 :items="district"
                 @callback="result"
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index e199458..0746bc6 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -152,7 +152,7 @@
               <view class="u-text__value" :class="{'area-item':formSupplier.area && formSupplier.area.length===0}">
               <CitySelect
                 ref="cityselect"
-                :defaultValue="formSupplier.area"
+                :defaultValue="formSupplier.area || ''"
                 :disabled="reviewing"
                 :items="district"
                 @callback="resultSupplier"
@@ -391,7 +391,7 @@
               <view class="u-text__value" :class="{'area-item':form.area && form.area.length===0}">
                 <CitySelect
                   ref="cityselect2"
-                  :defaultValue="form.area"
+                  :defaultValue="form.area || ''"
                   :disabled="reviewing"
                   :items="district"
                   @callback="result"
@@ -432,7 +432,7 @@
               <text class="required">*</text>
             </template>
             <template #value>
-              <u--text :text="form.serviceTime + ' - ' + form.serviceEndTime"></u--text>
+              <u--text :text="`${form.serviceTime || ''} - ${form.serviceEndTime || ''}`"></u--text>
               <tpf-time-range
                 startTime="00:00"
                 endTime="23:59"
@@ -928,9 +928,9 @@ export default {
           this.formSupplier = data.supplierInfo
           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);
+          console.log(this.formSupplier);
         }
       })
     },
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index 5fe2c9e..ed522ec 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -161,7 +161,7 @@
             <view class="u-text__value" :class="{'area-item':form.area.length===0}">
               <CitySelect
                 ref="cityselect"
-                :defaultValue="form.area"
+                :defaultValue="form.area || ''"
                 :disabled="reviewing"
                 :items="district"
                 @callback="result"