From 8ba90c89632e1167b5204e4b2eae5cbd23fc5374 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Thu, 16 Jan 2025 16:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BB=B7=E6=A0=BC=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/0-conf.js | 8 ++++---- pagesOrder/confirm_order/index.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/0-conf.js b/framework/0-conf.js index 5d0ebde..a4135e8 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -6,12 +6,12 @@ const proxyApi = "/api" // const proxyApi = 'http://192.168.1.15:9888/cashierService' // 王伟 // const proxyApi = 'http://192.168.1.27:9888/cashierService' // 帆哥 // const proxyApiwws = 'ws://192.168.1.15:9888/netty' // 测试 -// const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 -// const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 +const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 +const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 // const proxyApi = 'https://pre-cashier.sxczgkj.cn/cashierService' // 预发布 // const proxyApiwws = 'wss://pre-cashier.sxczgkj.cn/netty' // 预发布 -const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上 -const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 +// const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上 +// const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 // #endif // #ifdef H5 diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue index a609723..889520c 100644 --- a/pagesOrder/confirm_order/index.vue +++ b/pagesOrder/confirm_order/index.vue @@ -70,7 +70,7 @@ X{{ item.totalNumber || ""}} - ￥{{ item.memberPrice*item.totalNumber || item.salePrice*item.totalNumber || 0}} + ￥{{ amountVIP.isVip == 1 ? item.memberPrice*item.totalNumber : item.salePrice*item.totalNumber }} 打包费 @@ -285,7 +285,7 @@ this.cartLists = JSON.parse(options.cartLists); this.listinfo.name = this.storeInfo.shopName; this.listinfo.details = JSON.parse(options.cartLists).data; - this.listinfo.payAmount = this.cartLists.memberAmount && this.cartLists.memberAmount > 0 ? this.cartLists.memberAmount : this.cartLists.amount + this.listinfo.payAmount = this.amountVIP.isVip == 1 && this.cartLists.memberAmount && this.cartLists.memberAmount > 0 ? this.cartLists.memberAmount : this.cartLists.amount if ( options.tableCode ) { this.tableCode = options.tableCode;} if ( this.storeInfo.eatModel.indexOf("dine-in") != -1 ) { this.eatModel = "dine-in";