From bef2ea3d68ef90ca64ce075ed0bc602ee36343ad Mon Sep 17 00:00:00 2001 From: xingyu Date: Sun, 15 Oct 2023 20:17:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20pay=20cashier=20=E5=BE=85=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/pay/icon/alipay_app.svg | 1 + src/assets/svg/pay/icon/alipay_bar.svg | 2 + src/assets/svg/pay/icon/alipay_pc.svg | 1 + src/assets/svg/pay/icon/alipay_qr.svg | 2 + src/assets/svg/pay/icon/alipay_wap.svg | 1 + src/assets/svg/pay/icon/mock.svg | 1 + src/assets/svg/pay/icon/wx_app.svg | 2 + src/assets/svg/pay/icon/wx_bar.svg | 1 + src/assets/svg/pay/icon/wx_lite.svg | 1 + src/assets/svg/pay/icon/wx_native.svg | 1 + src/assets/svg/pay/icon/wx_pub.svg | 2 + src/views/pay/cashier/cashier.data.ts | 22 +++--- src/views/pay/cashier/index.vue | 93 +++++++++++++++++++++++++- src/views/pay/demo/index.vue | 2 +- 14 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 src/assets/svg/pay/icon/alipay_app.svg create mode 100644 src/assets/svg/pay/icon/alipay_bar.svg create mode 100644 src/assets/svg/pay/icon/alipay_pc.svg create mode 100644 src/assets/svg/pay/icon/alipay_qr.svg create mode 100644 src/assets/svg/pay/icon/alipay_wap.svg create mode 100644 src/assets/svg/pay/icon/mock.svg create mode 100644 src/assets/svg/pay/icon/wx_app.svg create mode 100644 src/assets/svg/pay/icon/wx_bar.svg create mode 100644 src/assets/svg/pay/icon/wx_lite.svg create mode 100644 src/assets/svg/pay/icon/wx_native.svg create mode 100644 src/assets/svg/pay/icon/wx_pub.svg diff --git a/src/assets/svg/pay/icon/alipay_app.svg b/src/assets/svg/pay/icon/alipay_app.svg new file mode 100644 index 00000000..ebf11883 --- /dev/null +++ b/src/assets/svg/pay/icon/alipay_app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/alipay_bar.svg b/src/assets/svg/pay/icon/alipay_bar.svg new file mode 100644 index 00000000..eb1e1e84 --- /dev/null +++ b/src/assets/svg/pay/icon/alipay_bar.svg @@ -0,0 +1,2 @@ + diff --git a/src/assets/svg/pay/icon/alipay_pc.svg b/src/assets/svg/pay/icon/alipay_pc.svg new file mode 100644 index 00000000..2a752770 --- /dev/null +++ b/src/assets/svg/pay/icon/alipay_pc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/alipay_qr.svg b/src/assets/svg/pay/icon/alipay_qr.svg new file mode 100644 index 00000000..48337508 --- /dev/null +++ b/src/assets/svg/pay/icon/alipay_qr.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/alipay_wap.svg b/src/assets/svg/pay/icon/alipay_wap.svg new file mode 100644 index 00000000..87075dbb --- /dev/null +++ b/src/assets/svg/pay/icon/alipay_wap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/mock.svg b/src/assets/svg/pay/icon/mock.svg new file mode 100644 index 00000000..27b09ead --- /dev/null +++ b/src/assets/svg/pay/icon/mock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/wx_app.svg b/src/assets/svg/pay/icon/wx_app.svg new file mode 100644 index 00000000..ad40b2a2 --- /dev/null +++ b/src/assets/svg/pay/icon/wx_app.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/wx_bar.svg b/src/assets/svg/pay/icon/wx_bar.svg new file mode 100644 index 00000000..11292e6e --- /dev/null +++ b/src/assets/svg/pay/icon/wx_bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/wx_lite.svg b/src/assets/svg/pay/icon/wx_lite.svg new file mode 100644 index 00000000..0c925cf3 --- /dev/null +++ b/src/assets/svg/pay/icon/wx_lite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/wx_native.svg b/src/assets/svg/pay/icon/wx_native.svg new file mode 100644 index 00000000..bf3ba2b6 --- /dev/null +++ b/src/assets/svg/pay/icon/wx_native.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/pay/icon/wx_pub.svg b/src/assets/svg/pay/icon/wx_pub.svg new file mode 100644 index 00000000..3a6d15b7 --- /dev/null +++ b/src/assets/svg/pay/icon/wx_pub.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/views/pay/cashier/cashier.data.ts b/src/views/pay/cashier/cashier.data.ts index 99c2e3c9..dcad3b3e 100644 --- a/src/views/pay/cashier/cashier.data.ts +++ b/src/views/pay/cashier/cashier.data.ts @@ -2,17 +2,17 @@ import type { DescItem } from '@/components/Description' import { useRender } from '@/components/Table' // 导入图标 -import svg_alipay_pc from '@/assets/svgs/pay/icon/alipay_pc.svg' -import svg_alipay_wap from '@/assets/svgs/pay/icon/alipay_wap.svg' -import svg_alipay_app from '@/assets/svgs/pay/icon/alipay_app.svg' -import svg_alipay_qr from '@/assets/svgs/pay/icon/alipay_qr.svg' -import svg_alipay_bar from '@/assets/svgs/pay/icon/alipay_bar.svg' -import svg_wx_pub from '@/assets/svgs/pay/icon/wx_pub.svg' -import svg_wx_lite from '@/assets/svgs/pay/icon/wx_lite.svg' -import svg_wx_app from '@/assets/svgs/pay/icon/wx_app.svg' -import svg_wx_native from '@/assets/svgs/pay/icon/wx_native.svg' -import svg_wx_bar from '@/assets/svgs/pay/icon/wx_bar.svg' -import svg_mock from '@/assets/svgs/pay/icon/mock.svg' +import svg_alipay_pc from '@/assets/svg/pay/icon/alipay_pc.svg' +import svg_alipay_wap from '@/assets/svg/pay/icon/alipay_wap.svg' +import svg_alipay_app from '@/assets/svg/pay/icon/alipay_app.svg' +import svg_alipay_qr from '@/assets/svg/pay/icon/alipay_qr.svg' +import svg_alipay_bar from '@/assets/svg/pay/icon/alipay_bar.svg' +import svg_wx_pub from '@/assets/svg/pay/icon/wx_pub.svg' +import svg_wx_lite from '@/assets/svg/pay/icon/wx_lite.svg' +import svg_wx_app from '@/assets/svg/pay/icon/wx_app.svg' +import svg_wx_native from '@/assets/svg/pay/icon/wx_native.svg' +import svg_wx_bar from '@/assets/svg/pay/icon/wx_bar.svg' +import svg_mock from '@/assets/svg/pay/icon/mock.svg' export const descSchema: DescItem[] = [ { diff --git a/src/views/pay/cashier/index.vue b/src/views/pay/cashier/index.vue index a6a760d1..194ef76d 100644 --- a/src/views/pay/cashier/index.vue +++ b/src/views/pay/cashier/index.vue @@ -1,5 +1,94 @@ + + > diff --git a/src/views/pay/demo/index.vue b/src/views/pay/demo/index.vue index 47e530c3..c400cd4c 100644 --- a/src/views/pay/demo/index.vue +++ b/src/views/pay/demo/index.vue @@ -38,7 +38,7 @@ function handleAdd() { /** 支付按钮操作 */ function handlePay(record: Recordable) { - go(`/pay/cashier?id=${record.id}`) + go(`/pay/cashier?id=${record.payOrderId}&&returnUrl=${encodeURIComponent(`/pay/demo-order?id=${record.id}`)}`) } /** 退款按钮操作 */