From ece7a35afd1eb02c33035d6d47f6536879f3f7ae Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Fri, 26 Jul 2024 11:17:49 +0800 Subject: [PATCH] =?UTF-8?q?fix::=E8=8F=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 + pages/index/indexs.vue | 3 +- pages/order/confirm_order.vue | 4 +- ...d - 副本.vue => order_food - 副本 (2).vue} | 65 +- pages/order_food/order_goods.vue | 764 ++++++++++++++++++ 5 files changed, 832 insertions(+), 11 deletions(-) rename pages/order_food/{order_food - 副本.vue => order_food - 副本 (2).vue} (94%) create mode 100644 pages/order_food/order_goods.vue diff --git a/pages.json b/pages.json index b45f432..f5ef036 100644 --- a/pages.json +++ b/pages.json @@ -166,6 +166,13 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/order_food/order_goods", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/order_food/goodsList_scroll", "style": { diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue index 0dba44e..a0ae518 100644 --- a/pages/index/indexs.vue +++ b/pages/index/indexs.vue @@ -61,7 +61,8 @@ let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code') uni.cache.set('tableCode', tableCode) if (tableCode) { - uni.pro.navigateTo('order_food/order_food') + uni.pro.navigateTo('order_food/order_goods') + // uni.pro.navigateTo('order_food/order_food') } } diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue index a289dc2..3edcd43 100644 --- a/pages/order/confirm_order.vue +++ b/pages/order/confirm_order.vue @@ -58,13 +58,13 @@ ¥{{ item.totalAmount}} - + 小计¥ {{listinfo.payAmount}} diff --git a/pages/order_food/order_food - 副本.vue b/pages/order_food/order_food - 副本 (2).vue similarity index 94% rename from pages/order_food/order_food - 副本.vue rename to pages/order_food/order_food - 副本 (2).vue index ece93bb..26cfe4a 100644 --- a/pages/order_food/order_food - 副本.vue +++ b/pages/order_food/order_food - 副本 (2).vue @@ -67,14 +67,20 @@ - + height="180"> --> + {{ item1.name }} + + 起售:{{ item1.suit }} + @@ -104,7 +110,7 @@ - + { + try { + uni.getUserInfo({ + provider: 'weixin', + success: async (infoRes) => { + uni.cache.set('weixincode', data.code); + let res = await this.api.userwxlogin({ + code: uni.cache.get('weixincode'), //临时登录凭证 + rawData: infoRes.rawData + }) + if (res.code == 0) { + uni.cache.set('token', res.data.token); + uni.cache.set('miniAppOpenId', res.data.userInfo + .miniAppOpenId) + uni.cache.set('userInfo', res.data.userInfo); + uni.$on('message', this.getMessage) + this.productqueryShopIdByTableCode() //获取shop User id + } + }, + fail: (err) => {} + }); + } catch (e) {} + } + }); + } else { + uni.$on('message', this.getMessage) + this.productqueryShopIdByTableCode() //获取shop User id + } }, methods: { onEnd() { //回调弹幕 @@ -330,7 +366,7 @@ if (res.code == 0) { uni.cache.set('shopUser', res.data) this.handlemessage() //监听websocket返回 - this.productqueryProduct() //list 数据 + // this.productqueryProduct() //list 数据 } else { setTimeout(() => { uni.pro.switchTab('index/index') @@ -416,6 +452,8 @@ } break; } + console.log(this.cartLists.data, 1111111) + this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true } } catch (e) { //TODO handle the exception @@ -567,6 +605,10 @@ }) return false } + uni.navigateTo({ + url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopList.storeInfo) + }); + return; uni.navigateTo({ url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists) }); @@ -885,6 +927,13 @@ font-weight: bold; } + .namess { + margin-top: 16rpx; + font-size: 24upx; + font-weight: 300; + color: #a5a5a5; + } + .select-sku-wrap { .t { color: #999; @@ -893,7 +942,7 @@ } .price-wrap { - padding-top: $paddingSize; + margin-top: 16rpx; display: flex; align-items: center; justify-content: space-between; diff --git a/pages/order_food/order_goods.vue b/pages/order_food/order_goods.vue new file mode 100644 index 0000000..a5d029c --- /dev/null +++ b/pages/order_food/order_goods.vue @@ -0,0 +1,764 @@ + + + + + \ No newline at end of file