diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..471732f Binary files /dev/null and b/dist.zip differ diff --git a/src/api/pms/productCategory.js b/src/api/pms/productCategory.js index 2fb1295..83f5598 100644 --- a/src/api/pms/productCategory.js +++ b/src/api/pms/productCategory.js @@ -3,7 +3,7 @@ import request from '@/utils/request'; // 查询商品分类列表 export function listPmsProductCategory(query, pageReq) { return request({ - url: '/pms/productCategory/page', + url: '/app/productCategory/page', method: 'post', data: query, params: pageReq diff --git a/src/views/agent/index.vue b/src/views/agent/index.vue index f6ea885..7633e4c 100644 --- a/src/views/agent/index.vue +++ b/src/views/agent/index.vue @@ -56,9 +56,9 @@ - + diff --git a/src/views/oms/orderOperateHistory/index.vue b/src/views/oms/orderOperateHistory/index.vue index dac8f81..b64bc3d 100644 --- a/src/views/oms/orderOperateHistory/index.vue +++ b/src/views/oms/orderOperateHistory/index.vue @@ -3,7 +3,9 @@ - + + + @@ -124,10 +126,13 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {} + rules: {}, + listfn: [] }; }, - created() { + async created() { + const orderAftersaleMap = await this.getDictionaryByKey('oms_order_status'); + this.listfn = orderAftersaleMap; this.getList(); }, methods: { diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue index f1bf403..855be09 100644 --- a/src/views/pms/productCategory/index.vue +++ b/src/views/pms/productCategory/index.vue @@ -143,7 +143,7 @@ export default { showStatusMap: [] }; }, - async created() { + async mounted() { this.getList(); const showStatusMap = await this.getDictionaryByKey('sys_show_status'); this.showStatusMap = showStatusMap; diff --git a/src/views/promotion/index.vue b/src/views/promotion/index.vue index f24c107..0dcbcf9 100644 --- a/src/views/promotion/index.vue +++ b/src/views/promotion/index.vue @@ -48,9 +48,9 @@ - + diff --git a/src/views/system/article/index.vue b/src/views/system/article/index.vue index 40f8941..56b4c18 100644 --- a/src/views/system/article/index.vue +++ b/src/views/system/article/index.vue @@ -46,9 +46,10 @@ - + @@ -178,7 +179,7 @@ const { queryParams, form, rules } = toRefs>(data) const handleStatusChange = async (row: any) => { const text = row.status === '0' ? '启用' : '停用'; try { - await proxy?.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?'); + await proxy?.$modal.confirm('确认要"' + text + '""' + row.title + '"文章吗?'); await changeRoleStatus(row.roleId, row.status); proxy?.$modal.msgSuccess(text + '成功'); } catch { diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue index f5966d7..371bee8 100644 --- a/src/views/system/oss/index.vue +++ b/src/views/system/oss/index.vue @@ -128,6 +128,7 @@ + @@ -280,7 +281,7 @@ const handleOrderChange = (prop: string, order: string) => { }; /** 任务日志列表查询 */ const handleOssConfig = () => { - router.push('/system/oss-config/index'); + router.push('/config'); }; /** 文件按钮操作 */ const handleFile = () => { diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index eff3d33..6c4e055 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -61,9 +61,9 @@ - + diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue index 41a8a7a..e6bb45b 100644 --- a/src/views/system/version/index.vue +++ b/src/views/system/version/index.vue @@ -22,7 +22,9 @@ @@ -49,7 +51,7 @@ diff --git a/src/views/ums/account/index.vue b/src/views/ums/account/index.vue index 7139632..a756d26 100644 --- a/src/views/ums/account/index.vue +++ b/src/views/ums/account/index.vue @@ -41,7 +41,7 @@ diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue index 56e7609..ffa9eb2 100644 --- a/src/views/ums/member/index.vue +++ b/src/views/ums/member/index.vue @@ -111,25 +111,13 @@