From a57148edfb8d359cd33b42c75f8bce9ccd6cccd2 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 28 Nov 2023 09:36:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vite.config.js b/vite.config.js index bd7133ab..d2a2d77e 100644 --- a/vite.config.js +++ b/vite.config.js @@ -22,8 +22,7 @@ export default ({ mode, command }) => { // sst // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000', - target: 'http://test.api.huitongys.com', - // target: 'http://h5uapi.huitongys.com', + target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 036ff7ff3610a8fea0aa501de298a3a0edffbe1c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 11 Dec 2023 17:05:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/reservationAddFrom.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index fae2efba..175a22c2 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -2752,21 +2752,21 @@ export default { console.log('orderList-------------》', this.orderList); if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!'); const list = [...this.orderList, ...this.orderData]; - let _name = list[0].customerName; - let _address = list[0].customerAddress; - let _phone = list[0].customerTelephone; - let _marketName = list[0].mallName; + let _name = list[0].customerName.trim(); + let _address = list[0].customerAddress.trim(); + let _phone = list[0].customerTelephone.trim(); + let _marketName = list[0].mallName.trim(); // 循环查看数据是否符合要求 const isRturn = list.every(item => { - if (item.mallName !== _marketName) { + if (item.mallName.trim() !== _marketName) { this.$message.warning('请选择统一商场!!!'); return false; } if ( - item.customerName !== _name || - item.customerAddress !== _address || - item.customerTelephone !== _phone + (item.customerName.trim() !== _name) || + (item.customerAddres.trim() !== _address) || + (item.customerTelephone.trim() !== _phone) ) { this.$message.warning('请选择统一顾客订单!!!'); return false; From 0c42aecccda02519065d36e41baa6091efa7c7c8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 11 Dec 2023 20:32:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=AF=B9=E8=AE=A2=E5=8D=95=E7=9A=84=E9=87=8D=E5=A4=8D=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/reservation/reservationAddFrom.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 175a22c2..442e4e17 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -2765,7 +2765,7 @@ export default { } if ( (item.customerName.trim() !== _name) || - (item.customerAddres.trim() !== _address) || + (item.customerAddress.trim() !== _address) || (item.customerTelephone.trim() !== _phone) ) { this.$message.warning('请选择统一顾客订单!!!'); From 5a6345cfb872164149a949bb89c47e24c431855e Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 11 Dec 2023 20:34:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/website.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/website.js b/src/config/website.js index 5ce28c18..5f613e00 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -52,7 +52,7 @@ export default { // 第三方系统授权地址 authUrl: 'http://localhost/blade-auth/oauth/render', // 报表设计器地址(cloud端口为8108,boot端口为80) - reportUrl: 'http://8.137.14.82:8108/ureport', + reportUrl: 'http://localhost:8108/ureport', // 单点登录系统认证(blade-auth服务的地) ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=', // 单点登录回调地址(Saber服务的登录界面地址)