From 48b569f49d84beffa08c4e79f4be379c5340d0b0 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Sat, 25 May 2024 10:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/0-conf.js | 5 +- .../group_order/components/groupMerchants.vue | 2 +- pages/index/drinks.vue | 2 +- pages/index/hotlist.vue | 2 +- pages/index/tothestore.vue | 2 +- pages/order/successful.vue | 3 - pages/order_detail/order_detail.vue | 2 +- pages/product/generalstore.vue | 2 +- pages/product/index.vue | 1 + pages/product/placeOrder.vue | 35 +++-- .../cc-defineKeyboard/cc-defineKeyboard.vue | 137 +++++++++--------- 11 files changed, 100 insertions(+), 93 deletions(-) diff --git a/framework/0-conf.js b/framework/0-conf.js index e488114..116446d 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -3,10 +3,10 @@ const debug = process.env.NODE_ENV == 'development' ? true : false; const proxyApi = "/api" // #endif // #ifdef MP-WEIXIN || APP -// const proxyApi = 'http://192.168.2.133:9889/cashierService' // 王伟 +// const proxyApi = 'http://192.168.2.96:9889/cashierService' // 王伟 // const proxyApi = 'http://192.168.2.74:9888/cashierService' // 帆哥 -const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 // const proxyApiwws = 'ws://192.168.2.74:9888/cashierService' // 测试 +const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试 // #endif @@ -19,6 +19,7 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService' // const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上 // const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上 const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试 +// const baseUrl = 'http://192.168.2.96:9889/cashierService' const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试 // #endif diff --git a/pages/group_order/components/groupMerchants.vue b/pages/group_order/components/groupMerchants.vue index 3738326..7a04763 100644 --- a/pages/group_order/components/groupMerchants.vue +++ b/pages/group_order/components/groupMerchants.vue @@ -10,7 +10,7 @@ {{info.distances}}km | + style="width: 17.9rpx;height: 22rpx;margin-right: 6rpx;" mode="">{{info.distances}} | {{info.address}} diff --git a/pages/index/drinks.vue b/pages/index/drinks.vue index c4910ef..5be53c1 100644 --- a/pages/index/drinks.vue +++ b/pages/index/drinks.vue @@ -35,7 +35,7 @@ {{item.shopName}} - 龙首.{{item.distances}}km + {{item.distances}} diff --git a/pages/index/hotlist.vue b/pages/index/hotlist.vue index 124f88a..e531358 100644 --- a/pages/index/hotlist.vue +++ b/pages/index/hotlist.vue @@ -47,7 +47,7 @@ {{item.productName}} - {{item.distances}}km + {{item.distances}} diff --git a/pages/index/tothestore.vue b/pages/index/tothestore.vue index 55e77ab..22209cb 100644 --- a/pages/index/tothestore.vue +++ b/pages/index/tothestore.vue @@ -27,7 +27,7 @@ {{item.address.length>7?item.address.substring(0,7)+'...':item.address}} - {{item.distances}}km + {{item.distances}} diff --git a/pages/order/successful.vue b/pages/order/successful.vue index 405aefb..1409dc7 100644 --- a/pages/order/successful.vue +++ b/pages/order/successful.vue @@ -148,9 +148,6 @@ }, 1000) this.getinfo(e.orderId) this.orderInfo = JSON.parse(e.orderInfo) - console.log('调试1', e) - console.log('调试2', JSON.parse(e.orderInfo)) - console.log('调试3', this.orderInfo) }, computed: { HeighT() { //手机类型的尺寸 diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue index 17c59b7..f6cd4e7 100644 --- a/pages/order_detail/order_detail.vue +++ b/pages/order_detail/order_detail.vue @@ -426,7 +426,7 @@ let isVip = uni.cache.get('userInfo').isPwd if (isVip == 0) { uni.pro.navigateTo('/pages/user/repairpassword', { - // shopId_id: uni.cache.get('shopUser') + shopId_id: uni.cache.get('shopUser') }) } else { this.ispws = true diff --git a/pages/product/generalstore.vue b/pages/product/generalstore.vue index 54b78c9..7bc480d 100644 --- a/pages/product/generalstore.vue +++ b/pages/product/generalstore.vue @@ -17,7 +17,7 @@ - 距您{{item.distances}}km,{{item.address}} + 距您{{item.distances}},{{item.address}} diff --git a/pages/product/index.vue b/pages/product/index.vue index 94aca6d..f593443 100644 --- a/pages/product/index.vue +++ b/pages/product/index.vue @@ -467,6 +467,7 @@ bottom: 0; left: 0; width: 100%; + height: 180rpx; padding: 24rpx 28rpx; background: #FFFFFF; z-index: 999; diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue index c9e5042..188325a 100644 --- a/pages/product/placeOrder.vue +++ b/pages/product/placeOrder.vue @@ -40,16 +40,16 @@ - 优惠￥{{info.save * Quantity}} + 优惠￥{{calculateEvent(info.save)}} - 小计￥{{info.salePrice * Quantity}} + 小计￥{{calculateEvent(info.salePrice) }} - + 支付方式 @@ -65,9 +65,8 @@ - - - + + @@ -77,7 +76,7 @@ - + 会员卡余额{{ amountVIP.amount}} 去充值 @@ -88,11 +87,12 @@ 合计 ￥{{info.salePrice * Quantity}} + style="font-size: 32rpx;font-weight: bold;color:#FF4C11"> ￥{{calculateEvent(info.salePrice)}} + 含优惠卷包￥0 - 共{{Quantity}}件 已优惠￥{{info.save * Quantity}} + 共{{Quantity}}件 已优惠￥{{calculateEvent(info.save) }} @@ -140,11 +140,16 @@ async accountPayevent(pwd) { this.ispws = false let res = await this.api.payOrderPay({ - orderId: this.listinfoid, + orderId: this.listinfoid.id, payType: "deposit", pwd }) if (res.code == 0) { + let orderInfo = { + createdAt:this.listinfoid.createTime, + orderNo:this.listinfoid.orderNo, + orderAmount:this.calculateEvent(this.info.salePrice) + } uni.showToast({ icon: 'none', title: '支付成功', @@ -152,8 +157,7 @@ setTimeout(res => { uni.redirectTo({ url: '/pages/order/successful?orderId=' + this - .listinfoid + '&orderInfo=' + JSON.stringify( - this.orderInfo) + .listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo) }); }, 1000) } @@ -165,6 +169,9 @@ }, 2000) } }, + calculateEvent(d) { + return (d * 1000 * this.Quantity)/1000 + }, goRecharge() { uni.pro.navigateTo('/pages/member/index', { shopId_id: this.info.shopId @@ -180,7 +187,7 @@ orderAmount: payMoney }) if (res.code == 0) { - this.listinfoid = res.data.id + this.listinfoid = res.data // radiovalue1:为1的时候微信支付,为2是会员卡,需要输入支付密码 if (this.radiovalue1 == 1) { // 调用支付接口 @@ -190,7 +197,7 @@ let isVip = uni.cache.get('userInfo').isPwd if (isVip == 0) { uni.pro.navigateTo('/pages/user/repairpassword', { - // shopId_id: uni.cache.get('shopUser') + shopId_id: uni.cache.get('shopUser') }) } else { this.ispws = true diff --git a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue index a63e3f4..6a5f80d 100644 --- a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue +++ b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue @@ -1,11 +1,14 @@