From 799184fd21d255e3c71aad6ad572ecbaf975025d Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Mon, 24 Nov 2025 11:33:54 +0800 Subject: [PATCH] =?UTF-8?q?style(components):=20=E5=B0=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2=E4=B8=BA=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一将页面中的 Button 组件替换为 a 标签，保持样式一致 - 添加统一的链接样式类 ops-link 和分隔符样式类 ops-sep - 更新操作列中按钮的样式，使用颜色、光标和文本装饰属性替代原有 props 配置 - 在多个文件中调整了操作项之间的分隔符显示逻辑 - 优化表格操作列渲染函数，去除冗余的 Button 属性配置 - 保持功能不变的前提下提升界面视觉一致性 --- manager/src/api/index.js | 2 +- .../lili-dialog/template/marketing.vue | 30 ++-- manager/src/views/custom-words/index.vue | 25 +-- .../views/distribution/distributionApply.vue | 30 ++-- .../views/distribution/distributionCash.vue | 80 +++++----- .../views/distribution/distributionGoods.vue | 20 ++- manager/src/views/goods-unit/index.vue | 26 ++-- .../src/views/goods/goods-info/goodsApply.vue | 37 +++-- .../src/views/goods/goods-manage/brand.vue | 50 +++--- .../src/views/goods/goods-manage/category.vue | 57 +++---- manager/src/views/goods/goods-manage/spec.vue | 23 +-- .../src/views/goods/goods-review/index.vue | 55 +++++-- .../views/member/advance/withdrawApply.vue | 88 ++++++----- manager/src/views/member/list/index.vue | 83 ++++++---- .../src/views/member/list/memberDetail.vue | 9 +- .../src/views/member/list/memberRecycle.vue | 142 +++++++----------- .../message-manage/weChatMessageManager.vue | 25 +-- .../src/views/order/after-order/afterSale.vue | 73 ++++----- .../order/after-order/afterSaleOrder.vue | 10 +- .../order/after-order/orderComplaint.vue | 34 ++--- manager/src/views/order/order/orderList.vue | 39 +++-- .../page/article-manage/ArticleCategory.vue | 30 ++-- .../views/page/article-manage/articleList.vue | 40 ++--- manager/src/views/page/feedback/feedback.vue | 23 +-- manager/src/views/privacy-content/index.vue | 22 ++- .../coupon-activity/coupon-publish.vue | 10 +- .../promotions/coupon-activity/coupon.vue | 25 ++- .../src/views/promotions/coupon/coupon.vue | 57 +++---- .../full-discount/full-discount.vue | 18 ++- .../kanjia/kanjia-activity-goods.vue | 22 +-- .../src/views/promotions/pintuan/pintuan.vue | 19 ++- .../points-goods-category.vue | 11 +- .../promotions/points-goods/points-goods.vue | 30 ++-- .../promotions/seckill/seckill-goods.vue | 2 +- .../src/views/promotions/seckill/seckill.vue | 57 +++---- .../seller/bill/accountStatementBill.vue | 22 ++- manager/src/views/seller/bill/bill.vue | 24 ++- manager/src/views/seller/shop/shopList.vue | 91 +++++------ manager/src/views/sensitive-words/index.vue | 29 ++-- manager/src/views/statistics/order.vue | 32 ++-- .../src/views/sys/app-version/appVersion.vue | 43 +++--- .../sys/message/noticeMessageTemplate.vue | 95 +++++------- manager/src/views/sys/message/sms.vue | 79 +++++----- .../src/views/sys/oss-manage/ossManage.vue | 52 ++++--- .../src/views/sys/role-manage/roleManage.vue | 37 +++-- manager/src/views/sys/slider/slider.vue | 23 +-- .../src/views/sys/user-manage/userManage.vue | 46 +++--- .../views/distribution/distributionGoods.vue | 15 +- .../src/views/goods/goods-manage/category.vue | 30 +--- .../goods/goods-seller/alertQuantity.vue | 9 +- .../views/goods/goods-seller/draftGoods.vue | 26 ++-- seller/src/views/member/memberComment.vue | 12 +- seller/src/views/message/message.vue | 68 ++++----- .../order/after-order/orderComplaint.vue | 27 ++-- .../order/after-order/returnGoodsOrder.vue | 12 +- .../order/after-order/returnMoneyOrder.vue | 13 +- seller/src/views/order/order/orderList.vue | 13 +- .../views/order/order/virtualOrderList.vue | 9 +- .../views/order/receiptManager/receipt.vue | 33 ++-- .../views/promotion/coupon/coupon-publish.vue | 13 +- seller/src/views/promotion/coupon/coupon.vue | 47 +++--- .../full-discount/full-discount-add.vue | 7 +- .../promotion/full-discount/full-discount.vue | 13 +- seller/src/views/promotion/live/addLive.vue | 34 ++--- seller/src/views/promotion/live/live.vue | 10 +- seller/src/views/promotion/live/liveGoods.vue | 10 +- .../views/promotion/pintuan/pintuan-goods.vue | 9 +- .../src/views/promotion/pintuan/pintuan.vue | 51 ++----- .../views/promotion/seckill/seckill-goods.vue | 9 +- .../src/views/promotion/seckill/seckill.vue | 4 +- .../views/shop/bill/accountStatementBill.vue | 13 +- seller/src/views/shop/bill/storeBill.vue | 13 +- seller/src/views/shop/floorList.vue | 22 ++- seller/src/views/shop/ossManage.vue | 64 +++++--- seller/src/views/shop/ossManages.vue | 137 +++++++++-------- seller/src/views/shop/ship/logistics.vue | 30 ++-- seller/src/views/shop/ship/shipTemplate.vue | 32 +++- seller/src/views/shop/shopAddress.vue | 23 ++- .../views/shop/system/clerk/clerkManage.vue | 58 ++++--- .../shop/system/role/storeRoleManage.vue | 31 ++-- seller/src/views/shop/wap/wapList.vue | 8 +- seller/src/views/sys/oss-manage/ossManage.vue | 66 +++++--- 82 files changed, 1454 insertions(+), 1394 deletions(-) diff --git a/manager/src/api/index.js b/manager/src/api/index.js index cb583bdd..c682b086 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -111,7 +111,7 @@ export const changeMobile = (params) => { }; // 获取用户数据 多条件 export const getUserListData = (params) => { - return getRequest("/passport/user", params); + return getRequest("/passport/user/getByCondition", params); }; // 通过用户名搜索 export const searchUserByName = (username, params) => { diff --git a/manager/src/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue index 4d3bb3f0..95c95056 100644 --- a/manager/src/components/lili-dialog/template/marketing.vue +++ b/manager/src/components/lili-dialog/template/marketing.vue @@ -101,12 +101,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - // type: this.index == params.index ? "primary" : "", - type: 'default', - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -194,12 +194,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - // type: this.index == params.index ? "primary" : "", - type: 'default', - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -246,12 +246,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - // type: this.index == params.index ? "primary" : "", - type: 'default', - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/custom-words/index.vue b/manager/src/views/custom-words/index.vue index 6a0211cf..b144892c 100644 --- a/manager/src/views/custom-words/index.vue +++ b/manager/src/views/custom-words/index.vue @@ -124,14 +124,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -142,14 +140,17 @@ export default { "修改" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/distribution/distributionApply.vue b/manager/src/views/distribution/distributionApply.vue index 9314a731..b7f7a170 100644 --- a/manager/src/views/distribution/distributionApply.vue +++ b/manager/src/views/distribution/distributionApply.vue @@ -115,17 +115,10 @@ export default { fixed: "right", width: 200, render: (h, params) => { - return h("div", [ + return h("div", { class: "ops" }, [ h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, - style: { - marginRight: "5px", - }, on: { click: () => { this.audit(params.row, "PASS"); @@ -134,13 +127,10 @@ export default { }, "通过" ), + h("span", {}, "|"), h( - "Button", + "a", { - props: { - type: "error", - size: "small", - }, on: { click: () => { this.audit(params.row, "REFUSE"); @@ -224,3 +214,15 @@ export default { }, }; + diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue index b0449cdc..8e5d79d5 100644 --- a/manager/src/views/distribution/distributionCash.vue +++ b/manager/src/views/distribution/distributionCash.vue @@ -160,50 +160,34 @@ export default { fixed: "right", width: 130, render: (h, params) => { - if(params.row.distributionCashStatus != 'APPLY'){ - return h("div", [ - h( - "Button", - { - props: { - type: "primary", - size: "small", - }, - style: { - marginRight: "5px" - }, - on: { - click: () => { - this.view(params.row); - } + if (params.row.distributionCashStatus != 'APPLY') { + return h("div", { class: "ops" }, [ + h( + "a", + { + on: { + click: () => { + this.view(params.row); } - }, - "查看" - ), - - ]); - }else { - return h("div", [ - h( - "Button", - { - props: { - type: "primary", - size: "small", - }, - style: { - marginRight: "5px" - }, - on: { - click: () => { - this.edit(params.row); - } + } + }, + "查看" + ), + ]); + } else { + return h("div", { class: "ops" }, [ + h( + "a", + { + on: { + click: () => { + this.edit(params.row); } - }, - "审核" - ), - - ]); + } + }, + "审核" + ), + ]); } } } @@ -312,3 +296,15 @@ export default { } }; + diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue index 4c1947dc..b4b515b7 100644 --- a/manager/src/views/distribution/distributionGoods.vue +++ b/manager/src/views/distribution/distributionGoods.vue @@ -137,14 +137,10 @@ export default { fixed: "right", minWidth: 100, render: (h, params) => { - return h("div", [ + return h("div", { class: "ops" }, [ h( - "Button", + "a", { - props: { - type: "error", - size: "small", - }, on: { click: () => { this.remove(params.row); @@ -256,5 +252,17 @@ export default { }, }; + diff --git a/manager/src/views/goods-unit/index.vue b/manager/src/views/goods-unit/index.vue index 8a8dbd66..7c493f14 100644 --- a/manager/src/views/goods-unit/index.vue +++ b/manager/src/views/goods-unit/index.vue @@ -121,18 +121,17 @@ export default { title: "操作", key: "action", align: "center", + fixed: "right", width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -143,14 +142,17 @@ export default { "修改" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue index 22fbb514..4e4ef945 100644 --- a/manager/src/views/goods/goods-info/goodsApply.vue +++ b/manager/src/views/goods/goods-info/goodsApply.vue @@ -171,13 +171,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -189,13 +188,17 @@ export default { "通过" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -207,11 +210,17 @@ export default { "拒绝" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: 'default', - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none" }, on: { click: () => { diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue index 03f77058..1c1ee037 100644 --- a/manager/src/views/goods/goods-manage/brand.vue +++ b/manager/src/views/goods/goods-manage/brand.vue @@ -153,13 +153,12 @@ export default { let enableOrDisable = ""; if (params.row.deleteFlag == 0) { enableOrDisable = h( - "Button", + "a", { - props: { - size: "small", - type: "error", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -172,13 +171,12 @@ export default { ); } else { enableOrDisable = h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -192,13 +190,12 @@ export default { } return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -209,17 +206,24 @@ export default { }, "编辑" ), - enableOrDisable, - h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + enableOrDisable, + h( + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: 'default', - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue index 42b43a69..f8e94911 100644 --- a/manager/src/views/goods/goods-manage/category.vue +++ b/manager/src/views/goods/goods-manage/category.vue @@ -15,54 +15,31 @@ > diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue index 8f280483..49324eff 100644 --- a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue +++ b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue @@ -98,28 +98,18 @@
{{ row.stock }}
diff --git a/manager/src/views/promotions/pintuan/pintuan.vue b/manager/src/views/promotions/pintuan/pintuan.vue index eacc4553..483cadd6 100644 --- a/manager/src/views/promotions/pintuan/pintuan.vue +++ b/manager/src/views/promotions/pintuan/pintuan.vue @@ -52,16 +52,19 @@ class="mt_10" > diff --git a/manager/src/views/promotions/points-goods-category/points-goods-category.vue b/manager/src/views/promotions/points-goods-category/points-goods-category.vue index b11b3e64..a4309fa8 100644 --- a/manager/src/views/promotions/points-goods-category/points-goods-category.vue +++ b/manager/src/views/promotions/points-goods-category/points-goods-category.vue @@ -18,8 +18,15 @@ primary-key="id" > diff --git a/manager/src/views/promotions/points-goods/points-goods.vue b/manager/src/views/promotions/points-goods/points-goods.vue index be70e2f3..ebc4a1c6 100644 --- a/manager/src/views/promotions/points-goods/points-goods.vue +++ b/manager/src/views/promotions/points-goods/points-goods.vue @@ -110,30 +110,20 @@
{{ row.endTime }}
diff --git a/manager/src/views/promotions/seckill/seckill-goods.vue b/manager/src/views/promotions/seckill/seckill-goods.vue index 5873bce7..ce2618ce 100644 --- a/manager/src/views/promotions/seckill/seckill-goods.vue +++ b/manager/src/views/promotions/seckill/seckill-goods.vue @@ -46,7 +46,7 @@ /> diff --git a/manager/src/views/promotions/seckill/seckill.vue b/manager/src/views/promotions/seckill/seckill.vue index b2a1ab66..6eb4cb27 100644 --- a/manager/src/views/promotions/seckill/seckill.vue +++ b/manager/src/views/promotions/seckill/seckill.vue @@ -64,45 +64,34 @@ class="mt_10" > diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue index 4499c10a..dc169a28 100644 --- a/manager/src/views/seller/bill/accountStatementBill.vue +++ b/manager/src/views/seller/bill/accountStatementBill.vue @@ -110,16 +110,14 @@ export default { fixed: "right", width: 120, render: (h, params) => { - return h("div", [ + return h("div", { class: "ops" }, [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -216,4 +214,14 @@ export default { ::v-deep .ivu-col { min-height: 100vh; } +.ops a { + color: #2d8cf0; + cursor: pointer; + text-decoration: none; +} +.ops span { + display: inline-block; + margin: 0 8px; + color: #dcdee2; +} diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue index a32c3347..fd4336df 100644 --- a/manager/src/views/seller/bill/bill.vue +++ b/manager/src/views/seller/bill/bill.vue @@ -121,16 +121,14 @@ export default { fixed: "right", width: 120, render: (h, params) => { - return h("div", [ + return h("div", { class: "ops" }, [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -254,3 +252,15 @@ export default { }, }; + diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue index 378666e1..f1683549 100644 --- a/manager/src/views/seller/shop/shopList.vue +++ b/manager/src/views/seller/shop/shopList.vue @@ -152,14 +152,12 @@ export default { let enableOrDisable = ""; if (params.row.storeDisable == "OPEN") { enableOrDisable = h( - "Button", + "a", { - props: { - size: "small", - type: "error" - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -171,14 +169,12 @@ export default { ); } else if (params.row.storeDisable == "CLOSED") { enableOrDisable = h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -191,14 +187,12 @@ export default { } else if (params.row.storeDisable == "APPLYING") { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -209,14 +203,17 @@ export default { "审核" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "primary", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -231,14 +228,12 @@ export default { return h("div", [ h( - "Button", + "a", { - props: { - type:"default", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", display: this.selectedShop ? "inline-block" : "none", }, on: { @@ -250,14 +245,17 @@ export default { "选择" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2", display: this.selectedShop ? "inline-block" : "none" } }, + "|" + ), + h( + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -268,15 +266,17 @@ export default { "查看" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "info", - size: "small", - ghost:true - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -286,6 +286,11 @@ export default { }, "修改" ), + h( + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), enableOrDisable, ]); }, diff --git a/manager/src/views/sensitive-words/index.vue b/manager/src/views/sensitive-words/index.vue index 62c78790..cc77efff 100644 --- a/manager/src/views/sensitive-words/index.vue +++ b/manager/src/views/sensitive-words/index.vue @@ -123,13 +123,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -141,14 +140,22 @@ export default { "修改" ), h( - "Button", + "span", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + margin: "0 8px", + color: "#dcdee2", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 50a0dde4..807a204f 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -302,20 +302,26 @@ export default { title: "操作", key: "action", render: (h, params) => { - return h('Button',{ - props:{ - size:'small' - }, - on:{ - click: () => { - const { sn } = params.row - this.$router.push({ - query: {sn}, - path: this.orderOrRefund == 1 ? 'order-detail' : 'after-order-detail' + '?sn='+sn - }) + return h( + 'a', + { + style: { + color: '#2d8cf0', + cursor: 'pointer', + textDecoration: 'none' + }, + on: { + click: () => { + const { sn } = params.row + this.$router.push({ + query: { sn }, + path: this.orderOrRefund == 1 ? 'order-detail' : 'after-order-detail' + '?sn=' + sn + }) + } } - } - },'查看') + }, + '查看' + ) }, }, ], diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue index 04e527d7..509888cc 100644 --- a/manager/src/views/sys/app-version/appVersion.vue +++ b/manager/src/views/sys/app-version/appVersion.vue @@ -213,18 +213,17 @@ export default { title: "操作", key: "action", align: "center", + fixed: "right", width: 230, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -235,16 +234,17 @@ export default { "查看" ), h( - "Button", - + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "info", - size: "small", - ghost: true, - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -255,14 +255,17 @@ export default { "修改" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue index 5287482f..7d655669 100644 --- a/manager/src/views/sys/message/noticeMessageTemplate.vue +++ b/manager/src/views/sys/message/noticeMessageTemplate.vue @@ -411,14 +411,8 @@ let enableOrDisable = ""; if (params.row.noticeStatus == "OPEN") { enableOrDisable = h( - "Button", + "a", { - props: { - size: "small" - }, - style: { - marginRight: "5px" - }, on: { click: () => { this.disable(params.row); @@ -429,15 +423,8 @@ ); } else { enableOrDisable = h( - "Button", + "a", { - props: { - type: "success", - size: "small" - }, - style: { - marginRight: "5px" - }, on: { click: () => { this.enable(params.row); @@ -447,18 +434,16 @@ "开启" ); } - return h("div", [ + return h("div", { class: "ops" }, [ enableOrDisable, h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "primary", - size: "small" - }, - style: { - marginRight: "5px" - }, on: { click: () => { this.edit(params.row); @@ -491,22 +476,19 @@ minWidth: 50, align: "center", render: (h, params) => { - return h( - "Button", - { - props: { - size: "small", - type: "error", - ghost: true, - }, - on: { - click: () => { - this.delUser(params.index); + return h("div", { class: "ops" }, [ + h( + "a", + { + on: { + click: () => { + this.delUser(params.index); + }, }, }, - }, - "删除" - ); + "删除" + ) + ]); }, }, ], @@ -574,17 +556,10 @@ fixed: "right", width: 140, render: (h, params) => { - return h("div", [ + return h("div", { class: "ops" }, [ h( - "Button", + "a", { - props: { - type: "info", - size: "small" - }, - style: { - marginRight: "5px" - }, on: { click: () => { this.detail(params.row); @@ -594,15 +569,13 @@ "详细" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small" - }, - style: { - marginRight: "5px" - }, on: { click: () => { this.delete(params.row.id); @@ -1025,3 +998,15 @@ + diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue index 85b029b6..0c3471c8 100644 --- a/manager/src/views/sys/message/sms.vue +++ b/manager/src/views/sys/message/sms.vue @@ -279,18 +279,17 @@ export default { title: "操作", key: "action", align: "center", + fixed: "right", width: 150, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "primary", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -343,20 +342,16 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small" - }, style: { - marginRight: "5px", - }, - attrs: { - disabled: params.row.templateStatus == 2 ? false : true, + color: params.row.templateStatus == 2 ? "#2d8cf0" : "#c5c8ce", + cursor: params.row.templateStatus == 2 ? "pointer" : "not-allowed", + textDecoration: "none", }, on: { click: () => { + if (params.row.templateStatus != 2) return; this.editTemplate(params.row); }, }, @@ -364,20 +359,21 @@ export default { "编辑" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", - }, - attrs: { - disabled: params.row.templateStatus == 0 ? true : false, + color: params.row.templateStatus == 0 ? "#c5c8ce" : "#2d8cf0", + cursor: params.row.templateStatus == 0 ? "not-allowed" : "pointer", + textDecoration: "none", }, on: { click: () => { + if (params.row.templateStatus == 0) return; this.deleteSmsTemplate(params.row); }, }, @@ -415,21 +411,16 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - icon: "ios-create-outline", - }, - attrs: { - disabled: params.row.signStatus == 2 ? false : true, - }, style: { - marginRight: "5px", + color: params.row.signStatus == 2 ? "#2d8cf0" : "#c5c8ce", + cursor: params.row.signStatus == 2 ? "pointer" : "not-allowed", + textDecoration: "none", }, on: { click: () => { + if (params.row.signStatus != 2) return; this.editSign(params.row); }, }, @@ -437,21 +428,21 @@ export default { "编辑" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - icon: "ios-create-outline", - }, - attrs: { - disabled: params.row.signStatus == 0 ? true : false, - }, style: { - marginRight: "5px", + color: params.row.signStatus == 0 ? "#c5c8ce" : "#2d8cf0", + cursor: params.row.signStatus == 0 ? "not-allowed" : "pointer", + textDecoration: "none", }, on: { click: () => { + if (params.row.signStatus == 0) return; this.deleteSmsSign(params.row); }, }, diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index 78499005..ec48b525 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -635,16 +635,14 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", + display: this.selectImage === true ? "inline-block" : "none", }, on: { click: () => { @@ -655,13 +653,23 @@ export default { "选择" ), h( - "Button", + "span", { - props: { - type: "info", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage === true ? "inline-block" : "none", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", display: this.selectImage == true ? "none" : "inline-block", }, @@ -674,13 +682,23 @@ export default { "下载" ), h( - "Button", + "span", { - props: { - type: "error", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage == true ? "none" : "inline-block", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", display: this.selectImage == true ? "none" : "inline-block", }, on: { diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue index 2209e248..2a6a641c 100644 --- a/manager/src/views/sys/role-manage/roleManage.vue +++ b/manager/src/views/sys/role-manage/roleManage.vue @@ -165,13 +165,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "warning", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -183,13 +182,17 @@ export default { "菜单权限" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - size: "small", - type: "info", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -201,11 +204,17 @@ export default { "编辑" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/sys/slider/slider.vue b/manager/src/views/sys/slider/slider.vue index 0baaf57d..e249c8cf 100644 --- a/manager/src/views/sys/slider/slider.vue +++ b/manager/src/views/sys/slider/slider.vue @@ -196,13 +196,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -214,11 +213,17 @@ export default { "编辑" ), h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue index 13869c38..30f2af4c 100644 --- a/manager/src/views/sys/user-manage/userManage.vue +++ b/manager/src/views/sys/user-manage/userManage.vue @@ -266,13 +266,12 @@ export default { let enableOrDisable = ""; if (params.row.status == true) { enableOrDisable = h( - "Button", + "a", { - props: { - type: 'default', - size: "small" - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px" }, on: { @@ -285,13 +284,12 @@ export default { ); } else { enableOrDisable = h( - "Button", + "a", { - props: { - type: "success", - size: "small" - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px" }, on: { @@ -305,13 +303,12 @@ export default { } return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small" - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px" }, on: { @@ -322,13 +319,24 @@ export default { }, "编辑" ), + h( + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), enableOrDisable, h( - "Button", + "span", + { style: { margin: "0 8px", color: "#dcdee2" } }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none" }, on: { click: () => { diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue index 1aa15204..f4990787 100644 --- a/seller/src/views/distribution/distributionGoods.vue +++ b/seller/src/views/distribution/distributionGoods.vue @@ -153,20 +153,21 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "error", - size: "small" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { this.remove(params.row); - } - } + }, + }, }, "删除" - ) + ), ]); } } diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue index 620a054e..323c66de 100644 --- a/seller/src/views/goods/goods-manage/category.vue +++ b/seller/src/views/goods/goods-manage/category.vue @@ -7,7 +7,7 @@ diff --git a/seller/src/views/goods/goods-seller/alertQuantity.vue b/seller/src/views/goods/goods-seller/alertQuantity.vue index 708d8ff3..753d4331 100644 --- a/seller/src/views/goods/goods-seller/alertQuantity.vue +++ b/seller/src/views/goods/goods-seller/alertQuantity.vue @@ -306,13 +306,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue index 81340100..d0c84591 100644 --- a/seller/src/views/goods/goods-seller/draftGoods.vue +++ b/seller/src/views/goods/goods-seller/draftGoods.vue @@ -104,13 +104,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { @@ -122,14 +121,19 @@ export default { "编辑" ), h( - "Button", + "span", + { + style: { margin: "0 8px", color: "#dcdee2" }, + }, + "|" + ), + h( + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue index 054c2d59..981134fd 100644 --- a/seller/src/views/member/memberComment.vue +++ b/seller/src/views/member/memberComment.vue @@ -169,18 +169,16 @@ export default { key: "action", align: "center", fixed: 'right', - width: 120, + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/message/message.vue b/seller/src/views/message/message.vue index 12644441..92592bd0 100644 --- a/seller/src/views/message/message.vue +++ b/seller/src/views/message/message.vue @@ -79,7 +79,7 @@   {{ mes.time }}

-

{{ mes.content }}

+

@@ -95,15 +95,15 @@ data() { const markAsReadBtn = (h, params) => { return h( - "Button", + "a", { - props: { - icon: "md-eye-off", - size: "small" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { - // 标记已读 let v = params.row; this.loading = true; API_Index.read(v.id).then(res => { @@ -112,87 +112,82 @@ this.getAll(); } }); - } - } + }, + }, }, "标为已读" ); }; const deleteMesBtn = (h, params) => { return h( - "Button", + "a", { - props: { - icon: "md-trash", - size: "small", - type: "error" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { - // 移除 let v = params.row; this.loading = true; API_Index.deleteMessage(v.id).then(res => { this.loading = false; if (res.success) { - this.refreshMessage() + this.refreshMessage(); } }); - } - } + }, + }, }, "删除" ); }; const restoreBtn = (h, params) => { return h( - "Button", + "a", { - props: { - icon: "md-redo", - size: "small" - }, style: { - margin: "0 5px 0 0" + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { - // 还原 let v = params.row; API_Index.reductionMessage(v.id).then(res => { this.loading = false; if (res.success) { - this.refreshMessage() + this.refreshMessage(); } }); - } - } + }, + }, }, "还原" ); }; const deleteRealBtn = (h, params) => { return h( - "Button", + "a", { - props: { - icon: "md-trash", - size: "small", - type: "error" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { - // 彻底删除 let v = params.row; this.loading = true; API_Index.clearMessage(v.id).then(res => { this.loading = false; if (res.success) { - this.refreshMessage() + this.refreshMessage(); } }); - } - } + }, + }, }, "彻底删除" ); @@ -287,6 +282,7 @@ } else { return h("div", [ restoreBtn(h, params), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), deleteRealBtn(h, params) ]); } diff --git a/seller/src/views/order/after-order/orderComplaint.vue b/seller/src/views/order/after-order/orderComplaint.vue index 4aed8e6a..c2f1234e 100644 --- a/seller/src/views/order/after-order/orderComplaint.vue +++ b/seller/src/views/order/after-order/orderComplaint.vue @@ -141,19 +141,18 @@ title: "操作", key: "action", align: "center", - width: 120, + fixed: 'right', + width: 200, render: (h, params) => { - if(params.row.complainStatus === "COMPLETE"){ + if (params.row.complainStatus === "COMPLETE") { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small" - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -164,17 +163,15 @@ "详情" ), ]); - }else{ + } else { return h("div", [ h( - "Button", + "a", { - props: { - type: "primary", - size: "small" - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index bb01ce8d..ea1d5b1c 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -195,18 +195,16 @@ key: "action", align: "center", fixed: 'right', - width: 120, + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index c6020881..c5aced1d 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -184,18 +184,17 @@ title: "操作", key: "action", align: "center", - width: 100, + fixed: 'right', + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 7a4f3c0f..fcee8ed2 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -302,18 +302,17 @@ export default { title: "操作", key: "action", align: "center", - width: 100, + fixed: "right", + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue index 9c6ff559..1df579d5 100644 --- a/seller/src/views/order/order/virtualOrderList.vue +++ b/seller/src/views/order/order/virtualOrderList.vue @@ -153,13 +153,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", }, on: { diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index 9ff6ba92..89517513 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -159,33 +159,20 @@ export default { title: "操作", key: "action", align: "center", - width: 80, + fixed: 'right', + width: 200, render: (h, params) => { + const disabled = !(((params.row.orderStatus === "COMPLETED" || params.row.orderStatus === "DELIVERED")) && params.row.receiptStatus === 0); + const style = disabled + ? { color: "#c5c8ce", cursor: "not-allowed", textDecoration: "none" } + : { color: "#2d8cf0", cursor: "pointer", textDecoration: "none" }; + const on = disabled ? {} : { click: () => { this.invoicing(params.row); } }; return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, - attrs: { - disabled: - !( - (params.row.orderStatus === "COMPLETED" - ||params.row.orderStatus === "DELIVERED") - - && - params.row.receiptStatus === 0), - }, - style: { - marginRight: "5px", - }, - on: { - click: () => { - this.invoicing(params.row); - }, - }, + style, + on, }, "开票" ), diff --git a/seller/src/views/promotion/coupon/coupon-publish.vue b/seller/src/views/promotion/coupon/coupon-publish.vue index d6a6e861..37cb4ced 100644 --- a/seller/src/views/promotion/coupon/coupon-publish.vue +++ b/seller/src/views/promotion/coupon/coupon-publish.vue @@ -314,13 +314,16 @@ export default { minWidth: 50, align: "center", render: (h, params) => { + if (this.disabled) { + return h("div"); + } return h( - "Button", + "a", { - props: { - size: "small", - type: "error", - ghost: true, + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue index 24b482ff..d7cbb4ec 100644 --- a/seller/src/views/promotion/coupon/coupon.vue +++ b/seller/src/views/promotion/coupon/coupon.vue @@ -67,35 +67,30 @@ @on-selection-change="changeSelect" > diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue index 9e29b98e..eca7ea1b 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -91,8 +91,11 @@ diff --git a/seller/src/views/promotion/full-discount/full-discount.vue b/seller/src/views/promotion/full-discount/full-discount.vue index 49ac742e..8faf3759 100644 --- a/seller/src/views/promotion/full-discount/full-discount.vue +++ b/seller/src/views/promotion/full-discount/full-discount.vue @@ -39,14 +39,11 @@ diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 196fb69a..e995edac 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -114,29 +114,23 @@ diff --git a/seller/src/views/promotion/live/live.vue b/seller/src/views/promotion/live/live.vue index 96cff256..10bd7aa4 100644 --- a/seller/src/views/promotion/live/live.vue +++ b/seller/src/views/promotion/live/live.vue @@ -122,14 +122,12 @@ export default { }, [ h( - "Button", + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue index ed9f1d9a..1bc5b22c 100644 --- a/seller/src/views/promotion/live/liveGoods.vue +++ b/seller/src/views/promotion/live/liveGoods.vue @@ -62,10 +62,12 @@ - diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue index 1997a849..cdb97195 100644 --- a/seller/src/views/promotion/pintuan/pintuan.vue +++ b/seller/src/views/promotion/pintuan/pintuan.vue @@ -58,48 +58,15 @@
diff --git a/seller/src/views/promotion/seckill/seckill-goods.vue b/seller/src/views/promotion/seckill/seckill-goods.vue index d626fbc0..f3c437fd 100644 --- a/seller/src/views/promotion/seckill/seckill-goods.vue +++ b/seller/src/views/promotion/seckill/seckill-goods.vue @@ -95,14 +95,11 @@ /> diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue index 60e0ecfd..5e1c5ff2 100644 --- a/seller/src/views/promotion/seckill/seckill.vue +++ b/seller/src/views/promotion/seckill/seckill.vue @@ -32,8 +32,8 @@ }} diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue index fbb4280d..11f6c182 100644 --- a/seller/src/views/shop/bill/accountStatementBill.vue +++ b/seller/src/views/shop/bill/accountStatementBill.vue @@ -131,18 +131,17 @@ title: "操作", key: "action", align: "center", - width: 120, + fixed: 'right', + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue index 2ccc0b39..045cb94a 100644 --- a/seller/src/views/shop/bill/storeBill.vue +++ b/seller/src/views/shop/bill/storeBill.vue @@ -135,18 +135,17 @@ title: "操作", key: "action", align: "center", - width: 120, + fixed: 'right', + width: 200, render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/shop/floorList.vue b/seller/src/views/shop/floorList.vue index a54ca033..855602e4 100644 --- a/seller/src/views/shop/floorList.vue +++ b/seller/src/views/shop/floorList.vue @@ -32,22 +32,18 @@ 开 关 - - + >装修 + | - + 删除 diff --git a/seller/src/views/shop/ossManage.vue b/seller/src/views/shop/ossManage.vue index ab8cf15f..16ac50f2 100644 --- a/seller/src/views/shop/ossManage.vue +++ b/seller/src/views/shop/ossManage.vue @@ -625,16 +625,14 @@ render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", + display: this.selectImage === true ? "inline-block" : "none", }, on: { click: () => { @@ -645,13 +643,23 @@ "选择" ), h( - "Button", + "span", { - props: { - type: "info", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage === true ? "inline-block" : "none", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", display: this.selectImage == true ? "none" : "inline-block", }, @@ -664,13 +672,23 @@ "下载" ), h( - "Button", + "span", { - props: { - type: "error", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage == true ? "none" : "inline-block", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", display: this.selectImage == true ? "none" : "inline-block", }, on: { @@ -789,16 +807,14 @@ render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", + display: this.selectImage === true ? "inline-block" : "none", }, on: { click: () => { diff --git a/seller/src/views/shop/ossManages.vue b/seller/src/views/shop/ossManages.vue index 58ce1a48..3aab58bc 100644 --- a/seller/src/views/shop/ossManages.vue +++ b/seller/src/views/shop/ossManages.vue @@ -416,67 +416,85 @@ align: "center", fixed: "right", // width: 300, - render: (h, params) => { - return h("div", [ - h( - "Button", - { - props: { - type: "default", - size: "small", - }, - style: { - marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", - }, - on: { - click: () => { - this.selectedParams(params.row); - }, + render: (h, params) => { + return h("div", [ + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", + marginRight: "5px", + display: this.selectImage === true ? "inline-block" : "none", + }, + on: { + click: () => { + this.selectedParams(params.row); }, }, - "选择" - ), - h( - "Button", - { - props: { - type: "info", - size: "small", - }, - style: { - marginRight: "5px", - display: this.selectImage == true ? "none" : "inline-block", - }, - on: { - click: () => { - this.download(params.row); - }, + }, + "选择" + ), + h( + "span", + { + style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage === true ? "inline-block" : "none", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", + marginRight: "5px", + display: this.selectImage == true ? "none" : "inline-block", + }, + on: { + click: () => { + this.download(params.row); }, }, - "下载" - ), - h( - "Button", - { - props: { - type: "error", - size: "small", - }, - style: { - display: this.selectImage == true ? "none" : "inline-block", - }, - on: { - click: () => { - this.remove(params.row); - }, + }, + "下载" + ), + h( + "span", + { + style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage == true ? "none" : "inline-block", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", + display: this.selectImage == true ? "none" : "inline-block", + }, + on: { + click: () => { + this.remove(params.row); }, }, - "删除" - ), - ]); - }, + }, + "删除" + ), + ]); + }, }, ], viewColumns: [ @@ -583,13 +601,12 @@ render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", display: this.selectImage === true ? "inline-block" : "none", diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue index a93dc88e..01502085 100644 --- a/seller/src/views/shop/ship/logistics.vue +++ b/seller/src/views/shop/ship/logistics.vue @@ -119,14 +119,12 @@ export default { if (!params.row.selected) { return h("div", [ h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -140,14 +138,12 @@ export default { } else { return h("div", [ h( - "Button", + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -157,12 +153,14 @@ export default { }, "关闭" ), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), h( - "Button", + "a", { - props: { - type: "info", - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index ff6f556d..b9450ebe 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -20,8 +20,15 @@ - - + 修改 + | + 删除 @@ -113,12 +120,14 @@ - - + 修改 + 删除 @@ -630,4 +639,11 @@ em { .baoyou { margin: 6px 10px 0; } +/* 操作链接与分隔符不加粗 */ +.order tbody tr th .fr a { + font-weight: normal; +} +.order tbody tr th .fr span { + font-weight: normal; +} diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue index ce118b13..1f104cc7 100644 --- a/seller/src/views/shop/shopAddress.vue +++ b/seller/src/views/shop/shopAddress.vue @@ -155,14 +155,12 @@ render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "success", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -172,15 +170,14 @@ }, "修改" ), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), h( - "Button", + "a", { - props: { - type: "error", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -189,7 +186,7 @@ }, }, "删除" - ) + ), ]); }, }, diff --git a/seller/src/views/shop/system/clerk/clerkManage.vue b/seller/src/views/shop/system/clerk/clerkManage.vue index 55e6e83e..e507c897 100644 --- a/seller/src/views/shop/system/clerk/clerkManage.vue +++ b/seller/src/views/shop/system/clerk/clerkManage.vue @@ -367,77 +367,75 @@ export default { let enableOrDisable = ""; if (params.row.status == true) { enableOrDisable = h( - "Button", + "a", { - props: { - size: "small" - }, style: { - marginRight: "5px" + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { this.disable(params.row); - } - } + }, + }, }, "禁用" ); } else { enableOrDisable = h( - "Button", + "a", { - props: { - type: "success", - size: "small" - }, style: { - marginRight: "5px" + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { this.enable(params.row); - } - } + }, + }, }, "启用" ); } return h("div", [ h( - "Button", + "a", { - props: { - type: "info", - size: "small" - }, style: { - marginRight: "5px" + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { this.edit(params.row); - } - } + }, + }, }, "编辑" ), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), enableOrDisable, + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), h( - "Button", + "a", { - props: { - type: "error", - size: "small" + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { this.remove(params.row); - } - } + }, + }, }, "删除" - ) + ), ]); } } diff --git a/seller/src/views/shop/system/role/storeRoleManage.vue b/seller/src/views/shop/system/role/storeRoleManage.vue index 32bbcd6c..02e1e1df 100644 --- a/seller/src/views/shop/system/role/storeRoleManage.vue +++ b/seller/src/views/shop/system/role/storeRoleManage.vue @@ -166,14 +166,12 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "warning", - size: "small", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -183,15 +181,14 @@ export default { }, "菜单权限" ), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), h( - "Button", + "a", { - props: { - size: "small", - type: "info", - }, style: { - marginRight: "5px", + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { @@ -201,12 +198,14 @@ export default { }, "编辑" ), + h("span", { style: { margin: "0 8px", color: "#dcdee2" } }, "|"), h( - "Button", + "a", { - props: { - type: "error", - size: "small", + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", }, on: { click: () => { diff --git a/seller/src/views/shop/wap/wapList.vue b/seller/src/views/shop/wap/wapList.vue index 5b50e711..2923ba32 100644 --- a/seller/src/views/shop/wap/wapList.vue +++ b/seller/src/views/shop/wap/wapList.vue @@ -20,9 +20,13 @@ 开 关 - + 修改 + | - + 删除 diff --git a/seller/src/views/sys/oss-manage/ossManage.vue b/seller/src/views/sys/oss-manage/ossManage.vue index 3bf50005..aaaf9ac1 100644 --- a/seller/src/views/sys/oss-manage/ossManage.vue +++ b/seller/src/views/sys/oss-manage/ossManage.vue @@ -475,16 +475,14 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", + display: this.selectImage === true ? "inline-block" : "none", }, on: { click: () => { @@ -495,13 +493,23 @@ export default { "选择" ), h( - "Button", + "span", { - props: { - type: "info", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage === true ? "inline-block" : "none", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", display: this.selectImage == true ? "none" : "inline-block", }, @@ -514,13 +522,23 @@ export default { "下载" ), h( - "Button", + "span", { - props: { - type: "error", - size: "small", - }, style: { + margin: "0 8px", + color: "#dcdee2", + display: this.selectImage == true ? "none" : "inline-block", + }, + }, + "|" + ), + h( + "a", + { + style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", display: this.selectImage == true ? "none" : "inline-block", }, on: { @@ -639,16 +657,14 @@ export default { render: (h, params) => { return h("div", [ h( - "Button", + "a", { - props: { - type: "default", - size: "small", - }, style: { + color: "#2d8cf0", + cursor: "pointer", + textDecoration: "none", marginRight: "5px", - display: - this.selectImage === true ? "inline-block" : "none", + display: this.selectImage === true ? "inline-block" : "none", }, on: { click: () => { @@ -657,7 +673,7 @@ export default { }, }, "选择" - ) + ), ]); }, },