diff --git a/supplied-h5/src/router/index.js b/supplied-h5/src/router/index.js index 8e4b8c8..2ae0a31 100644 --- a/supplied-h5/src/router/index.js +++ b/supplied-h5/src/router/index.js @@ -9,7 +9,6 @@ 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/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' @@ -38,7 +37,6 @@ export default new Router({ { path: 'cart/edit', component: JoyfulSelectionCartEdit }, { path: 'checkout', component: JoyfulSelectionCheckout }, { path: 'payment', component: JoyfulSelectionPayment }, - { path: 'payment-confirm', component: JoyfulSelectionPaymentConfirm }, { path: 'payment-success', component: JoyfulSelectionPaymentSuccess }, { path: 'address', component: JoyfulSelectionAddressList }, { path: 'address/edit', component: JoyfulSelectionAddressEdit }, diff --git a/supplied-h5/src/view/joyful-selection/order/payment-success/index.vue b/supplied-h5/src/view/joyful-selection/order/payment-success/index.vue index 43673d2..21a2573 100644 --- a/supplied-h5/src/view/joyful-selection/order/payment-success/index.vue +++ b/supplied-h5/src/view/joyful-selection/order/payment-success/index.vue @@ -1,17 +1,25 @@ @@ -52,6 +60,105 @@ export default { } - diff --git a/supplied-h5/src/view/joyful-selection/order/payment/index.vue b/supplied-h5/src/view/joyful-selection/order/payment/index.vue index ece2de0..8aafe56 100644 --- a/supplied-h5/src/view/joyful-selection/order/payment/index.vue +++ b/supplied-h5/src/view/joyful-selection/order/payment/index.vue @@ -38,6 +38,27 @@ 立即支付 ¥{{ amountText }} + + +
+
+ +

确认支付

+
+
+

支付金额

+ ¥ {{ amountText }} +
+
+

支付方式{{ payTypeText }}

+

订单编号{{ paymentInfo.orderNo || '-' }}

+
+ +
+
@@ -48,6 +69,7 @@ export default { name: 'JoyfulSelectionPayment', data: () => ({ payType: 'points', + showConfirm: false, paymentInfo: {}, pointsBalance: '32.00' }), @@ -61,6 +83,11 @@ export default { return tel ? `${name} ${tel}` : name }, + payTypeText() { + const method = this.payMethods.find(item => item.name === this.payType) + + return method ? method.label.replace(/(.*$/, '') : '积分支付' + }, payMethods() { return [ { name: 'points', label: `积分支付(余额:¥${this.pointsBalance})`, icon: 'gold-coin-o' }, @@ -74,7 +101,10 @@ export default { }, methods: { onPay() { - this.$router.push({ path: '/joyful-selection/payment-confirm', query: { payType: this.payType } }) + this.showConfirm = true + }, + confirmPay() { + this.$router.push({ path: '/joyful-selection/payment-success', query: { payType: this.payType } }) } } } @@ -217,4 +247,94 @@ export default { font-size: 15px; font-weight: 700; } + +.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; +} + +.payment-page ::v-deep .van-button--danger { + background: #ff5b20; + border-color: #ff5b20; +} diff --git a/supplied-h5/src/view/joyful-selection/profile/index.vue b/supplied-h5/src/view/joyful-selection/profile/index.vue index 84f39b5..9c94085 100644 --- a/supplied-h5/src/view/joyful-selection/profile/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/index.vue @@ -1,59 +1,215 @@ - diff --git a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue index d062380..0b7b59a 100644 --- a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue @@ -1,19 +1,34 @@