From aede08cbbabd18ba0244f48ca6445f6221296065 Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 11 May 2023 14:38:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/pay/demo/index.ts | 2 +- src/api/pay/order/index.ts | 5 + src/assets/images/pay/icon/alipay_app.svg | 1 + src/assets/images/pay/icon/alipay_bar.svg | 2 + src/assets/images/pay/icon/alipay_pc.svg | 1 + src/assets/images/pay/icon/alipay_qr.svg | 2 + src/assets/images/pay/icon/alipay_wap.svg | 1 + src/assets/images/pay/icon/mock.svg | 1 + src/assets/images/pay/icon/wx_app.svg | 2 + src/assets/images/pay/icon/wx_lite.svg | 1 + src/assets/images/pay/icon/wx_pub.svg | 2 + src/components/CardList/src/CardList.vue | 4 +- src/router/routes/index.ts | 27 ++++- src/views/pay/demo/DemoModal.vue | 43 ++++++++ src/views/pay/demo/demo.data.ts | 110 ++++++++++++++++++++ src/views/pay/demo/index.vue | 73 ++++++++++++- src/views/pay/submit/index.vue | 121 ++++++++++++++++++++++ src/views/pay/submit/submit.data.ts | 38 +++++++ 18 files changed, 431 insertions(+), 5 deletions(-) create mode 100644 src/assets/images/pay/icon/alipay_app.svg create mode 100644 src/assets/images/pay/icon/alipay_bar.svg create mode 100644 src/assets/images/pay/icon/alipay_pc.svg create mode 100644 src/assets/images/pay/icon/alipay_qr.svg create mode 100644 src/assets/images/pay/icon/alipay_wap.svg create mode 100644 src/assets/images/pay/icon/mock.svg create mode 100644 src/assets/images/pay/icon/wx_app.svg create mode 100644 src/assets/images/pay/icon/wx_lite.svg create mode 100644 src/assets/images/pay/icon/wx_pub.svg create mode 100644 src/views/pay/demo/DemoModal.vue create mode 100644 src/views/pay/demo/demo.data.ts create mode 100644 src/views/pay/submit/index.vue create mode 100644 src/views/pay/submit/submit.data.ts diff --git a/src/api/pay/demo/index.ts b/src/api/pay/demo/index.ts index c40ceeb7..9e3d1a3b 100644 --- a/src/api/pay/demo/index.ts +++ b/src/api/pay/demo/index.ts @@ -16,6 +16,6 @@ export function createDemoOrder(data) { } // 退款示例订单 -export function updateApp(id: number) { +export function refundDemoOrder(id: number) { return defHttp.put({ url: '/pay/demo-order/refund?id=' + id }) } diff --git a/src/api/pay/order/index.ts b/src/api/pay/order/index.ts index 140ac79c..929cc523 100644 --- a/src/api/pay/order/index.ts +++ b/src/api/pay/order/index.ts @@ -112,3 +112,8 @@ export function deleteOrder(id: number) { export function exportOrder(params: OrderExportReqVO) { return defHttp.download({ url: '/pay/order/export-excel', params }, '支付订单.xls') } + +// 提交支付订单 +export function submitOrder(data) { + return defHttp.post({ url: '/pay/order/submit', data }) +} diff --git a/src/assets/images/pay/icon/alipay_app.svg b/src/assets/images/pay/icon/alipay_app.svg new file mode 100644 index 00000000..ebf11883 --- /dev/null +++ b/src/assets/images/pay/icon/alipay_app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/alipay_bar.svg b/src/assets/images/pay/icon/alipay_bar.svg new file mode 100644 index 00000000..eb1e1e84 --- /dev/null +++ b/src/assets/images/pay/icon/alipay_bar.svg @@ -0,0 +1,2 @@ + diff --git a/src/assets/images/pay/icon/alipay_pc.svg b/src/assets/images/pay/icon/alipay_pc.svg new file mode 100644 index 00000000..2a752770 --- /dev/null +++ b/src/assets/images/pay/icon/alipay_pc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/alipay_qr.svg b/src/assets/images/pay/icon/alipay_qr.svg new file mode 100644 index 00000000..48337508 --- /dev/null +++ b/src/assets/images/pay/icon/alipay_qr.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/alipay_wap.svg b/src/assets/images/pay/icon/alipay_wap.svg new file mode 100644 index 00000000..87075dbb --- /dev/null +++ b/src/assets/images/pay/icon/alipay_wap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/mock.svg b/src/assets/images/pay/icon/mock.svg new file mode 100644 index 00000000..27b09ead --- /dev/null +++ b/src/assets/images/pay/icon/mock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/wx_app.svg b/src/assets/images/pay/icon/wx_app.svg new file mode 100644 index 00000000..ad40b2a2 --- /dev/null +++ b/src/assets/images/pay/icon/wx_app.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/wx_lite.svg b/src/assets/images/pay/icon/wx_lite.svg new file mode 100644 index 00000000..0c925cf3 --- /dev/null +++ b/src/assets/images/pay/icon/wx_lite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/pay/icon/wx_pub.svg b/src/assets/images/pay/icon/wx_pub.svg new file mode 100644 index 00000000..3a6d15b7 --- /dev/null +++ b/src/assets/images/pay/icon/wx_pub.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/components/CardList/src/CardList.vue b/src/components/CardList/src/CardList.vue index 611a461a..ffc2ab09 100644 --- a/src/components/CardList/src/CardList.vue +++ b/src/components/CardList/src/CardList.vue @@ -6,8 +6,8 @@