From 25da673443233e572607b0a48d7b84aeedc9f86f Mon Sep 17 00:00:00 2001 From: HongRun Liu <123456@qq.com> Date: Wed, 5 Aug 2026 10:51:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + components/card_orderBan/card_orderBan.vue | 410 ++++++----- components/orderItem/AiOrderActionBar.vue | 14 +- components/orderItem/card_order.vue | 322 +++++---- components/orderItem/orderItem.vue | 758 +++++++++++---------- package.json | 1 + pages/AI/cashierDesk.vue | 660 +++++++++--------- pages/AI/giftCashierDesk.vue | 31 +- pages/AI/giftOrderInfo.vue | 34 +- pages/AI/orderInfo.vue | 15 +- pages/order/detail.vue | 54 +- pages/order/list.vue | 6 + pages/pay/index.vue | 32 +- sheep/api/ai/index.ts | 274 ++++---- sheep/hooks/useGoods.js | 10 +- sheep/platform/pay.js | 143 ++-- 16 files changed, 1535 insertions(+), 1230 deletions(-) diff --git a/.gitignore b/.gitignore index fe6ddb6..ef7c482 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ package-lock.json *.keystore pnpm-lock.yaml .history +/AGENTS.md diff --git a/components/card_orderBan/card_orderBan.vue b/components/card_orderBan/card_orderBan.vue index 46ff90b..e084a92 100644 --- a/components/card_orderBan/card_orderBan.vue +++ b/components/card_orderBan/card_orderBan.vue @@ -1,222 +1,218 @@ diff --git a/components/orderItem/AiOrderActionBar.vue b/components/orderItem/AiOrderActionBar.vue index 220d890..3f9d0cc 100644 --- a/components/orderItem/AiOrderActionBar.vue +++ b/components/orderItem/AiOrderActionBar.vue @@ -14,7 +14,11 @@ > 立即发货 - + {{ props.viewText }} @@ -23,6 +27,12 @@ 去支付 + + 取消订单 + + + 切换支付 + @@ -46,5 +56,5 @@ }, }); - const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay']); + const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel']); diff --git a/components/orderItem/card_order.vue b/components/orderItem/card_order.vue index 1dcb7d0..e7ea4b3 100644 --- a/components/orderItem/card_order.vue +++ b/components/orderItem/card_order.vue @@ -1,168 +1,196 @@ diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 517e66a..3025361 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -1,393 +1,433 @@ diff --git a/package.json b/package.json index 1e00dc7..80298e0 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,7 @@ }, "devDependencies": { "prettier": "^2.8.7", + "sass": "^1.99.0", "vconsole": "^3.15.0" } } diff --git a/pages/AI/cashierDesk.vue b/pages/AI/cashierDesk.vue index de1d802..5df935e 100644 --- a/pages/AI/cashierDesk.vue +++ b/pages/AI/cashierDesk.vue @@ -1,213 +1,259 @@ diff --git a/pages/AI/giftCashierDesk.vue b/pages/AI/giftCashierDesk.vue index acb4ab1..81c6f45 100644 --- a/pages/AI/giftCashierDesk.vue +++ b/pages/AI/giftCashierDesk.vue @@ -60,6 +60,9 @@ + +