From 3cd6ef665bb9c73d85637d515a2fbeb059468a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Tue, 28 Jul 2026 10:11:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supplied-h5/src/router/index.js               |   8 +-
 .../cart/payment-confirm/index.vue            |  53 -----
 .../{cart => order}/checkout/index.vue        |   0
 .../order/payment-confirm/index.vue           | 201 ++++++++++++++++++
 .../{cart => order}/payment-success/index.vue |   0
 .../{cart => order}/payment/index.vue         |   0
 .../{cart => order}/payment/payment-data.js   |   0
 7 files changed, 205 insertions(+), 57 deletions(-)
 delete mode 100644 supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue
 rename supplied-h5/src/view/joyful-selection/{cart => order}/checkout/index.vue (100%)
 create mode 100644 supplied-h5/src/view/joyful-selection/order/payment-confirm/index.vue
 rename supplied-h5/src/view/joyful-selection/{cart => order}/payment-success/index.vue (100%)
 rename supplied-h5/src/view/joyful-selection/{cart => order}/payment/index.vue (100%)
 rename supplied-h5/src/view/joyful-selection/{cart => order}/payment/payment-data.js (100%)

diff --git a/supplied-h5/src/router/index.js b/supplied-h5/src/router/index.js
index 6673e53..8e4b8c8 100644
--- a/supplied-h5/src/router/index.js
+++ b/supplied-h5/src/router/index.js
@@ -7,10 +7,10 @@ import JoyfulSelectionProductList from '@/view/joyful-selection/products/index.v
 import JoyfulSelectionProductDetail from '@/view/joyful-selection/product-detail/index.vue'
 import JoyfulSelectionCart from '@/view/joyful-selection/cart/index.vue'
 import JoyfulSelectionCartEdit from '@/view/joyful-selection/cart/edit/index.vue'
-import JoyfulSelectionCheckout from '@/view/joyful-selection/cart/checkout/index.vue'
-import JoyfulSelectionPayment from '@/view/joyful-selection/cart/payment/index.vue'
-import JoyfulSelectionPaymentConfirm from '@/view/joyful-selection/cart/payment-confirm/index.vue'
-import JoyfulSelectionPaymentSuccess from '@/view/joyful-selection/cart/payment-success/index.vue'
+import JoyfulSelectionCheckout from '@/view/joyful-selection/order/checkout/index.vue'
+import JoyfulSelectionPayment from '@/view/joyful-selection/order/payment/index.vue'
+import JoyfulSelectionPaymentConfirm from '@/view/joyful-selection/order/payment-confirm/index.vue'
+import JoyfulSelectionPaymentSuccess from '@/view/joyful-selection/order/payment-success/index.vue'
 import JoyfulSelectionAddressList from '@/view/joyful-selection/address/index.vue'
 import JoyfulSelectionAddressEdit from '@/view/joyful-selection/address/edit/index.vue'
 import JoyfulSelectionOrders from '@/view/joyful-selection/profile/orders/index.vue'
diff --git a/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue b/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue
deleted file mode 100644
index abecfca..0000000
--- a/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
-  <main class="confirm-page">
-    <van-nav-bar title="确认支付" left-arrow @click-left="$router.back()" />
-    <section>
-      <p>支付金额</p>
-      <b>¥ {{ amountText }}</b>
-    </section>
-    <van-popup v-model="show" round position="bottom" :style="{ height: '42%' }" :close-on-click-overlay="false">
-      <article>
-        <h2>确认支付</h2>
-        <p>您即将使用{{ payTypeText }}</p>
-        <p>支付金额 <b>¥{{ amountText }}</b></p>
-        <div>
-          <van-button round @click="$router.back()">取消</van-button>
-          <van-button round type="danger" @click="$router.push({ path: '/joyful-selection/payment-success', query: { payType: $route.query.payType } })">确认支付</van-button>
-        </div>
-      </article>
-    </van-popup>
-  </main>
-</template>
-
-<script>
-import { readPaymentInfo, formatYuan } from '../payment/payment-data'
-
-export default {
-  name: 'JoyfulSelectionPaymentConfirm',
-  data: () => ({
-    show: true,
-    paymentInfo: {}
-  }),
-  computed: {
-    amountText() {
-      return formatYuan(this.paymentInfo.amount)
-    },
-    payTypeText() {
-      const map = {
-        points: '积分支付',
-        wechat: '微信支付',
-        alipay: '支付宝支付'
-      }
-
-      return map[this.$route.query.payType] || '积分支付'
-    }
-  },
-  created() {
-    this.paymentInfo = readPaymentInfo()
-  }
-}
-</script>
-
-<style scoped>
-.confirm-page{min-height:100vh;padding-top:46px;background:#f7f7f7;text-align:center}.confirm-page ::v-deep .van-nav-bar{position:fixed;z-index:20;top:0;right:0;left:0;box-shadow:0 1px 0 rgba(0,0,0,.04)}.confirm-page section{margin:15px;padding:30px;border-radius:12px;background:#fff}.confirm-page section b{font-size:26px}.confirm-page article{padding:20px;text-align:center}.confirm-page article p{color:#666;font-size:13px}.confirm-page article div{display:flex;gap:10px;margin-top:40px}.confirm-page article .van-button{flex:1}.confirm-page ::v-deep .van-button--danger{background:#ff5b20;border-color:#ff5b20}
-</style>
diff --git a/supplied-h5/src/view/joyful-selection/cart/checkout/index.vue b/supplied-h5/src/view/joyful-selection/order/checkout/index.vue
similarity index 100%
rename from supplied-h5/src/view/joyful-selection/cart/checkout/index.vue
rename to supplied-h5/src/view/joyful-selection/order/checkout/index.vue
diff --git a/supplied-h5/src/view/joyful-selection/order/payment-confirm/index.vue b/supplied-h5/src/view/joyful-selection/order/payment-confirm/index.vue
new file mode 100644
index 0000000..87248a4
--- /dev/null
+++ b/supplied-h5/src/view/joyful-selection/order/payment-confirm/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <main class="confirm-page">
+    <van-nav-bar title="确认支付" left-arrow @click-left="$router.back()" />
+
+    <section class="amount-card">
+      <p>支付金额</p>
+      <b>¥ {{ amountText }}</b>
+      <span>{{ payTypeText }}</span>
+    </section>
+
+    <van-popup v-model="show" class="pay-popup" round position="bottom" :close-on-click-overlay="false">
+      <article class="pay-panel">
+        <header>
+          <van-icon name="cross" @click="$router.back()" />
+          <h2>确认支付</h2>
+        </header>
+        <section class="pay-summary">
+          <p>支付金额</p>
+          <b>¥ {{ amountText }}</b>
+        </section>
+        <div class="pay-info">
+          <p><span>支付方式</span><b>{{ payTypeText }}</b></p>
+          <p><span>订单编号</span><b>{{ paymentInfo.orderNo || '-' }}</b></p>
+        </div>
+        <footer>
+          <van-button round @click="$router.back()">取消</van-button>
+          <van-button round type="danger" @click="confirmPay">确认支付</van-button>
+        </footer>
+      </article>
+    </van-popup>
+  </main>
+</template>
+
+<script>
+import { readPaymentInfo, formatYuan } from '../payment/payment-data'
+
+export default {
+  name: 'JoyfulSelectionPaymentConfirm',
+  data: () => ({
+    show: true,
+    paymentInfo: {}
+  }),
+  computed: {
+    amountText() {
+      return formatYuan(this.paymentInfo.amount)
+    },
+    payTypeText() {
+      const map = {
+        points: '积分支付',
+        wechat: '微信支付',
+        alipay: '支付宝支付'
+      }
+
+      return map[this.$route.query.payType] || '积分支付'
+    }
+  },
+  created() {
+    this.paymentInfo = readPaymentInfo()
+  },
+  methods: {
+    confirmPay() {
+      this.$router.push({ path: '/joyful-selection/payment-success', query: { payType: this.$route.query.payType } })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.confirm-page {
+  min-height: 100vh;
+  padding: 46px 12px 0;
+  background: #f7f7f7;
+}
+
+.confirm-page ::v-deep .van-nav-bar {
+  position: fixed;
+  z-index: 20;
+  top: 0;
+  right: 0;
+  left: 0;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, .04);
+}
+
+.amount-card {
+  margin-top: 12px;
+  padding: 28px 16px;
+  border-radius: 8px;
+  background: #fff;
+  text-align: center;
+}
+
+.amount-card p {
+  margin: 0 0 13px;
+  color: #555;
+  font-size: 13px;
+}
+
+.amount-card b {
+  display: block;
+  color: #222;
+  font-size: 28px;
+  line-height: 1;
+}
+
+.amount-card span {
+  display: block;
+  margin-top: 12px;
+  color: #999;
+  font-size: 12px;
+}
+
+.pay-popup {
+  overflow: hidden;
+}
+
+.pay-panel {
+  padding: 0 18px 18px;
+  background: #fff;
+}
+
+.pay-panel header {
+  position: relative;
+  display: flex;
+  height: 52px;
+  align-items: center;
+  justify-content: center;
+}
+
+.pay-panel header h2 {
+  margin: 0;
+  color: #222;
+  font-size: 17px;
+  font-weight: 700;
+}
+
+.pay-panel header .van-icon {
+  position: absolute;
+  left: 0;
+  color: #999;
+  font-size: 20px;
+}
+
+.pay-summary {
+  padding: 18px 0 20px;
+  text-align: center;
+}
+
+.pay-summary p {
+  margin: 0 0 12px;
+  color: #777;
+  font-size: 13px;
+}
+
+.pay-summary b {
+  color: #222;
+  font-size: 30px;
+  line-height: 1;
+}
+
+.pay-info {
+  padding: 10px 0;
+  border-top: 1px solid #f3f3f3;
+  border-bottom: 1px solid #f3f3f3;
+}
+
+.pay-info p {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 0;
+  color: #777;
+  font-size: 13px;
+  line-height: 32px;
+}
+
+.pay-info b {
+  max-width: 68%;
+  overflow: hidden;
+  color: #333;
+  font-weight: 500;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.pay-panel footer {
+  display: flex;
+  gap: 12px;
+  padding-top: 18px;
+}
+
+.pay-panel footer .van-button {
+  flex: 1;
+  height: 40px;
+}
+
+.confirm-page ::v-deep .van-button--danger {
+  background: #ff5b20;
+  border-color: #ff5b20;
+}
+</style>
diff --git a/supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue b/supplied-h5/src/view/joyful-selection/order/payment-success/index.vue
similarity index 100%
rename from supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue
rename to supplied-h5/src/view/joyful-selection/order/payment-success/index.vue
diff --git a/supplied-h5/src/view/joyful-selection/cart/payment/index.vue b/supplied-h5/src/view/joyful-selection/order/payment/index.vue
similarity index 100%
rename from supplied-h5/src/view/joyful-selection/cart/payment/index.vue
rename to supplied-h5/src/view/joyful-selection/order/payment/index.vue
diff --git a/supplied-h5/src/view/joyful-selection/cart/payment/payment-data.js b/supplied-h5/src/view/joyful-selection/order/payment/payment-data.js
similarity index 100%
rename from supplied-h5/src/view/joyful-selection/cart/payment/payment-data.js
rename to supplied-h5/src/view/joyful-selection/order/payment/payment-data.js