From 1d429dc104d672dd58117a685ea5f6fa6a1fd3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Mon, 25 Sep 2023 13:53:19 +0800
Subject: [PATCH 1/4] 123

---
 .../geopoliticalCustomers/geopoliticalCustomersModal.vue     | 5 +++--
 src/views/qualityInspectionDistribution/inspectionModal.vue  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 1fac550..1fdc916 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -383,8 +383,9 @@
       <p>联系方式：{{ formModel.customNid }}</p>
       <div style="overflow-y: auto; max-height: 200px">
         <p v-for="(item, index) in formModel.customStoreEntities" :key="index">
-          {{ `报名的门店${index + 1}为` }}： {{ item.storeName }} --
-          {{ `${item.reservationDate?.toString().split(' ')[0]} ${item.reservationTime}` }}
+          <span>{{ `报名的门店${index + 1}为` }}：{{ item.storeName }}</span>
+          <span>&nbsp;{{ item.reservationDate?.toString().split(' ')[0] }}</span>
+          <span>&nbsp;{{ item.reservationTime }}</span>
         </p>
       </div>
     </a-modal>
diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index 38703b6..4da75ee 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -59,7 +59,7 @@
           </a-col>
           <a-col xs="24" :sm="24" :md="12">
             <a-form-item label="预约时间">
-              <a-input v-model:value="item.reservationTime" placeholder="请输入" readonly />
+              <a-input v-model:value="item.reservationTime" placeholder="未选择" readonly />
             </a-form-item>
           </a-col>
         </a-row>
@@ -186,7 +186,7 @@ defineExpose({
             const targetObj = formModel.customStoreVOList.find(
               (i: any) => i.storeId === item.storeId
             )
-            if (targetObj) {
+            if (targetObj && item.reservationDate) {
               targetObj.reservationTime =
                 item.reservationDate.split(' ')[0] + ' ' + item.reservationTime
             }

From 78943ff9ae8966c5f06215764b673d8e178ccb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Mon, 25 Sep 2023 13:57:00 +0800
Subject: [PATCH 2/4] 123

---
 .../geopoliticalCustomers/geopoliticalCustomersModal.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 1fdc916..05c31a4 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -650,7 +650,7 @@ const match = () => {
 const resetForm = () => {
   formModel.address = []
   formModel.detailAddress = ''
-  formModel.radius = ''
+  formModel.radius = '5000'
   // initMap()
   listData.value.length = 0
   map.value.clearMap()
@@ -692,7 +692,7 @@ const storeResetForm = () => {
   if (title.value !== '编辑预约') {
     formModel.address = []
     formModel.detailAddress = ''
-    formModel.radius = ''
+    formModel.radius = '5000'
   }
   formModel.customStoreEntities.length = 0
 

From 7dd2555b8f25fceff3501094a47954e6513218f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Mon, 25 Sep 2023 16:00:25 +0800
Subject: [PATCH 3/4] 123

---
 src/views/qualityInspectionDistribution/inspectionIndex.vue | 2 +-
 vite.config.ts                                              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue
index 34d081d..2cbb5c6 100644
--- a/src/views/qualityInspectionDistribution/inspectionIndex.vue
+++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue
@@ -111,7 +111,7 @@ const columns: ProColumns[] = [
     dataIndex: 'enrollStatus',
     customRender: function ({ record }: any) {
       if (record.enrollStatus === 0) {
-        return h('div', '暂缓中')
+        return h('div', '暂存中')
       } else if (record.enrollStatus === 1) {
         return h('div', '待分发')
       } else if (record.enrollStatus === 2) {
diff --git a/vite.config.ts b/vite.config.ts
index 8d04afb..c42433a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //项目
 // const serverAddress = 'http://admin.ballcat.cn'
 //xy
-const serverAddress = 'http://172.18.0.225:8000'
+// const serverAddress = 'http://172.18.0.225:8000'
 //jt
 // const serverAddress = 'http://172.18.1.8:8000'
 //ts
 // const serverAddress = 'http://172.18.0.228:8000'
 //测试
-// const serverAddress = 'http://39.100.77.21:8000'
+const serverAddress = 'http://39.100.77.21:8000'
 
 //线上ip
 // const serverAddress = 'http://175.27.212.74:80'

From 9f3d38f513a0757fc6de690d1dd92fa05ecfa3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Mon, 25 Sep 2023 17:41:12 +0800
Subject: [PATCH 4/4] 123

---
 src/views/shopManage/shopIndex.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/shopManage/shopIndex.vue b/src/views/shopManage/shopIndex.vue
index bb708c9..9718ca1 100644
--- a/src/views/shopManage/shopIndex.vue
+++ b/src/views/shopManage/shopIndex.vue
@@ -157,11 +157,11 @@ const columns: ProColumns[] = [
   },
   {
     title: '承接销售',
-    dataIndex: 'address'
+    dataIndex: 'userName'
   },
   {
     title: '店铺地址',
-    dataIndex: 'userName'
+    dataIndex: 'address'
   },
   {
     title: '创建日期',