From 028f32a73c53a583e71e677de4fa3a3aa6158eb0 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Sun, 30 Nov 2025 18:19:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(manager):=20=E6=9B=BF=E6=8D=A2iView?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=BATDesign=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将iView组件统一替换为TDesign组件 - 优化表单、表格、弹窗等交互样式 - 修复路由重复添加问题 - 更新依赖版本 - 调整布局间距与响应式 - 修复表单重置方法兼容性 - 统一消息提示组件 --- .../Fix TDesign form reset in Custom Words.md | 38 + .vercel/project.json | 1 + README.md | 7 + buyer/README.md | 5 + buyer/src/api/cart.js | 2 +- manager/README.md | 6 + manager/package.json | 8 +- manager/src/api/common.js | 2 +- manager/src/components/TdPage.vue | 44 + .../src/components/editor/upload-image.vue | 80 +- .../components/hotzone/components/Zone.vue | 41 +- manager/src/components/hotzone/index.vue | 22 +- .../components/lili-dialog/goods-dialog.vue | 6 +- manager/src/components/lili-dialog/index.vue | 8 +- .../components/lili-dialog/link-dialog.vue | 14 +- .../components/lili-dialog/template/other.vue | 18 +- .../components/lili-dialog/template/shops.vue | 28 +- manager/src/components/lili/config-drawer.vue | 11 +- .../lili/department-tree-choose.vue | 10 +- .../src/components/lili/upload-pic-input.vue | 39 +- .../src/components/lili/upload-pic-thumb.vue | 76 +- manager/src/components/map/multiple-map.vue | 21 +- .../components/tree-table/Table/TableBody.js | 3 +- manager/src/libs/axios.js | 20 +- manager/src/libs/util.js | 11 + manager/src/locale/index.js | 6 +- manager/src/main.js | 457 ++++++- manager/src/router/index.js | 3 - manager/src/store/modules/app.js | 14 +- manager/src/styles/theme.less | 13 +- manager/src/utils/filters.js | 2 +- manager/src/views/Main.vue | 72 +- manager/src/views/custom-words/index.vue | 207 +--- .../src/views/distribution/distribution.vue | 493 ++------ .../views/distribution/distributionApply.vue | 168 +-- .../views/distribution/distributionCash.vue | 334 +++--- .../views/distribution/distributionGoods.vue | 188 ++- .../views/distribution/distributionOrder.vue | 202 ++-- .../distribution/distributionSetting.vue | 36 +- manager/src/views/goods-unit/index.vue | 229 ++-- manager/src/views/goods/goods-info/goods.vue | 719 ++++------- .../src/views/goods/goods-info/goodsApply.vue | 23 +- .../views/goods/goods-info/goodsDetail.vue | 400 +++---- .../src/views/goods/goods-manage/brand.vue | 297 ++--- .../src/views/goods/goods-manage/category.vue | 431 ++----- .../views/goods/goods-manage/parameter.vue | 16 +- .../src/views/goods/goods-review/index.vue | 235 ++-- manager/src/views/home/home.vue | 128 +- manager/src/views/logistics/index.vue | 276 ++--- manager/src/views/main-parts/header.vue | 42 +- manager/src/views/main-parts/lang-switch.vue | 12 +- manager/src/views/main-parts/message-tip.vue | 36 +- .../shrinkable-menu/shrinkable-menu.vue | 97 +- manager/src/views/main.scss | 6 +- manager/src/views/member/advance/recharge.vue | 336 +++--- .../src/views/member/advance/walletLog.vue | 159 +-- .../views/member/advance/withdrawApply.vue | 350 +++--- manager/src/views/member/list/index.vue | 257 ++-- .../src/views/member/list/memberDetail.vue | 783 +++++------- .../src/views/member/list/memberRecycle.vue | 256 ++-- .../message-manage/weChatMessageManager.vue | 331 ++--- manager/src/views/member/point/point.vue | 280 ++--- .../src/views/order/after-order/afterSale.vue | 314 ++--- .../order/after-order/afterSaleOrder.vue | 388 ++---- .../after-order/afterSaleOrderDetail.vue | 65 +- .../order/after-order/orderComplaint.vue | 280 ++--- .../after-order/orderComplaintDetail.vue | 37 +- manager/src/views/order/flow/paymentLog.vue | 252 ++-- manager/src/views/order/flow/refundLog.vue | 245 ++-- .../views/order/order/fictitiousOrderList.vue | 7 +- manager/src/views/order/order/orderDetail.vue | 61 +- manager/src/views/order/order/orderList.vue | 592 +++++---- .../src/views/page-decoration/floorList.vue | 98 +- .../src/views/page-decoration/modelForm.vue | 76 +- .../views/page-decoration/modelFormItem.vue | 57 +- .../page-decoration/modelList/carousel.vue | 4 +- .../page-decoration/modelList/carousel1.vue | 39 +- .../page-decoration/modelList/carousel2.vue | 100 +- .../page-decoration/modelList/forYour.vue | 71 +- .../page-decoration/modelList/mixModel.vue | 100 +- .../modelList/newGoodsSort.vue | 91 +- .../modelList/onlyGoodsModel.vue | 29 +- .../page-decoration/modelList/recommend.vue | 87 +- .../src/views/page-decoration/renovation.vue | 27 +- .../views/page-decoration/wap/advertising.vue | 27 +- .../page-decoration/wap/alertAdvertising.vue | 29 +- .../views/page-decoration/wap/decorate.vue | 177 +-- .../src/views/page-decoration/wap/index.vue | 25 +- .../src/views/page-decoration/wap/navbar.vue | 57 +- .../wap/template/tpl_banner.vue | 10 +- .../wap/template/tpl_goods.vue | 6 +- .../wap/template/tpl_search.vue | 4 +- .../src/views/page-decoration/wap/wapList.vue | 46 +- .../page/article-manage/ArticleCategory.vue | 109 +- .../page/article-manage/HOTWORDS_HISTORY.vue | 83 +- .../page/article-manage/HOTWORDS_TODAY.vue | 83 +- .../page/article-manage/HOTWORD_SETTING.vue | 40 +- .../views/page/article-manage/articleList.vue | 348 ++---- .../views/page/article-manage/hotWords.vue | 26 +- .../template/historyHotWords.vue | 30 +- .../article-manage/template/setupHotWords.vue | 48 +- .../template/statisticsHotWords.vue | 30 +- .../article-manage/template/todayHotWords.vue | 108 +- manager/src/views/page/feedback/feedback.vue | 182 +-- manager/src/views/privacy-content/index.vue | 112 +- .../coupon-activity/coupon-info.vue | 223 ++-- .../coupon-activity/coupon-publish.vue | 467 ++------ .../promotions/coupon-activity/coupon.vue | 219 ++-- .../promotions/coupon/coupon-publish.vue | 361 ++---- .../promotions/coupon/coupon-receive.vue | 366 ++---- .../src/views/promotions/coupon/coupon.vue | 494 +++----- .../full-discount/full-discount-detail.vue | 473 +++----- .../full-discount/full-discount.vue | 290 ++--- .../kanjia/kanjia-activity-add-goods.vue | 175 +-- .../kanjia/kanjia-activity-edit-goods.vue | 99 +- .../kanjia/kanjia-activity-goods.vue | 393 +++--- manager/src/views/promotions/live/live.vue | 216 +--- .../promotions/pintuan/pintuan-goods.vue | 104 +- .../src/views/promotions/pintuan/pintuan.vue | 201 ++-- .../points-goods-category.vue | 211 +--- .../points-goods/points-goods-add.vue | 238 ++-- .../points-goods/points-goods-edit.vue | 112 +- .../promotions/points-goods/points-goods.vue | 403 +++---- .../views/promotions/seckill/seckill-add.vue | 104 +- .../promotions/seckill/seckill-goods.vue | 172 +-- .../promotions/seckill/seckill-setup.vue | 32 +- .../src/views/promotions/seckill/seckill.vue | 251 ++-- manager/src/views/region/index.vue | 535 +++------ .../seller/bill/accountStatementBill.vue | 245 ++-- manager/src/views/seller/bill/bill-detail.vue | 351 ++---- manager/src/views/seller/bill/bill.vue | 307 ++--- .../src/views/seller/shop/shopAuditList.vue | 168 +-- manager/src/views/seller/shop/shopDetail.vue | 1062 +++++------------ manager/src/views/seller/shop/shopList.vue | 428 ++----- .../src/views/seller/shop/shopOperation.vue | 78 +- manager/src/views/sensitive-words/index.vue | 246 ++-- manager/src/views/statistics/goods.vue | 55 +- manager/src/views/statistics/member.vue | 41 +- manager/src/views/statistics/order.vue | 265 +--- .../views/statistics/order/orderDetail.vue | 4 +- .../views/statistics/order/refundOrder.vue | 5 +- manager/src/views/statistics/traffic.vue | 29 +- .../src/views/sys/app-version/appVersion.vue | 339 ++---- .../department-manage/departmentManage.vue | 529 ++++---- .../src/views/sys/log-manage/logManage.vue | 303 +---- manager/src/views/sys/menu-manage/menu.vue | 546 +++------ .../src/views/sys/menu-manage/storeMenu.vue | 261 ++-- .../sys/message/noticeMessageTemplate.vue | 721 +++-------- manager/src/views/sys/message/sms.scss | 4 + manager/src/views/sys/message/sms.vue | 583 ++++----- manager/src/views/sys/message/smsSign.vue | 93 +- .../src/views/sys/oss-manage/ossManage.vue | 310 +++-- .../src/views/sys/role-manage/roleManage.vue | 350 +++--- .../authLogin/CONNECT_SETTING.vue | 42 +- .../setting-manage/authLogin/QQ_CONNECT.vue | 51 +- .../authLogin/WECHAT_CONNECT.vue | 51 +- .../setting-manage/pay/PAYMENT_SUPPORT.vue | 37 +- .../sys/setting-manage/platformSetting.vue | 216 ++-- .../setting-manage/setting/BASE_SETTING.vue | 80 +- .../setting-manage/setting/SMS_SETTING.vue | 132 +- .../sys/setting-manage/settingManage.vue | 15 +- .../sys/setting-manage/smsSettingManage.vue | 52 +- manager/src/views/sys/slider/slider.vue | 217 ++-- .../src/views/sys/user-manage/userManage.vue | 458 ++----- manager/vue.config.js | 146 +-- seller/README.md | 5 + seller/package.json | 8 +- seller/public/config.js | 4 +- seller/src/main.js | 299 +++++ seller/src/utils/filters.js | 2 +- seller/src/views/goods/goods-seller/goods.vue | 12 +- .../goods-seller/goodsOperationFirst.vue | 8 +- seller/src/views/lili-dialog/link-dialog.vue | 18 +- .../src/views/lili-dialog/template/other.vue | 16 +- .../src/views/lili-dialog/template/shops.vue | 6 +- .../order/after-order/returnGoodsOrder.vue | 6 +- seller/src/views/order/order/orderList.vue | 2 +- .../views/order/order/virtualOrderList.vue | 2 +- seller/src/views/shop/modelList/seckill.vue | 2 +- seller/src/views/shop/ship/logistics.vue | 202 +--- 180 files changed, 10701 insertions(+), 17865 deletions(-) create mode 100644 .trae/documents/Fix TDesign form reset in Custom Words.md create mode 100644 .vercel/project.json create mode 100644 manager/src/components/TdPage.vue diff --git a/.trae/documents/Fix TDesign form reset in Custom Words.md b/.trae/documents/Fix TDesign form reset in Custom Words.md new file mode 100644 index 00000000..0e5d2230 --- /dev/null +++ b/.trae/documents/Fix TDesign form reset in Custom Words.md @@ -0,0 +1,38 @@ +## 目标 +- 增加 Tabs 与内容的间距样式 +- 将“查看”弹窗统一为右侧抽屉并用 `t-descriptions` 展示 +- 修复自定义分词页面 `resetFields()` 报错为 TDesign 的 `reset()` + +## 涉及页面与改动 +### 1) 站内信模板 +- 文件：`manager/src/views/sys/message/noticeMessageTemplate.vue` +- 改动： + - 给 `t-tabs` 增加类名（如 `notice-tabs`），样式：`::v-deep(.notice-tabs .t-tabs__content){ padding-top:16px }` + - 在每个 `t-tab-panel` 内包裹 `div.tab-content` 并设 `padding-top:16px` + - 将查看详情 `t-dialog` 改为 `t-drawer`（`placement="right" size="800px"`），内容改为 `t-descriptions` 单列展示（标题、类型、模板内容等），保留编辑/发送交互不变 + +### 2) 意见反馈 +- 文件：`manager/src/views/page/feedback/feedback.vue` +- 改动： + - 将详情 `t-dialog` 改为 `t-drawer`（右侧展开） + - 只读内容用 `t-descriptions` 单列展示（用户名、手机、类型、内容、图片列表），移除禁用表单控件 + - 分页区域由 iView `Row/Page` 改为 `t-pagination`（保持现有页码/页大小逻辑） + - 抽屉底部仅保留“返回”按钮（左对齐） + +### 3) 自定义分词 +- 文件：`manager/src/views/custom-words/index.vue` +- 改动： + - 在 `add()` 等调用中，将 `this.$refs.form.resetFields()` 替换为： + - `if (this.$refs.form && typeof this.$refs.form.reset === 'function') { this.$refs.form.reset(); } else { this.form = { name: '' } }` + - 初始化 `this.form` 改为显式字段对象，确保校验兼容 + - 检查页面是否存在其他 iView API（如 `$Message/$Modal`），若有统一为 `MessagePlugin/DialogPlugin` + +## 验证 +- 打开对应页面，切换 Tabs，间距生效 +- 点击“查看”→ 抽屉从右侧展开，信息以 `t-descriptions` 单列展示，底部仅“返回”按钮 +- 自定义分词点击“添加”，不再出现 `resetFields` 报错，表单成功清空 +- 分页切换正常且无控制台警告 + +## 注意 +- 不改动现有业务接口与数据结构；仅替换 UI 容器与只读展示方式 +- 样式值可根据视觉反馈上调（如 20px） \ No newline at end of file diff --git a/.vercel/project.json b/.vercel/project.json new file mode 100644 index 00000000..812014f7 --- /dev/null +++ b/.vercel/project.json @@ -0,0 +1 @@ +{"neverMindDeployCard":true} \ No newline at end of file diff --git a/README.md b/README.md index c4f6d962..485a1101 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,13 @@ github 镜像: https://github.com/lilishop?tab=repositories 商城UI 项目下3个文件夹 buyer：买家PC端，seller：商家端，manager：后台管理端 +### 前端 UI 框架与版本 + +- manager：`tdesign-vue@^1.14.2`、`tdesign-icons-vue@^0.2.3`、`view-design@^4.7.0`、`vue@2.6.14` +- buyer：`view-design@^4.3.2`、`vue@^2.6.11` +- seller：`view-design@^4.6.1`、`vue@^2.6.10` +- im：`element-ui@^2.14.1`、`vue@^2.6.11` + ### 演示地址 PS：手机验证码为 ‘111111’ diff --git a/buyer/README.md b/buyer/README.md index e69de29b..8e65f535 100644 --- a/buyer/README.md +++ b/buyer/README.md @@ -0,0 +1,5 @@ +### UI 框架与版本 + +- `view-design@^4.3.2` +- `vue@^2.6.11` + diff --git a/buyer/src/api/cart.js b/buyer/src/api/cart.js index c8d13461..d7e68ec5 100644 --- a/buyer/src/api/cart.js +++ b/buyer/src/api/cart.js @@ -63,7 +63,7 @@ export function addCartGoods (params) { /** * 创建交易 - * @param client 客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端 + * @param client 客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序,APP/移动应用端 * @param way 购物车购买：CART/立即购买：BUY_NOW / 积分购买：POINT * @param remark 备注 非必填 */ diff --git a/manager/README.md b/manager/README.md index ec629e11..dac018f0 100644 --- a/manager/README.md +++ b/manager/README.md @@ -4,6 +4,12 @@ ### Customize configuration 详情点击 [https://cli.vuejs.org/zn/config/](https://cli.vuejs.org/zn/config/). +### UI 框架与版本 + +- `tdesign-vue@^1.14.2` +- `tdesign-icons-vue@^0.2.3` +- `vue@2.6.14` + #### login.vue页面，测试时不走权限，直接return 318行 #### Main.vue 页面，241行，修改，避免报错 diff --git a/manager/package.json b/manager/package.json index 0257c919..55560439 100644 --- a/manager/package.json +++ b/manager/package.json @@ -25,8 +25,10 @@ "sockjs-client": "^1.4.0", "swiper": "^6.3.5", "uuid": "^8.3.2", - "view-design": "^4.7.0", - "vue": "^2.6.10", + "tdesign-vue": "^1.14.2", + "tdesign-icons-vue": "^0.2.3", + "@vue/composition-api": "^1.7.1", + "vue": "2.6.14", "vue-awesome-swiper": "^4.1.1", "vue-i18n": "^8.15.1", "vue-json-excel": "^0.3.0", @@ -50,7 +52,7 @@ "style-resources-loader": "^1.3.2", "uglifyjs-webpack-plugin": "^2.2.0", "vue-cli-plugin-style-resources-loader": "^0.1.4", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "2.6.14" }, "resolutions": { "minimatch": "^3.1.2", diff --git a/manager/src/api/common.js b/manager/src/api/common.js index 1fbe6886..8b476d8e 100644 --- a/manager/src/api/common.js +++ b/manager/src/api/common.js @@ -23,7 +23,7 @@ export const postVerifyImg = (params) => { // 获取系统基础信息 export const getBaseSite = () => { - return getRequest(`${commonUrl}/common/common/site`); + return getRequestWithNoToken(`${commonUrl}/common/common/site`); }; // 上传文件 diff --git a/manager/src/components/TdPage.vue b/manager/src/components/TdPage.vue new file mode 100644 index 00000000..1529b8c4 --- /dev/null +++ b/manager/src/components/TdPage.vue @@ -0,0 +1,44 @@ + + diff --git a/manager/src/components/editor/upload-image.vue b/manager/src/components/editor/upload-image.vue index c2498522..6751780a 100644 --- a/manager/src/components/editor/upload-image.vue +++ b/manager/src/components/editor/upload-image.vue @@ -1,7 +1,7 @@
- -
- +
+
- +
- + - - - + + + + diff --git a/manager/src/views/distribution/distributionApply.vue b/manager/src/views/distribution/distributionApply.vue index a440ed11..9a839077 100644 --- a/manager/src/views/distribution/distributionApply.vue +++ b/manager/src/views/distribution/distributionApply.vue @@ -1,61 +1,35 @@ - diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue index 35374cfa..1c64e4c0 100644 --- a/manager/src/views/goods/goods-manage/brand.vue +++ b/manager/src/views/goods/goods-manage/brand.vue @@ -1,39 +1,39 @@ @@ -47,7 +47,8 @@ import { } from "@/api/goods"; import uploadPicInput from "@/components/lili/upload-pic-input"; -import {regular} from "@/utils"; +import { regular } from "@/utils"; +import { MessagePlugin, DialogPlugin } from "tdesign-vue"; export default { name: "brand", @@ -86,156 +87,21 @@ export default { }, submitLoading: false, // 添加或编辑提交状态 columns: [ - { - title: "品牌名称", - key: "name", - width: 200, - resizable: true, - sortable: false, - }, - { - title: "品牌图标", - key: "logo", - align: "left", - render: (h, params) => { - return h("img", { - attrs: { - src: params.row.logo || '', - alt: "加载图片失败", - }, - style: { - cursor: "pointer", - width: "80px", - height: "60px", - margin: "10px 0", - "object-fit": "contain", - }, - }); - }, - }, - { - title: "状态", - key: "deleteFlag", - align: "left", - render: (h, params) => { - if (params.row.deleteFlag == 0) { - return h("Tag", {props: {color: "green",},}, "启用"); - } else if (params.row.deleteFlag == 1) { - return h("Tag", {props: {color: "volcano",},}, "禁用"); - } - }, - filters: [ - { - label: "启用", - value: 0, - }, - { - label: "禁用", - value: 1, - }, - ], - filterMultiple: false, - filterMethod(value, row) { - if (value == 0) { - return row.deleteFlag == 0; - } else if (value == 1) { - return row.deleteFlag == 1; - } - }, - }, - { - title: "操作", - key: "action", - width: 180, - align: "center", - fixed: "right", - render: (h, params) => { - let enableOrDisable = ""; - if (params.row.deleteFlag == 0) { - enableOrDisable = h( - "a", - { - style: { - color: "#2d8cf0", - cursor: "pointer", - textDecoration: "none", - marginRight: "5px", - }, - on: { - click: () => { - this.disable(params.row); - }, - }, - }, - "禁用" - ); - } else { - enableOrDisable = h( - "a", - { - style: { - color: "#2d8cf0", - cursor: "pointer", - textDecoration: "none", - marginRight: "5px", - }, - on: { - click: () => { - this.enable(params.row); - }, - }, - }, - "启用" - ); - } - return h("div", [ - h( - "a", - { - style: { - color: "#2d8cf0", - cursor: "pointer", - textDecoration: "none", - marginRight: "5px", - }, - on: { - click: () => { - this.edit(params.row); - }, - }, - }, - "编辑" - ), - h( - "span", - { style: { margin: "0 8px", color: "#dcdee2" } }, - "|" - ), - enableOrDisable, - h( - "span", - { style: { margin: "0 8px", color: "#dcdee2" } }, - "|" - ), - h( - "a", - { - style: { - color: "#2d8cf0", - cursor: "pointer", - textDecoration: "none", - }, - on: { - click: () => { - this.delBrand(params.row.id); - }, - }, - }, - "删除" - ), - ]); - }, - }, + { title: "品牌名称", colKey: "name", width: 200 }, + { title: "品牌图标", colKey: "logo", align: "left", cell: (h, { row }) => h("img", { attrs: { src: row.logo || '', alt: "加载图片失败" }, style: { cursor: "pointer", width: "48px", height: "36px", margin: "6px 0", objectFit: "contain" } }) }, + { title: "状态", colKey: "deleteFlag", align: "left", cell: (h, { row }) => row.deleteFlag == 0 ? h("t-tag", { props: { theme: "success", variant: "light" } }, "启用") : h("t-tag", { props: { theme: "warning", variant: "light" } }, "禁用") }, + { title: "操作", colKey: "action", width: 180, align: "center", fixed: "right", cell: (h, { row }) => { + const enableOrDisable = row.deleteFlag == 0 + ? h("a", { style: { color: "#2d8cf0", cursor: "pointer", textDecoration: "none", marginRight: "5px" }, on: { click: () => this.disable(row) } }, "禁用") + : h("a", { style: { color: "#2d8cf0", cursor: "pointer", textDecoration: "none", marginRight: "5px" }, on: { click: () => this.enable(row) } }, "启用"); + return h("div", [ + h("a", { style: { color: "#2d8cf0", cursor: "pointer", textDecoration: "none", marginRight: "5px" }, on: { click: () => this.edit(row) } }, "编辑"), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), + enableOrDisable, + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), + h("a", { style: { color: "#2d8cf0", cursor: "pointer", textDecoration: "none" }, on: { click: () => this.confirmDel(row) } }, "删除"), + ]); + } }, ], data: [], // 表单数据 total: 0, // 表单数据总数 @@ -244,13 +110,22 @@ export default { methods: { // 删除品牌 async delBrand(id) { - let res = await delBrand(id); - + const res = await delBrand(id); if (res.success) { - this.$Message.success("品牌删除成功!"); + MessagePlugin.success("品牌删除成功!"); this.getDataList(); } }, + confirmDel(row) { + DialogPlugin.confirm({ + header: "确认删除", + content: "您确认要删除品牌 " + row.name + " ?", + theme: "warning", + onConfirm: () => { + this.delBrand(row.id); + }, + }); + }, // 初始化数据 init() { this.getDataList(); @@ -265,12 +140,30 @@ export default { this.searchForm.pageSize = v; this.getDataList(); }, + onPaginationChange(info) { + if (info && typeof info.pageSize !== "undefined" && info.pageSize !== this.searchForm.pageSize) { + this.changePageSize(info.pageSize); + } + if (info && typeof info.current !== "undefined") { + this.changePage(info.current); + } + }, // 搜索 handleSearch() { this.searchForm.pageNumber = 1; this.searchForm.pageSize = 20; this.getDataList(); }, + handleReset() { + this.searchForm = { + pageNumber: 1, + pageSize: 20, + sort: "create_time", + order: "desc", + name: "", + }; + this.getDataList(); + }, // 获取数据 getDataList() { this.loading = true; @@ -293,7 +186,7 @@ export default { addBrand(this.form).then((res) => { this.submitLoading = false; if (res.success) { - this.$Message.success("操作成功"); + MessagePlugin.success("操作成功"); this.getDataList(); this.modalVisible = false; } @@ -303,7 +196,7 @@ export default { updateBrand(this.form).then((res) => { this.submitLoading = false; if (res.success) { - this.$Message.success("操作成功"); + MessagePlugin.success("操作成功"); this.getDataList(); this.modalVisible = false; } @@ -316,7 +209,7 @@ export default { add() { this.modalType = 0; this.modalTitle = "添加"; - this.$refs.form.resetFields(); + this.$refs.form.reset(); delete this.form.id; this.modalVisible = true; }, @@ -325,7 +218,7 @@ export default { edit(v) { this.modalType = 1; this.modalTitle = "编辑"; - this.$refs.form.resetFields(); + this.$refs.form.reset(); // 转换null为"" for (let attr in v) { if (v[attr] === null) { @@ -339,15 +232,14 @@ export default { }, // 启用品牌 enable(v) { - this.$Modal.confirm({ - title: "确认启用", + DialogPlugin.confirm({ + header: "确认启用", content: "您确认要启用品牌 " + v.name + " ?", - loading: true, - onOk: () => { + theme: "warning", + onConfirm: () => { disableBrand(v.id, {disable: false}).then((res) => { - this.$Modal.remove(); if (res.success) { - this.$Message.success("操作成功"); + MessagePlugin.success("操作成功"); this.getDataList(); } }); @@ -356,15 +248,14 @@ export default { }, // 禁用 disable(v) { - this.$Modal.confirm({ - title: "确认禁用", + DialogPlugin.confirm({ + header: "确认禁用", content: "您确认要禁用品牌 " + v.name + " ?", - loading: true, - onOk: () => { + theme: "warning", + onConfirm: () => { disableBrand(v.id, {disable: true}).then((res) => { - this.$Modal.remove(); if (res.success) { - this.$Message.success("操作成功"); + MessagePlugin.success("操作成功"); this.getDataList(); } }); diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue index f8e94911..3f88db1c 100644 --- a/manager/src/views/goods/goods-manage/category.vue +++ b/manager/src/views/goods/goods-manage/category.vue @@ -1,181 +1,84 @@ diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss index f5691e76..293301a9 100644 --- a/manager/src/views/main.scss +++ b/manager/src/views/main.scss @@ -52,7 +52,7 @@ box-sizing: border-box; position: fixed; display: block; - padding-left: 180px; + padding-left: 312px; width: 100%; height: 100px; z-index: 20; @@ -218,12 +218,12 @@ .single-page-con { min-width: 740px; position: relative; - left: 180px; + left: 312px; top: 100px; right: 0; bottom: 0; height: calc(100% - 110px); - width: calc(100% - 180px); + width: calc(100% - 312px); overflow: auto; background-color: #f0f0f0; z-index: 1; diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue index 4ac09553..bdd97b7a 100644 --- a/manager/src/views/member/advance/recharge.vue +++ b/manager/src/views/member/advance/recharge.vue @@ -1,208 +1,178 @@ diff --git a/manager/src/views/member/advance/walletLog.vue b/manager/src/views/member/advance/walletLog.vue index 9b6e65ff..118fac2e 100644 --- a/manager/src/views/member/advance/walletLog.vue +++ b/manager/src/views/member/advance/walletLog.vue @@ -1,26 +1,26 @@ @@ -30,112 +30,123 @@ export default { name: "walletLog", data() { return { - loading: true, // 表单加载状态 - searchForm: { - // 搜索框初始化对象 - pageNumber: 1, // 当前页数 - pageSize: 20, // 页面大小 - sort: "createTime", // 默认排序字段 - order: "desc", // 默认排序方式 - startDate: "", // 起始时间 - endDate: "", // 终止时间 - memberName: "", - }, - selectDate: null, // 选择时间段 + loading: true, + searchForm: { + pageNumber: 1, + pageSize: 20, + sort: "createTime", + order: "desc", + startDate: "", + endDate: "", + memberName: "", + }, + selectDate: [], columns: [ - // 表头 { title: "会员名称", - key: "memberName", + colKey: "memberName", minWidth: 100, + align: "left", }, { title: "变动金额", - key: "money", + colKey: "money", width: 150, - render: (h, params) => { - if (params.row.money >0) { - return h("priceColorScheme", {props:{value:params.row.money,color:'green'}} ); + align: "left", + cell: (h, params) => { + if (params.row.money > 0) { + return h("priceColorScheme", { props: { value: params.row.money, color: "green" } }); } else if (params.row.money < 0) { - return h("priceColorScheme", {props:{value:params.row.money,color:this.$mainColor}} ); + return h("priceColorScheme", { props: { value: params.row.money, color: this.$mainColor } }); } }, }, - { title: "变更时间", - key: "createTime", + colKey: "createTime", width: 200, + align: "left", }, { title: "业务类型", - key: "serviceType", + colKey: "serviceType", width: 200, - render: (h, params) => { - if (params.row.serviceType == "WALLET_WITHDRAWAL") { - return h("div", [h("span", {}, "余额提现")]); - } else if (params.row.serviceType == "WALLET_PAY") { - return h("div", [h("span", {}, "余额支付")]); - } else if (params.row.serviceType == "WALLET_REFUND") { - return h("div", [h("span", {}, "余额退款")]); - } else if (params.row.serviceType == "WALLET_RECHARGE") { - return h("div", [h("span", {}, "余额充值")]); - } else { - return h("div", [h("span", {}, "佣金提成")]); - } + align: "left", + cell: (h, params) => { + const map = { + WALLET_WITHDRAWAL: "余额提现", + WALLET_PAY: "余额支付", + WALLET_REFUND: "余额退款", + WALLET_RECHARGE: "余额充值", + }; + return h("div", [h("span", {}, map[params.row.serviceType] || "佣金提成")]); }, }, { title: "详细", - key: "detail", + colKey: "detail", minWidth: 300, tooltip: true, + align: "left", }, ], - data: [], // 表单数据 - total: 0, // 表单数据总数 + data: [], + total: 0, }; }, methods: { - // 初始化数据 init() { this.getDataList(); }, - // 分页 改变页码 changePage(v) { this.searchForm.pageNumber = v; this.getDataList(); }, - // 分页 改变页数 changePageSize(v) { - this.searchForm.pageNumber = 1; this.searchForm.pageSize = v; this.getDataList(); }, - // 搜索 + onPaginationChange(info) { + if (info && typeof info.pageSize !== "undefined" && info.pageSize !== this.searchForm.pageSize) { + this.changePageSize(info.pageSize); + } + if (info && typeof info.current !== "undefined") { + this.changePage(info.current); + } + }, handleSearch() { this.searchForm.pageNumber = 1; this.searchForm.pageSize = 20; this.getDataList(); }, - // 时间段赋值 + handleReset() { + this.searchForm.pageNumber = 1; + this.searchForm.pageSize = 20; + this.searchForm.memberName = ""; + this.searchForm.startDate = ""; + this.searchForm.endDate = ""; + this.selectDate = []; + this.getDataList(); + }, selectDateRange(v) { if (v) { this.searchForm.startDate = v[0]; this.searchForm.endDate = v[1]; } }, - // 获取列表数据 getDataList() { - getUserWallet(this.searchForm).then((res) => { - this.loading = false; - if (res.success) { - this.data = res.result.records; - this.total = res.result.total; - } - }); - this.total = this.data.length; - this.loading = false; + this.loading = true; + getUserWallet(this.searchForm) + .then((res) => { + this.loading = false; + if (res.success) { + this.data = res.result.records; + this.total = res.result.total; + } + }) + .catch(() => { + this.loading = false; + }); }, }, mounted() { diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue index 1f7b6aba..81f4166e 100644 --- a/manager/src/views/member/advance/withdrawApply.vue +++ b/manager/src/views/member/advance/withdrawApply.vue @@ -1,212 +1,169 @@ diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue index d41a987c..393eece5 100644 --- a/manager/src/views/member/list/memberRecycle.vue +++ b/manager/src/views/member/list/memberRecycle.vue @@ -1,158 +1,107 @@ - + diff --git a/manager/src/views/order/after-order/afterSale.vue b/manager/src/views/order/after-order/afterSale.vue index 14ba957d..fd7cf86c 100644 --- a/manager/src/views/order/after-order/afterSale.vue +++ b/manager/src/views/order/after-order/afterSale.vue @@ -1,137 +1,62 @@ diff --git a/manager/src/views/page-decoration/floorList.vue b/manager/src/views/page-decoration/floorList.vue index e1d737ae..75b12435 100644 --- a/manager/src/views/page-decoration/floorList.vue +++ b/manager/src/views/page-decoration/floorList.vue @@ -1,6 +1,6 @@ diff --git a/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue index 0a2ea394..d1295987 100644 --- a/manager/src/views/page-decoration/modelForm.vue +++ b/manager/src/views/page-decoration/modelForm.vue @@ -8,8 +8,8 @@ >
- 编辑
@@ -20,16 +20,15 @@
  • 请登录
  • 我的订单
  • 我的足迹
    • -
  • 购物车
    • +
  • 购物车
  • 店铺入驻
    • - - - + + 搜索
    @@ -40,8 +39,8 @@
    - 编辑
    @@ -66,13 +65,11 @@ -
    @@ -89,35 +86,34 @@ 建议尺寸：{{ topAdvert.size }}
    - 图片链接： + 选择链接
    - 选择图片：选择图片 
    -
    选择背景色：
    +
    选择背景色：
    -     - +
    - 添加分类 @@ -130,41 +126,41 @@ - +
    - - 选择链接  - 删除
    -     + - + - + - + diff --git a/manager/src/views/page/article-manage/template/historyHotWords.vue b/manager/src/views/page/article-manage/template/historyHotWords.vue index 77d0b4d6..5bdeb872 100644 --- a/manager/src/views/page/article-manage/template/historyHotWords.vue +++ b/manager/src/views/page/article-manage/template/historyHotWords.vue @@ -1,25 +1,11 @@