From 3a66811a52e76f9dde8042110d7c50f4f5301df7 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 23 Jan 2025 01:08:05 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A[#3143]=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB=E8=B5=84=E6=96=99=E5=A1=AB=E5=86=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E2=80=94=E6=9C=AA=E5=A1=AB=E5=86=99=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CitySelect.vue   |  5 +++--
 pkg_join/views/supplier.vue | 22 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/components/CitySelect.vue b/components/CitySelect.vue
index 226c9e2..3df9f07 100644
--- a/components/CitySelect.vue
+++ b/components/CitySelect.vue
@@ -87,7 +87,7 @@ export default {
   components: {
     uniPopup
   },
-  props: ["callback", "items", "defaultValue"],
+  props: ["callback", "items", "defaultValue", 'disabled'],
   data() {
     return {
       value: "请选择",
@@ -107,7 +107,7 @@ export default {
     },
     defaultValue(newValue) {
       this.value = newValue;
-      // this.adjustDefaultValue();
+      this.adjustDefaultValue();
     }
   },
   mounted() {
@@ -147,6 +147,7 @@ export default {
       return idx;
     },
     open() {
+      if(this.disabled) return;
       if (this.$refs.popup.showPopup) {
         this.$refs.popup.close();
         return;
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 5cfb772..38f4111 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -388,7 +388,7 @@
               <text class="required">*</text>
             </template>
             <template #value>
-              <view class="u-text__value" :class="{'area-item':form.area.length===0}">
+              <view class="u-text__value" :class="{'area-item':form.area && form.area.length===0}">
                 <CitySelect
                   ref="cityselect2"
                   :defaultValue="form.area"
@@ -714,7 +714,7 @@ export default {
       indexSupplierType: 0,
       district: [],
       isAgree: false,
-      show: true,
+      show: false,
       notice: '',
       showRemove: false,
       isDraft: null,
@@ -731,7 +731,14 @@ export default {
     const type = options.type
     const local = uni.getStorageSync(type)
     const local_form = uni.getStorageSync(type + '_form')
-    this.form = local_form || {
+    this.quaPics = uni.getStorageSync(type + '_quaPics') || []
+    if(!local_form.serviceTime)  {
+      local_form.serviceTime = '00:00'
+    }
+    if(!local_form.serviceEndTime)  {
+      local_form.serviceEndTime = '23:59'
+    }
+    this.form = !this.reviewing && local_form || {
       name: '',
       cover: '',
       coverVideo: '',
@@ -748,7 +755,7 @@ export default {
       serviceTime: '00:00',
       serviceEndTime: '23:59'
     }
-    this.formSupplier = local || {
+    this.formSupplier = !this.reviewing && local || {
       name: '',
       avatar: '',
       contact: '',
@@ -761,6 +768,7 @@ export default {
       position: ''
     }
     this.formSupplier.subType = type
+    
     if (type === 'goods_supplier') {
       this.infoTitle = '特产'
       this.pageKeyId = 'merchantApplyGoodsSupplier'
@@ -775,6 +783,7 @@ export default {
   },
   onUnload() {
     uni.setStorageSync(this.formSupplier.subType, this.formSupplier)
+    uni.setStorageSync(this.formSupplier.subType+'_quaPics', this.quaPics)
     uni.setStorageSync(this.formSupplier.subType + '_form', this.form)
   },
   onReady() {
@@ -848,6 +857,9 @@ export default {
         }
         this.isDraft = data.isDraft
         this.reviewStatus = data.reviewStatus
+        if(data.isDraft === null) {
+          this.show = true
+        }
         if (data.isDraft !== 1) {
           switch (data.reviewStatus) {
             case 0:
@@ -879,7 +891,7 @@ export default {
           }
           // 商家资质
           this.quaPics = []
-          const quaPicsTemp = this.form.qualification.split(',')
+          const quaPicsTemp = this.form.qualification && this.form.qualification.split(',') || []
           if (quaPicsTemp.length > 0) {
             quaPicsTemp.map(item => {
               if (item) {