diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue index 855614a..4b35fb6 100644 --- a/src/views/activityManage/activity.vue +++ b/src/views/activityManage/activity.vue @@ -104,7 +104,7 @@
取消 - 确定 + 确定
@@ -155,7 +155,7 @@ import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission const adminStore = useAdminStore(); const { adminData, menuTree } = storeToRefs(adminStore) import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue' -import { add } from 'lodash'; +import _ from 'lodash' // 活动名称正则表达式 const activityNameReg = /^[-a-zA-Z0-9\u4e00-\u9fa5,。!?、;:“”‘’()《》【】——~,.!?:;'"()\[\]_&+=]{0,100}$/; @@ -185,7 +185,6 @@ const editForm = ref({ id: '' }) const marketOptions = ref([]) - const getActivity = async function () { const rechargeActivity = { activityName: searchForm.value.activityName, @@ -265,7 +264,8 @@ const handleAdd = async function () { return } } - +// 新增节流 +const throttleGetActivity = _.throttle(handleAdd, 5000, { trailing: false }); const handleEdit = async function () { const activityName = editForm.value.activityName if (!validateActivityName(activityName)) return diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 1316805..bce35b8 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -16,7 +16,8 @@
产品名称 - +
订单状态 @@ -333,7 +334,7 @@ const adminStore = useAdminStore() const { adminData, menuTree } = storeToRefs(adminStore) import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import moment from 'moment' - +import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js' import RefundFinanceBackground from '@/assets/images/refund-progress.png' const currentStep = ref(0)// 进度图 @@ -620,135 +621,6 @@ const channelOptions = ref([{ label: 'Ipay88-链接收款' } ]) -const productList = [ - { - "value": "金币产品", - "label": "金币产品", - "children": [ - { - "value": "金币充值", - "label": "金币充值", - } - ] - }, - { - "value": "软件产品", - "label": "软件产品", - "children": [ - { - "value": "美股", - "label": "美股", - "children": [ - { - "value": "美股软件", - "label": "美股软件" - } - ] - }, - { - "value": "港股", - "label": "港股", - "children": [ - { - "value": "港股软件", - "label": "港股软件" - } - ] - }, - { - "value": "A股", - "label": "A股", - "children": [ - { - "value": "A股软件", - "label": "A股软件" - } - ] - }, - { - "value": "新加坡股", - "label": "新加坡股", - "children": [ - { - "value": "新加坡股软件", - "label": "新加坡股软件" - } - ] - }, - { - "value": "马股", - "label": "马股", - "children": [ - { - "value": "马股软件", - "label": "马股软件" - } - ] - }, - { - "value": "日本股", - "label": "日本股", - "children": [ - { - "value": "日本股软件", - "label": "日本股软件" - } - ] - }, - { - "value": "泰股", - "label": "泰股", - "children": [ - { - "value": "泰股软件", - "label": "泰股软件" - } - ] - }, - { - "value": "越南股", - "label": "越南股", - "children": [ - { - "value": "越南股软件", - "label": "越南股软件" - } - ] - }, - { - "value": "印尼股", - "label": "印尼股", - "children": [ - { - "value": "印尼股软件", - "label": "印尼股软件" - } - ] - }, - { - "value": "韩国股", - "label": "韩国股", - "children": [ - { - "value": "韩国股软件", - "label": "韩国股软件" - } - ] - }, - { - "value": "台湾股", - "label": "台湾股", - "children": [ - { - "value": "台湾股软件", - "label": "台湾股软件" - } - ] - } - ] - }, - -] const getMarket = async function () { try { const result = await API({ diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index d095fb3..061f576 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -345,6 +345,7 @@ const adminStore = useAdminStore() const { adminData, menuTree } = storeToRefs(adminStore) import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import moment from 'moment' +import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js' const currentStep = ref(0)// 进度图 const searchForm = ref({ @@ -780,135 +781,6 @@ const hideExecutor = function () { addForm.value.executor = '' showExecutor.value = false } -const productList = [ - { - "value": "金币产品", - "label": "金币产品", - "children": [ - { - "value": "金币充值", - "label": "金币充值", - } - ] - }, - { - "value": "软件产品", - "label": "软件产品", - "children": [ - { - "value": "美股", - "label": "美股", - "children": [ - { - "value": "美股软件", - "label": "美股软件" - } - ] - }, - { - "value": "港股", - "label": "港股", - "children": [ - { - "value": "港股软件", - "label": "港股软件" - } - ] - }, - { - "value": "A股", - "label": "A股", - "children": [ - { - "value": "A股软件", - "label": "A股软件" - } - ] - }, - { - "value": "新加坡股", - "label": "新加坡股", - "children": [ - { - "value": "新加坡股软件", - "label": "新加坡股软件" - } - ] - }, - { - "value": "马股", - "label": "马股", - "children": [ - { - "value": "马股软件", - "label": "马股软件" - } - ] - }, - { - "value": "日本股", - "label": "日本股", - "children": [ - { - "value": "日本股软件", - "label": "日本股软件" - } - ] - }, - { - "value": "泰股", - "label": "泰股", - "children": [ - { - "value": "泰股软件", - "label": "泰股软件" - } - ] - }, - { - "value": "越南股", - "label": "越南股", - "children": [ - { - "value": "越南股软件", - "label": "越南股软件" - } - ] - }, - { - "value": "印尼股", - "label": "印尼股", - "children": [ - { - "value": "印尼股软件", - "label": "印尼股软件" - } - ] - }, - { - "value": "韩国股", - "label": "韩国股", - "children": [ - { - "value": "韩国股软件", - "label": "韩国股软件" - } - ] - }, - { - "value": "台湾股", - "label": "台湾股", - "children": [ - { - "value": "台湾股软件", - "label": "台湾股软件" - } - ] - } - ] - }, - -] const showAudit = function (row) { auditRow.value = row showAudit2.value = true diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 2f4091e..e4d5327 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -17,7 +17,8 @@
产品名称 - +
订单状态 @@ -176,6 +177,16 @@ 部分退款
+
+ 永久金币 +   个 +
+
+ 免费金币 +   个 +
退款理由