From 06a9c4f2de82eb69ec9d7e5bc12ea6e9f1c85acc Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 12 Jun 2024 11:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/payPassword.vue | 2 +- framework/0-conf.js | 8 +++--- pages/index/index.vue | 4 +-- pages/login/login.vue | 1 - pages/member/index.vue | 1 + pages/order/order_detail.vue | 4 +++ pages/order_detail/order_detail.vue | 38 ++++++++++++++++++++++------- pages/order_food/order_food.vue | 5 ++++ 8 files changed, 46 insertions(+), 17 deletions(-) diff --git a/components/payPassword.vue b/components/payPassword.vue index 08be0cd..5b8d6a1 100644 --- a/components/payPassword.vue +++ b/components/payPassword.vue @@ -134,7 +134,7 @@ left: 0; top: 0; width: 100%; - height: 100%; + height: 100vh; background-color: #FFFFFF; } diff --git a/framework/0-conf.js b/framework/0-conf.js index 8fd61ec..400bb85 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -16,12 +16,12 @@ const baseUrl = debug ? proxyApi : "https://wxcashiertest.sxczgkj.cn/cashierServ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService' // #endif // #ifdef APP || MP-WEIXIN -// const baseUrl = 'https://cashier.sxczgkj.cn/cashierService'// 线上 -// const baseUrlwws = 'wss://cashier.sxczgkj.cn/cashierService' // 线上 +const baseUrl = 'https://cashier.sxczgkj.cn/cashierService'// 线上 +const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 // const baseUrl = 'http://192.168.2.42:9888/cashierService'// 测试-w // const baseUrlwws ='wss://192.168.2.42:9999/netty' // 测试-w -const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试 -const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/netty' // 测试 +// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试 +// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/netty' // 测试 // #endif // import VConsole from "./vConsole.js" diff --git a/pages/index/index.vue b/pages/index/index.vue index 82abbb3..615bb55 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -279,7 +279,7 @@ subCategoryList: [] //二级菜单数据 }; }, - + onPageScroll(e) { if (e.scrollTop <= 44) { //搜索导航栏 this.opacity = false @@ -510,7 +510,7 @@ if (item.isChild) { this.form.type = '' //先清空后赋值 - setTimeout(()=> { + setTimeout(() => { this.showproductlist = true }, 500); } else { diff --git a/pages/login/login.vue b/pages/login/login.vue index bc00736..4846bb1 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -289,7 +289,6 @@ uni.reLaunch({ url: '/pages/order_food/order_food' }); - sss } else { // uni.cache.set('shopUser', res.data.shopUser); uni.pro.switchTab('index/index') diff --git a/pages/member/index.vue b/pages/member/index.vue index 6089f52..9b30936 100644 --- a/pages/member/index.vue +++ b/pages/member/index.vue @@ -35,6 +35,7 @@ } }, onLoad(e) { + console.log(e, '调试2') this.shopId = e.shopId if (e.type == 'list') { //从列表进来的 diff --git a/pages/order/order_detail.vue b/pages/order/order_detail.vue index ff4bebb..b1cbcc7 100644 --- a/pages/order/order_detail.vue +++ b/pages/order/order_detail.vue @@ -127,6 +127,10 @@ console.log(e) this.orderId = e.orderId this.orderorderInfo() + + + + }, onShow() { if (this.orderId) { diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue index 86aa1fb..3ba5898 100644 --- a/pages/order_detail/order_detail.vue +++ b/pages/order_detail/order_detail.vue @@ -230,9 +230,9 @@ }, onUnload() { - uni.switchTab({ - url: '/pages/order/order' - }) + // uni.switchTab({ + // url: '/pages/order/order' + // }) uni.$off('getMessage') this.ispws = false }, @@ -396,6 +396,22 @@ }, showpopupclickdd() { + console.log('调试1') + // setTimeout(() => { + uni.requestSubscribeMessage({ + tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'], + success(){ + console.log(1) + }, + fail(){ + console.log(2) + }, + complete(){ + console.log(3) + }, + }) + // },1500) + return // radiovalue1为1是微信支付 if (this.radiovalue1 == 1) { this.showpopupclickdds() //微信支付 @@ -441,14 +457,17 @@ uni.showToast({ title: "支付成功" }) + let _this = this + uni.cache.set('shopUser', '') //删除shopUser this.paymodfiyOrderInfo() - setTimeout(res => { + + setTimeout(() => { uni.redirectTo({ - url: '/pages/order/order_detail?orderId=' + this - .listinfo.id, + url: '/pages/order/order_detail?orderId=' + _this + .listinfo.id }); - }, 500) + }, 700) }, }); // #endif @@ -469,9 +488,10 @@ // ->4 不是会员， if (res.data == 1) { this.showToastUppop('支付成功') - setTimeout(res => { + let _this = this + setTimeout(() => { uni.redirectTo({ - url: '/pages/order/order_detail?orderId=' + this + url: '/pages/order/order_detail?orderId=' + _this .listinfo.id }); }, 700) diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 5693cbc..47d5b2c 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -339,6 +339,7 @@ return false; } } else { + wx.hideLoading() switch (msg.type) { case 'sku': // sku 数量 this.$set(this, 'amountcartNumber', msg.amount) @@ -406,6 +407,10 @@ } }, handlemessage() { + wx.showLoading({ + title: '', + }) + this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接 this.socketTicket = new webSocketUtils(`${uni.conf.baseUrlwws}`, 5000, { tableId: uni.cache.get('tableCode'),