From bc5df9b14309a91a61a5a19f09a9fd6162335dd4 Mon Sep 17 00:00:00 2001 From: Theo Date: Tue, 7 Mar 2023 18:44:21 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E8=8F=9C=E5=8D=95=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Icon/src/IconSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue index 97a3e384..d7bf6ae4 100644 --- a/src/components/Icon/src/IconSelect.vue +++ b/src/components/Icon/src/IconSelect.vue @@ -90,7 +90,7 @@ watch( return props.modelValue }, () => { - if (props.modelValue) { + if (props.modelValue && props.modelValue.contains(':')) { currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1) icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1) } From a692674b24a4e9ad9133b5f8b7b27767c5f6ef7d Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 9 Apr 2023 17:14:31 +0800 Subject: [PATCH 02/30] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84formatDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mp/components/wx-material-select/main.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue index 7f565823..4c2d46f3 100644 --- a/src/views/mp/components/wx-material-select/main.vue +++ b/src/views/mp/components/wx-material-select/main.vue @@ -238,7 +238,6 @@ export default defineComponent({ selectMaterialFun, getMaterialPageFun, getPage, - formatDate, queryParams, objDataRef, list, From c33e4de5a8d506f08618c2b63977be3d85e88e6d Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 10 Apr 2023 00:18:56 +0800 Subject: [PATCH 03/30] =?UTF-8?q?refactor:=20=E6=8A=BD=E7=A6=BB=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=90=E5=85=AC=E4=BC=97=E5=8F=B7=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/components/wx-account-select/main.vue | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/views/mp/components/wx-account-select/main.vue diff --git a/src/views/mp/components/wx-account-select/main.vue b/src/views/mp/components/wx-account-select/main.vue new file mode 100644 index 00000000..f75bc7d6 --- /dev/null +++ b/src/views/mp/components/wx-account-select/main.vue @@ -0,0 +1,44 @@ + + + From e035eb261881184e25612cfa0a4654d8c12f9f89 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 10 Apr 2023 00:25:45 +0800 Subject: [PATCH 04/30] =?UTF-8?q?refactor:=20=E3=80=90=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=EF=BC=8C=E7=B4=A0=E6=9D=90=E3=80=91=E5=BA=94=E7=94=A8=E3=80=90?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E9=80=89=E6=8B=A9=E5=99=A8=E3=80=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mp/draft/index.vue | 72 +++----------- src/views/mp/material/index.vue | 160 ++++++++++++++------------------ 2 files changed, 85 insertions(+), 147 deletions(-) diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue index ab5d5218..0f2aa254 100644 --- a/src/views/mp/draft/index.vue +++ b/src/views/mp/draft/index.vue @@ -3,31 +3,13 @@ - - - - - - - - 搜索 - 重置 + + + @@ -35,7 +17,7 @@
- + @@ -145,7 +130,7 @@
新建视频 @@ -212,16 +197,22 @@ - + - diff --git a/src/views/pay/order/order.data.ts b/src/views/pay/order/order.data.ts deleted file mode 100644 index 7b993088..00000000 --- a/src/views/pay/order/order.data.ts +++ /dev/null @@ -1,152 +0,0 @@ -import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' -const { t } = useI18n() // 国际化 - -// 表单校验 -export const rules = reactive({ - merchantId: [required], - appId: [required], - merchantOrderId: [required], - subject: [required], - body: [required], - notifyUrl: [required], - notifyStatus: [required], - amount: [required], - status: [required], - userIp: [required], - expireTime: [required], - refundStatus: [required], - refundTimes: [required], - refundAmount: [required] -}) -// CrudSchema -const crudSchemas = reactive({ - primaryKey: 'id', - primaryType: 'seq', - primaryTitle: '岗位编号', - action: true, - columns: [ - { - title: '商户编号', - field: 'merchantId', - isSearch: true - }, - { - title: '应用编号', - field: 'appId', - isSearch: true - }, - { - title: '渠道编号', - field: 'channelId' - }, - { - title: '渠道编码', - field: 'channelCode', - isSearch: true - }, - { - title: '渠道订单号', - field: 'merchantOrderId', - isSearch: true - }, - { - title: '商品标题', - field: 'subject' - }, - { - title: '商品描述', - field: 'body' - }, - { - title: '异步通知地址', - field: 'notifyUrl' - }, - { - title: '回调状态', - field: 'notifyStatus', - dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, - dictClass: 'number' - }, - { - title: '支付金额', - field: 'amount', - isSearch: true - }, - { - title: '渠道手续费', - field: 'channelFeeRate', - isSearch: true - }, - { - title: '渠道手续金额', - field: 'channelFeeAmount', - isSearch: true - }, - { - title: '支付状态', - field: 'status', - dictType: DICT_TYPE.PAY_ORDER_STATUS, - dictClass: 'number', - isSearch: true - }, - { - title: '用户 IP', - field: 'userIp' - }, - { - title: '订单失效时间', - field: 'expireTime', - formatter: 'formatDate' - }, - { - title: '支付时间', - field: 'successTime', - formatter: 'formatDate' - }, - { - title: '支付通知时间', - field: 'notifyTime', - formatter: 'formatDate' - }, - { - title: '拓展编号', - field: 'successExtensionId' - }, - { - title: '退款状态', - field: 'refundStatus', - dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS, - dictClass: 'number', - isSearch: true - }, - { - title: '退款次数', - field: 'refundTimes' - }, - { - title: '退款总金额', - field: 'refundAmount' - }, - { - title: '渠道用户编号', - field: 'channelUserId' - }, - { - title: '渠道订单号', - field: 'channelOrderNo' - }, - { - title: t('common.createTime'), - field: 'createTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - } - ] -}) -export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/src/views/pay/order/orderForm.vue b/src/views/pay/order/orderForm.vue new file mode 100644 index 00000000..f9625085 --- /dev/null +++ b/src/views/pay/order/orderForm.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index ec8bf12c..b8a949e7 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -1,59 +1,359 @@ - + + diff --git a/src/views/pay/refund/refund.data.ts b/src/views/pay/refund/refund.data.ts deleted file mode 100644 index 456f441d..00000000 --- a/src/views/pay/refund/refund.data.ts +++ /dev/null @@ -1,173 +0,0 @@ -import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' -const { t } = useI18n() // 国际化 - -// CrudSchema -const crudSchemas = reactive({ - primaryKey: 'id', - primaryType: 'seq', - primaryTitle: '序号', - action: true, - columns: [ - { - title: '商户编号', - field: 'merchantId', - isSearch: true - }, - { - title: '应用编号', - field: 'appId', - isSearch: true - }, - { - title: '渠道编号', - field: 'channelId', - isSearch: true - }, - { - title: '渠道编码', - field: 'channelCode', - dictType: DICT_TYPE.PAY_CHANNEL_CODE_TYPE, - dictClass: 'number', - isSearch: true - }, - { - title: '支付订单编号', - field: 'orderId', - isSearch: true - }, - { - title: '交易订单号', - field: 'tradeNo', - isSearch: true - }, - { - title: '商户订单号', - field: 'merchantOrderId', - isSearch: true - }, - { - title: '商户退款单号', - field: 'merchantRefundNo', - isSearch: true - }, - { - title: '回调地址', - field: 'notifyUrl', - isSearch: true - }, - { - title: '回调状态', - field: 'notifyStatus', - dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, - dictClass: 'number', - isSearch: true - }, - { - title: '退款类型', - field: 'type', - dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE, - dictClass: 'number', - isSearch: true - }, - { - title: t('common.status'), - field: 'status', - dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS, - dictClass: 'number', - isSearch: true - }, - { - title: '支付金额', - field: 'payAmount', - formatter: 'formatAmount', - isSearch: true - }, - { - title: '退款金额', - field: 'refundAmount', - formatter: 'formatAmount', - isSearch: true - }, - { - title: '退款原因', - field: 'reason', - isSearch: true - }, - { - title: '用户IP', - field: 'userIp', - isSearch: true - }, - { - title: '渠道订单号', - field: 'channelOrderNo', - isSearch: true - }, - { - title: '渠道退款单号', - field: 'channelRefundNo', - isSearch: true - }, - { - title: '渠道调用报错时', - field: 'channelErrorCode' - }, - { - title: '渠道调用报错时', - field: 'channelErrorMsg' - }, - { - title: '支付渠道的额外参数', - field: 'channelExtras' - }, - { - title: '退款失效时间', - field: 'expireTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - }, - { - title: '退款成功时间', - field: 'successTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - }, - { - title: '退款通知时间', - field: 'notifyTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - }, - { - title: t('common.createTime'), - field: 'createTime', - formatter: 'formatDate', - isForm: false, - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - } - } - ] -}) -export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue new file mode 100644 index 00000000..cc9d8726 --- /dev/null +++ b/src/views/pay/refund/refundForm.vue @@ -0,0 +1,154 @@ + + + + From fcb830b93eefcf3a1373ef2875c2d36ed44fccef Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 10 Apr 2023 23:53:26 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E4=BC=98=E5=8C=96vscode=E4=BB=A3?= =?UTF-8?q?=E7=A0=81debugger=E8=B0=83=E8=AF=95=EF=BC=8C=E4=BD=BF=E7=94=A8v?= =?UTF-8?q?scode=E8=87=AA=E5=B8=A6=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 12 ++++++++++++ package.json | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..ec531026 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,12 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Launch debug", + "request": "launch", + "type": "chrome", + "url": "http://localhost", + "webRoot": "${workspaceFolder}/src" + } + ] +} diff --git a/package.json b/package.json index 25e6a139..84e420d1 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "steady-xml": "^0.1.0", "url": "^0.11.0", "video.js": "^8.0.4", - "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vue": "3.2.47", "vue-i18n": "9.2.2", "vue-router": "^4.1.6", @@ -127,7 +126,7 @@ "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.0", - "vite-plugin-vue-setup-extend": "^0.4.0", + "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vite-plugin-windicss": "^1.8.10", "vue-tsc": "^1.2.0", "windicss": "^3.5.6" From c7b296a8e5ea472d1573af84c88b690ada7868ef Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 11 Apr 2023 11:13:46 +0800 Subject: [PATCH 17/30] =?UTF-8?q?refactor:=20=E6=8A=BD=E7=A6=BBWxMpSelect?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mp/components/WxMpSelect.vue | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/views/mp/components/WxMpSelect.vue diff --git a/src/views/mp/components/WxMpSelect.vue b/src/views/mp/components/WxMpSelect.vue new file mode 100644 index 00000000..6dc6809b --- /dev/null +++ b/src/views/mp/components/WxMpSelect.vue @@ -0,0 +1,39 @@ + + + From 139776749236440ca9fd2339631785676d6bf848 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 11 Apr 2023 11:14:20 +0800 Subject: [PATCH 18/30] =?UTF-8?q?refactor:=20=E3=80=90MP=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E4=BD=BF=E7=94=A8=E3=80=90WxMpSelec?= =?UTF-8?q?t=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mp/material/index.vue | 130 ++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue index 954d0fac..ec9077f1 100644 --- a/src/views/mp/material/index.vue +++ b/src/views/mp/material/index.vue @@ -2,7 +2,14 @@ - + + + + + + + + @@ -14,7 +21,7 @@
{{ item.name }}
- +
+ + @@ -143,7 +152,7 @@ v-loading="addMaterialLoading" > + @@ -237,24 +249,41 @@ - + diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue index f70801d3..ba04d0d9 100644 --- a/src/views/pay/order/index.vue +++ b/src/views/pay/order/index.vue @@ -5,24 +5,14 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="120px" + label-width="100px" > - + @@ -42,14 +37,10 @@ v-model="queryParams.channelCode" placeholder="请输入渠道编码" clearable - @clear=" - () => { - queryParams.channelCode = null - } - " + class="!w-240px" > @@ -70,25 +62,36 @@ placeholder="请输入渠道订单号" clearable @keyup.enter="handleQuery" + class="!w-240px" /> - + - + @@ -97,12 +100,13 @@ v-model="queryParams.notifyStatus" placeholder="请选择订单回调商户状态" clearable + class="!w-240px" > @@ -118,14 +122,8 @@ /> - - - 搜索 - - - - 重置 - + 搜索 + 重置 - - 导出 + 导出 - + + @@ -151,17 +149,17 @@ - + @@ -195,35 +193,29 @@ label="创建时间" align="center" prop="createTime" - width="100" + width="180" :formatter="dateFormatter" /> - + - - + - + - - diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index b8a949e7..a17f5552 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -227,7 +227,7 @@ - + - + From 30cf8008ce967dc9f14b09ce7cc7b2d814552c4b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 11 Apr 2023 23:01:51 +0800 Subject: [PATCH 20/30] =?UTF-8?q?REVIEW=20=E9=80=80=E6=AC=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pay/order/index.vue | 4 +- src/views/pay/refund/RefundDetail.vue | 115 +++++++++ src/views/pay/refund/index.vue | 338 ++++++++++++-------------- src/views/pay/refund/refundForm.vue | 154 ------------ 4 files changed, 277 insertions(+), 334 deletions(-) create mode 100644 src/views/pay/refund/RefundDetail.vue delete mode 100644 src/views/pay/refund/refundForm.vue diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue index ba04d0d9..72e5128b 100644 --- a/src/views/pay/order/index.vue +++ b/src/views/pay/order/index.vue @@ -233,7 +233,7 @@ import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import * as MerchantApi from '@/api/pay/merchant' import * as OrderApi from '@/api/pay/order' -import OrderDetail from '@/views/pay/order/OrderDetail.vue' +import OrderDetail from './OrderDetail.vue' const message = useMessage() // 消息弹窗 import download from '@/utils/download' @@ -314,7 +314,7 @@ const handleExport = async () => { /** 预览详情 */ const detailRef = ref() -const openDetail = (id?: number) => { +const openDetail = (id: number) => { detailRef.value.open(id) } diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue new file mode 100644 index 00000000..8a47c6f6 --- /dev/null +++ b/src/views/pay/refund/RefundDetail.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue index a17f5552..17ca2a0d 100644 --- a/src/views/pay/refund/index.vue +++ b/src/views/pay/refund/index.vue @@ -1,10 +1,10 @@ - diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue deleted file mode 100644 index cc9d8726..00000000 --- a/src/views/pay/refund/refundForm.vue +++ /dev/null @@ -1,154 +0,0 @@ - - - - From fd447dc7a3c3ce4b582cd254d563ef2d2acef984 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 11 Apr 2023 23:28:59 +0800 Subject: [PATCH 21/30] =?UTF-8?q?REVIEW=20=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.front | 2 +- .vscode/launch.json | 2 +- src/views/mp/autoReply/index.vue | 3 ++- src/views/mp/components/WxMpSelect.vue | 5 ++--- src/views/mp/components/wx-account-select/main.vue | 6 +++--- src/views/mp/draft/index.vue | 3 ++- src/views/mp/freePublish/index.vue | 1 + src/views/mp/material/index.vue | 5 +---- src/views/mp/menu/index.vue | 3 ++- src/views/mp/tag/index.vue | 3 ++- src/views/mp/user/index.vue | 1 + 11 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.env.front b/.env.front index a63b6379..1629ff9f 100644 --- a/.env.front +++ b/.env.front @@ -19,7 +19,7 @@ VITE_API_URL=/admin-api VITE_BASE_PATH=/ # 项目本地运行端口号, 与.vscode/launch.json配合 -VITE_PORT=5173 +VITE_PORT=80 # 是否删除debugger VITE_DROP_DEBUGGER=false diff --git a/.vscode/launch.json b/.vscode/launch.json index e4093b3a..f43edc03 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "type": "msedge", "request": "launch", "name": "Launch Edge against localhost", - "url": "http://localhost:5173", + "url": "http://localhost", "webRoot": "${workspaceFolder}/src", "sourceMaps": true } diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue index 4877ec76..9208d1e7 100644 --- a/src/views/mp/autoReply/index.vue +++ b/src/views/mp/autoReply/index.vue @@ -3,7 +3,8 @@ - + + diff --git a/src/views/mp/components/WxMpSelect.vue b/src/views/mp/components/WxMpSelect.vue index 6dc6809b..e39bbf96 100644 --- a/src/views/mp/components/WxMpSelect.vue +++ b/src/views/mp/components/WxMpSelect.vue @@ -19,13 +19,12 @@ const emit = defineEmits<{ (e: 'change', id: number | undefined): void }>() -onMounted(async () => { +onMounted(() => { handleQuery() }) const handleQuery = async () => { - const data = await MpAccountApi.getSimpleAccountList() - accountList.value = data + accountList.value = await MpAccountApi.getSimpleAccountList() // 默认选中第一个 if (accountList.value.length > 0) { accountId.value = accountList.value[0].id diff --git a/src/views/mp/components/wx-account-select/main.vue b/src/views/mp/components/wx-account-select/main.vue index f75bc7d6..4eb99615 100644 --- a/src/views/mp/components/wx-account-select/main.vue +++ b/src/views/mp/components/wx-account-select/main.vue @@ -1,6 +1,7 @@ - diff --git a/src/views/pay/order/orderForm.vue b/src/views/pay/order/orderForm.vue new file mode 100644 index 00000000..f9625085 --- /dev/null +++ b/src/views/pay/order/orderForm.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue new file mode 100644 index 00000000..cc9d8726 --- /dev/null +++ b/src/views/pay/refund/refundForm.vue @@ -0,0 +1,154 @@ + + + + From fbbf4131f67706d77042744813a865b0c16e29e7 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 12 Apr 2023 14:05:21 +0800 Subject: [PATCH 24/30] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4WxLocation?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=9A=E4=BD=99Location=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mp/components/wx-location/main.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mp/components/wx-location/main.vue b/src/views/mp/components/wx-location/main.vue index 47eab571..17598136 100644 --- a/src/views/mp/components/wx-location/main.vue +++ b/src/views/mp/components/wx-location/main.vue @@ -31,7 +31,6 @@ /> - {{ label }} @@ -39,6 +38,7 @@
+ + diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue index 844d01b2..d9a44076 100644 --- a/src/views/mp/draft/index.vue +++ b/src/views/mp/draft/index.vue @@ -252,7 +252,6 @@ import * as MpFreePublishApi from '@/api/mp/freePublish' import type { UploadFiles, UploadProps, UploadRawFile } from 'element-plus' // 可以用改本地数据模拟，避免API调用超限 // import drafts from './mock' - const message = useMessage() // 消息 const loading = ref(true) // 列表的加载中 @@ -362,7 +361,7 @@ const submitForm = async () => { } finally { dialogNewsVisible.value = false addMaterialLoading.value = false - getList() + await getList() } } diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue index 4d4017d4..81d8fb08 100644 --- a/src/views/mp/material/index.vue +++ b/src/views/mp/material/index.vue @@ -277,14 +277,11 @@ const uploadRules: FormRules = { } // 素材类型 -type MatertialType = 'image' | 'voice' | 'video' -const type = ref('image') -// 遮罩层 -const loading = ref(false) -// 总条数 -// 数据列表 -const list = ref([]) -const total = ref(0) +type MaterialType = 'image' | 'voice' | 'video' +const type = ref('image') +const loading = ref(false) // 遮罩层 +const list = ref([]) // 总条数 +const total = ref(0) // 数据列表 // 查询参数 interface QueryParams { pageNo: number @@ -302,7 +299,7 @@ const queryParams: QueryParams = reactive({ const fileList = ref([]) interface UploadData { - type: MatertialType + type: MaterialType title: string introduction: string } @@ -346,7 +343,7 @@ const handleQuery = () => { const onTabChange = (tabName: TabPaneName) => { // 设置 type - uploadData.type = tabName as MatertialType + uploadData.type = tabName as MaterialType // 提前情况数据，避免tab切换后显示垃圾数据 list.value = [] diff --git a/src/views/mp/tag/index.vue b/src/views/mp/tag/index.vue index 6dc0d11a..125c8702 100644 --- a/src/views/mp/tag/index.vue +++ b/src/views/mp/tag/index.vue @@ -71,11 +71,10 @@ diff --git a/src/views/pay/order/orderForm.vue b/src/views/pay/order/orderForm.vue deleted file mode 100644 index f9625085..00000000 --- a/src/views/pay/order/orderForm.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - diff --git a/src/views/pay/refund/refundForm.vue b/src/views/pay/refund/refundForm.vue deleted file mode 100644 index cc9d8726..00000000 --- a/src/views/pay/refund/refundForm.vue +++ /dev/null @@ -1,154 +0,0 @@ - - - -