diff --git a/manager/src/router/router.js b/manager/src/router/router.js index 1e024543b..d3b4e8fb1 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -471,6 +471,13 @@ export const otherRouter = { meta: { title: "商品销售汇总报表" }, component: () => import("@/views/statistics/goods-sales-summary.vue") }, + { + path: "article-edit", + title: "文章编辑", + name: "article-edit", + meta: { title: "文章编辑" }, + component: () => import("@/views/page/article-manage/articleEdit.vue") + }, { path: "distributionImportRecord", title: "分销员导入记录", diff --git a/manager/src/views/custom-words/index.vue b/manager/src/views/custom-words/index.vue index 0c0454dc5..1aaf69d13 100644 --- a/manager/src/views/custom-words/index.vue +++ b/manager/src/views/custom-words/index.vue @@ -45,12 +45,13 @@ - @@ -61,7 +62,7 @@ 取消 保存 - + diff --git a/manager/src/views/distribution/distribution.vue b/manager/src/views/distribution/distribution.vue index ce6098708..be1229aae 100644 --- a/manager/src/views/distribution/distribution.vue +++ b/manager/src/views/distribution/distribution.vue @@ -127,9 +127,9 @@ - + + @@ -260,10 +260,10 @@ - 取消 保存 - + - 取消 确定 - + - 取消 确定 - + - - + @@ -923,6 +923,9 @@ onMounted(() => { margin: 0 8px; color: #dcdee2; } +.ops-row { + white-space: nowrap; +} .status-tabs { margin-bottom: 4px; } diff --git a/manager/src/views/distribution/distributionCustomerRelation.vue b/manager/src/views/distribution/distributionCustomerRelation.vue index 2cbc2f30c..7df3f1abc 100644 --- a/manager/src/views/distribution/distributionCustomerRelation.vue +++ b/manager/src/views/distribution/distributionCustomerRelation.vue @@ -243,12 +243,13 @@ - @@ -273,7 +274,7 @@ 取消 确定 - + - @@ -300,7 +302,7 @@ 取消 确定 - + diff --git a/manager/src/views/finance/payment-method.vue b/manager/src/views/finance/payment-method.vue index 5a820fa40..dee85d3e3 100644 --- a/manager/src/views/finance/payment-method.vue +++ b/manager/src/views/finance/payment-method.vue @@ -14,7 +14,11 @@ - + + + @@ -35,6 +39,17 @@ const loading = ref(false); const dateRange = ref([]); const data = ref([]); +const paymentNameMap = { + WECHAT: "微信支付", + ALIPAY: "支付宝", + WALLET: "余额支付", + BANK_TRANSFER: "线下转账", +}; + +function formatPaymentName(name) { + return paymentNameMap[name] || name || "-"; +} + onMounted(() => { loadData(); }); diff --git a/manager/src/views/logistics/index.vue b/manager/src/views/logistics/index.vue index 0e5cc8277..daf7e12c7 100644 --- a/manager/src/views/logistics/index.vue +++ b/manager/src/views/logistics/index.vue @@ -52,10 +52,11 @@ - @@ -93,7 +94,7 @@ 提交 - + diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue index d56d49d5d..8a6147081 100644 --- a/manager/src/views/page/article-manage/ArticleCategory.vue +++ b/manager/src/views/page/article-manage/ArticleCategory.vue @@ -32,12 +32,13 @@ - @@ -55,7 +56,7 @@ 取消 提交 - + diff --git a/manager/src/views/page/article-manage/articleEdit.vue b/manager/src/views/page/article-manage/articleEdit.vue new file mode 100644 index 000000000..c2a3bdc92 --- /dev/null +++ b/manager/src/views/page/article-manage/articleEdit.vue @@ -0,0 +1,170 @@ + + + diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue index 540bcf7e6..6276f212a 100644 --- a/manager/src/views/page/article-manage/articleList.vue +++ b/manager/src/views/page/article-manage/articleList.vue @@ -2,6 +2,9 @@
- - - - - - - 搜索 - - + + + + + + + 搜索 + + + -
+ +
添加
- - + + + + - - + + @@ -91,92 +99,20 @@
- - - - - - - - - - - - - - - - - - - - -