From 82cea7c341cb1f3f439e6a6cc94b52fd35036bd1 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 26 Sep 2024 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/components/diamond.vue | 6 +-
pages/index/indexs.vue | 6 +-
pages/member/index.vue | 2 +
pagesOrder/components/orderInfoAfter.vue | 406 +++++++++++++++++++++
pagesOrder/components/orderInfoBefore.vue | 408 ++++++++++++++++++++++
pagesOrder/components/paymentMethod.vue | 146 ++++++++
pagesOrder/confirm_order/index.vue | 11 +-
pagesOrder/order_detail/index.vue | 393 +++++++++++----------
8 files changed, 1185 insertions(+), 193 deletions(-)
create mode 100644 pagesOrder/components/orderInfoAfter.vue
create mode 100644 pagesOrder/components/orderInfoBefore.vue
create mode 100644 pagesOrder/components/paymentMethod.vue
diff --git a/pages/index/components/diamond.vue b/pages/index/components/diamond.vue
index 7f1ce3c..11f519b 100644
--- a/pages/index/components/diamond.vue
+++ b/pages/index/components/diamond.vue
@@ -60,12 +60,8 @@
if (tableCode) {
let data = await this.api.productqueryShop({
code: uni.cache.get('tableCode'),
- lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng :
- '',
- lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat :
- '',
})
- if ( !data.data.shopTableInfo.orderId && data.data.storeInfo.isTableFee == 1) {
+ if ( !data.data.shopTableInfo.choseCount ) {
uni.pro.navigateTo('/pagesOrder/orderAMeal/index', {
tableCode: tableCode,
})
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index 88a42f1..6268412 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -70,13 +70,9 @@
if (tableCode) {
let data = await this.api.productqueryShop({
code: uni.cache.get('tableCode'),
- lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng :
- '',
- lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat :
- '',
})
console.log()
- if ( !data.data.shopTableInfo.orderId && data.data.storeInfo.isTableFee == 1) {
+ if ( !data.data.shopTableInfo.choseCount ) {
uni.pro.navigateTo('/pagesOrder/orderAMeal/index', {
tableCode: tableCode,
})
diff --git a/pages/member/index.vue b/pages/member/index.vue
index e58e30f..bbed540 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -126,6 +126,8 @@
// this.shopId = e.shopId;
// this.init();
// }
+
+ console.log(e)
uni.cache.set('forceUpdate',1)
if (e.q) {
this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
diff --git a/pagesOrder/components/orderInfoAfter.vue b/pagesOrder/components/orderInfoAfter.vue
new file mode 100644
index 0000000..ea6a200
--- /dev/null
+++ b/pagesOrder/components/orderInfoAfter.vue
@@ -0,0 +1,406 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 第{{item.placeNum}}次下单
+ {{item.placeTime}}
+
+
+
+
+
+
+
+
+
+
+ {{items.productName}}
+ {{items.productSkuName}}
+
+
+
+ ￥{{items.priceAmount}}
+ x{{items.num}}
+
+
+
+ 未付款
+
+ 小计￥
+ {{item.totalAmount}}
+
+
+
+
+
+
+
+
+ 总计￥
+ {{listinfo.payAmount}}
+
+
+
+
+
+
+ 订单编号：
+ {{listinfo.orderNo}}（点击复制）
+
+
+ 下单时间：
+ {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
+
+
+ 下单门店：
+ {{listinfo.name}}
+
+
+ 订单类型：
+ {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
+
+
+ 备注：
+
+
+
+ 就餐人数：
+ {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
+
+
+
+
+
+
+
+
+
diff --git a/pagesOrder/components/orderInfoBefore.vue b/pagesOrder/components/orderInfoBefore.vue
new file mode 100644
index 0000000..d6ae01c
--- /dev/null
+++ b/pagesOrder/components/orderInfoBefore.vue
@@ -0,0 +1,408 @@
+
+
+
+
+
+
+
+
+
+ {{listinfo.name}}
+ 「桌号：{{listinfo.tableName}}」
+
+
+ 待支付
+
+
+ 待发货
+
+
+ 订单完成
+
+
+ 已发
+
+
+ 申请退单
+
+
+ 退单
+
+
+ 已取消
+
+
+ 合台
+
+
+
+
+
+ 取餐号
+ {{listinfo.outNumber}}
+
+
+
+
+
+
+
+
+
+ 快递
+ 外卖
+ 自提
+ 堂食
+
+ 订单详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.productName}}
+ {{item.productSkuName}}
+
+
+
+ ￥{{item.priceAmount}}
+ x{{item.num}}
+
+
+
+
+
+ 合计：
+ ￥{{listinfo.payAmount}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesOrder/components/paymentMethod.vue b/pagesOrder/components/paymentMethod.vue
new file mode 100644
index 0000000..de5caa1
--- /dev/null
+++ b/pagesOrder/components/paymentMethod.vue
@@ -0,0 +1,146 @@
+
+
+
+
+ 支付方式
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ 会员卡余额 ￥{{amountVIP?amountVIP.amount:0}}
+ 去充值
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue
index 0eab4d8..6644bcb 100644
--- a/pagesOrder/confirm_order/index.vue
+++ b/pagesOrder/confirm_order/index.vue
@@ -97,7 +97,7 @@
-
+
+
+
+
@@ -164,12 +167,14 @@
import navseat from '@/components/navseat.vue'
import webSocketUtils from '@/common/js/websocket.js'
import payPasswordtwo from '@/components/payPasswordtwo.vue'
+ import paymentMethod from '../components/paymentMethod.vue'
// import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
export default {
components: {
payPasswordtwo,
+ paymentMethod,
navseat
},
data() {
@@ -566,8 +571,6 @@
*/
async showpopupclickdds() {
-
- console.log(this.listinfoid)
let res = await this.api.payorderPay({
orderId: this.listinfoid
}) //判断是否支付成功
diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue
index d120f1e..ce777b2 100644
--- a/pagesOrder/order_detail/index.vue
+++ b/pagesOrder/order_detail/index.vue
@@ -1,137 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{listinfo.name}}
- 「桌号：{{listinfo.tableName}}」
-
-
- 待支付
-
-
- 待发货
-
-
- 订单完成
-
-
- 已发
-
-
- 申请退单
-
-
- 退单
-
-
- 已取消
-
-
- 合台
-
-
-
-
-
- 取餐号
- {{listinfo.outNumber}}
-
-
-
-
-
-
-
- 快递
- 外卖
- 自提
- 堂食
-
- 订单详情
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.productName}}
- {{item.productSkuName}}
-
-
-
- ￥{{item.priceAmount}}
- x{{item.num}}
-
-
-
-
-
- 合计：
- ￥{{listinfo.payAmount}}
-
-
-
-
-
-
-
-
-
- 订单编号：
- {{listinfo.orderNo}}（点击复制）
-
-
- 下单时间：
- {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
-
-
- 下单门店：
- {{listinfo.name}}
-
-
- 订单类型：
- {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
-
-
- 备注：
- {{listinfo.orderNo}}（点击复制）
-
-
- 就餐人数：
- {{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}
-
-
+
+
+
+
+
+
@@ -140,23 +14,50 @@
¥{{listinfo.payAmount}}
-
- 立即付款
+
+ {{paymentBtnText}}
-
+
+
+
+
+
+
+
+ 请输入支付密码
+
+
+
+
+
+
+
+