From edcc140ec26e79f1516fe25676a9436984870f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Tue, 5 Dec 2023 10:50:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shopManage/shopModal.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/shopManage/shopModal.vue b/src/views/shopManage/shopModal.vue
index 2688ce6..aedb615 100644
--- a/src/views/shopManage/shopModal.vue
+++ b/src/views/shopManage/shopModal.vue
@@ -74,7 +74,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row v-if="title != '编辑门店'" justify="start">
+        <a-row justify="start">
           <a-col :span="12">
             <a-form-item
               label="承接销售"
@@ -85,6 +85,7 @@
                 v-model:value="formModel.userId"
                 :field-names="{ label: 'userName', value: 'userId' }"
                 :options="userList"
+                :disabled="title == '编辑门店'"
                 placeholder="请选择承接销售"
               />
             </a-form-item>
@@ -113,7 +114,7 @@
               <a-textarea
                 id="tipinput"
                 v-model:value="formModel.address"
-                :readonly="title == '编辑门店'"
+                :disabled="title == '编辑门店'"
                 allow-clear
                 auto-size
                 placeholder="请输入详细地址"
@@ -316,14 +317,17 @@ defineExpose({
       title.value = '添加门店'
     } else if (newFormAction === FormAction.UPDATE) {
       title.value = '编辑门店'
-      const tradeTime = record?.tradeTime.toString()
+      const data: shopDetailVO = Object.assign({}, record)
+      const tradeTime = data?.tradeTime.toString()
       const time: string[] = tradeTime!.split('-')
-      if (time) {
-        time[0] = time[0] + ':00'
-        time[1] = time[1] + ':00'
+      if (time[0].trim().length == 5) {
+        time[0] = time[0].trim() + ':00'
+      }
+      if (time[1].trim().length == 5) {
+        time[1] = time[1].trim() + ':00'
       }
-      record!.tradeTime = time
-      overrideProperties(formModel, record)
+      data!.tradeTime = time
+      overrideProperties(formModel, data)
     }
     formAction.value = newFormAction
   }

From 3d17ef10829685e6808084db06d151d7787b0724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Tue, 5 Dec 2023 10:57:18 +0800
Subject: [PATCH 2/2] 12

---
 vite.config.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 7bafd29..53047d0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,8 +19,6 @@ import VueI18n from '@intlify/unplugin-vue-i18n/vite'
 import { projectTitle } from './src/config'
 import { antdvStyleDeps } from './src/utils/resolvers'
 
-//项目
-// export const serverAddress = 'http://admin.ballcat.cn'
 //xy
 // export const serverAddress = 'http://172.18.0.225:8000'
 //jt
@@ -28,15 +26,10 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //ts
 // export const serverAddress = 'http://172.18.0.228:8000'
 //测试
-export const serverAddress = 'http://39.100.77.21:8000'
+// export const serverAddress = 'http://39.100.77.21:8000'
 
-//线上ip
-// export const serverAddress = 'http://175.27.212.74:80'
 //线上域名,现在用这个
-// export const serverAddress = 'https://byffp.top'
-// export const serverAddress = 'http://8.130.96.163:8100'
-// https://vitejs.dev/config/
-// export const serverAddress = process.env.VUE_APP_BASE_API
+export const serverAddress = 'https://byffp.top'
 
 export default defineConfig({
   server: {