From bf70527c58e728224e9f29b169cce17c8144220a Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Mon, 3 Jul 2023 16:28:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E6=96=87=E4=BB=B6=E6=8F=92=E4=BB=B6=E5=B9=B6=E5=9C=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E5=BC=95=E5=85=A5,=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81=E9=9C=80=E8=A6=81install=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/bill/bill-detail.vue | 6 ++---- manager/src/views/seller/shop/shopDetail.vue | 5 +++-- seller/package.json | 1 + seller/src/config/index.js | 7 ++++++- seller/src/main.js | 6 +++++- seller/src/views/distribution/distributionGoods.vue | 2 +- seller/src/views/goods/goods-seller/draftGoods.vue | 5 +---- seller/src/views/goods/goods-seller/goods.vue | 2 +- .../order/after-order/orderComplaintDetail.vue | 2 +- .../views/order/after-order/returnGoodsOrder.vue | 6 ++---- .../views/order/after-order/returnMoneyOrder.vue | 7 ++----- .../order/after-order/reurnGoodsOrderDetail.vue | 8 ++++++-- seller/src/views/order/order/orderList.vue | 5 +---- seller/src/views/order/order/virtualOrderList.vue | 7 +++---- seller/src/views/order/receiptManager/receipt.vue | 5 +---- .../src/views/promotion/coupon/coupon-publish.vue | 2 +- .../src/views/promotion/coupon/coupon-receive.vue | 5 +---- seller/src/views/promotion/coupon/coupon.vue | 5 +---- .../promotion/full-discount/full-discount-add.vue | 5 +---- seller/src/views/promotion/live/liveGoods.vue | 11 ++++++++--- seller/src/views/shop/bill/accountStatementBill.vue | 7 ++----- seller/src/views/shop/bill/billDetail.vue | 13 ++----------- seller/src/views/shop/bill/storeBill.vue | 6 ++---- seller/src/views/statistics/goods.vue | 5 +---- seller/src/views/statistics/order.vue | 11 +++-------- seller/src/views/statistics/order/refundOrder.vue | 4 +++- 26 files changed, 61 insertions(+), 87 deletions(-) diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index 0fd8f337..a35702ec 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -235,11 +235,9 @@ export default { key: "finalPrice", width: 120, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.finalPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.finalPrice,color:this.$mainColor}} ); }, + }, { title: "平台分佣", diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 42c316c6..195159e8 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -602,8 +602,9 @@ key: "flowPrice", width: 140, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.flowPrice, '￥')); - } + return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} ); + }, + }, { title: "订单类型", diff --git a/seller/package.json b/seller/package.json index 6f263749..1931b8a3 100644 --- a/seller/package.json +++ b/seller/package.json @@ -18,6 +18,7 @@ "dplayer": "^1.27.0", "js-cookie": "^2.2.1", "node-sass": "^4.14.1", + "price-color": "^1.0.2", "s": "^1.0.0", "sass-loader": "^8.0.2", "sockjs-client": "^1.4.0", diff --git a/seller/src/config/index.js b/seller/src/config/index.js index ca3ce143..ef4121c9 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -11,5 +11,10 @@ module.exports = { website: "https://www.pickmall.cn", //官网地址 enableCDN: true, //生产环境 是否启用cdn加载 vue等js port: 10002, //端口 - inputMaxLength:'140' //全局输入框默认最大输入长度字 + inputMaxLength:'140', //全局输入框默认最大输入长度字 + /** + * 如需更换主题请修改此处以及theme.less中修改 + */ + mainColor:"#ff5c58", //主题色 + }; diff --git a/seller/src/main.js b/seller/src/main.js index a1abb8b1..210b9457 100644 --- a/seller/src/main.js +++ b/seller/src/main.js @@ -28,7 +28,7 @@ import * as filters from "@/utils/filters"; // global filter import {md5} from "@/utils/md5.js"; -const {aMapSecurityJsCode, inputMaxLength} = require("@/config"); +const {aMapSecurityJsCode, inputMaxLength,mainColor} = require("@/config"); // 打印 import Print from 'vue-print-nb'; @@ -46,6 +46,9 @@ Vue.use(VueLazyload, { loading: require("./assets/loading2.gif") }); +// 引入价格格式化组件 +import priceColorScheme from 'price-color' +Vue.use(priceColorScheme); const copyViewUi = {...ViewUI} copyViewUi.Input.props.maxlength.default = inputMaxLength // 挂载最大输入值 @@ -66,6 +69,7 @@ Vue.prototype.uploadFileRequest = uploadFileRequest; Vue.prototype.setStore = setStore; Vue.prototype.getStore = getStore; Vue.prototype.removeStore = removeStore; +Vue.prototype.$mainColor = mainColor; Vue.prototype.md5 = md5; const PC_URL = BASE.PC_URL; // 跳转买家端地址 pc端 const WAP_URL = BASE.WAP_URL; // 跳转买家端地址 wap端 diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue index 2dd663e7..7a7e2025 100644 --- a/seller/src/views/distribution/distributionGoods.vue +++ b/seller/src/views/distribution/distributionGoods.vue @@ -118,7 +118,7 @@ export default { key: "price", width: 130, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.price,'￥')); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); } }, { diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue index ec0edf95..54cceefe 100644 --- a/seller/src/views/goods/goods-seller/draftGoods.vue +++ b/seller/src/views/goods/goods-seller/draftGoods.vue @@ -85,10 +85,7 @@ export default { title: "商品价格", key: "price", render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.price, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); }, }, { diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 4bc01786..83f118a1 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -354,7 +354,7 @@ export default { key: "price", width: 130, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.price, "￥")); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); }, }, { diff --git a/seller/src/views/order/after-order/orderComplaintDetail.vue b/seller/src/views/order/after-order/orderComplaintDetail.vue index 52d35d8e..86ba8e39 100644 --- a/seller/src/views/order/after-order/orderComplaintDetail.vue +++ b/seller/src/views/order/after-order/orderComplaintDetail.vue @@ -196,7 +196,7 @@ 订单金额
- {{ complaintInfo.orderPrice | unitPrice('￥')}} +
diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index 7b46d10e..cb2d0c9f 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -143,11 +143,9 @@ key: "applyRefundPrice", width: 130, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.applyRefundPrice,color:this.$mainColor}} ); }, + }, { title: "会员名称", diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index a4970667..e6d9d918 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -142,13 +142,10 @@ title: "申请退款金额", key: "applyRefundPrice", width: 130, - render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.applyRefundPrice,color:this.$mainColor}} ); }, + }, { title: "会员", diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index cbf57bbc..8cefad8c 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -22,7 +22,9 @@
申请退款金额
-
{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}
+
+ +
实际退款金额
@@ -89,7 +91,9 @@
申请退款金额
-
{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}
+
+ +
实际退款金额
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 8aaf7b54..1259c2b7 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -202,10 +202,7 @@ export default { minWidth: 100, tooltip: true, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.flowPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} ); }, }, diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue index 0ae8f247..9cf9bf70 100644 --- a/seller/src/views/order/order/virtualOrderList.vue +++ b/seller/src/views/order/order/virtualOrderList.vue @@ -107,11 +107,10 @@ export default { minWidth: 100, tooltip: true, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.flowPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} ); }, + + }, { diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index 6d471832..a41c432f 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -96,10 +96,7 @@ export default { key: "billPrice", width: 150, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.receiptPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.receiptPrice,color:this.$mainColor}} ); }, }, { diff --git a/seller/src/views/promotion/coupon/coupon-publish.vue b/seller/src/views/promotion/coupon/coupon-publish.vue index 6eebbbdf..48d32790 100644 --- a/seller/src/views/promotion/coupon/coupon-publish.vue +++ b/seller/src/views/promotion/coupon/coupon-publish.vue @@ -301,7 +301,7 @@ export default { key: "price", minWidth: 40, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.price, "￥")); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); }, }, { diff --git a/seller/src/views/promotion/coupon/coupon-receive.vue b/seller/src/views/promotion/coupon/coupon-receive.vue index 1575926c..6d6768bc 100644 --- a/seller/src/views/promotion/coupon/coupon-receive.vue +++ b/seller/src/views/promotion/coupon/coupon-receive.vue @@ -127,10 +127,7 @@ export default { width: 100, render: (h, params) => { if (params.row.price) { - return h( - "div", - this.$options.filters.unitPrice(params.row.price, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); } else { return h("div", params.row.discount + "折"); } diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue index 39cf4ae2..7e61f22f 100644 --- a/seller/src/views/promotion/coupon/coupon.vue +++ b/seller/src/views/promotion/coupon/coupon.vue @@ -155,10 +155,7 @@ export default { width: 100, render: (h, params) => { if (params.row.price) { - return h( - "div", - this.$options.filters.unitPrice(params.row.price || 0, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); } else { return h("div", (params.row.couponDiscount || 0) + "折"); } 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 2c6776d4..e71a5d39 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -201,10 +201,7 @@ export default { key: "price", minWidth: 40, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.price, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); }, }, { diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue index d23c7eda..0106850b 100644 --- a/seller/src/views/promotion/live/liveGoods.vue +++ b/seller/src/views/promotion/live/liveGoods.vue @@ -53,9 +53,9 @@
-
{{row.price | unitPrice('￥')}}
-
{{row.price | unitPrice('￥')}}至{{row.price2 | unitPrice('￥')}}
-
{{row.price2 | unitPrice('￥')}}{{row.price | unitPrice('￥')}}
+
+
至
+
{{row.price | unitPrice('￥')}}
@@ -381,4 +381,9 @@ h4 { line-height: 40px; text-align: left; } +.flex{ + display: flex; + align-items: center; + justify-content: flex-start; +} diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue index 02f0a4e6..78ac1d5f 100644 --- a/seller/src/views/shop/bill/accountStatementBill.vue +++ b/seller/src/views/shop/bill/accountStatementBill.vue @@ -82,7 +82,7 @@ title: "账单号", key: "sn", minWidth: 250, - tooltip: true + tooltip: true }, { title: "生成时间", @@ -103,10 +103,7 @@ key: "billPrice", minWidth: 100, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.billPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.billPrice,color:this.$mainColor}} ); }, }, diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index 63e424b8..04317332 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -180,10 +180,7 @@ export default { title: "订单金额", key: "finalPrice", render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.finalPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.finalPrice,color:this.$mainColor}} ); }, }, { @@ -191,13 +188,7 @@ export default { key: "kanjiaSettlementPrice", render: (h, params) => { if (params.row.kanjiaSettlementPrice) { - return h( - "div", - this.$options.filters.unitPrice( - params.row.kanjiaSettlementPrice, - "￥" - ) - ); + return h("priceColorScheme", {props:{value:params.row.kanjiaSettlementPrice,color:this.$mainColor}} ); } else { return h("div", "￥0.00"); } diff --git a/seller/src/views/shop/bill/storeBill.vue b/seller/src/views/shop/bill/storeBill.vue index 6689f87c..161320d2 100644 --- a/seller/src/views/shop/bill/storeBill.vue +++ b/seller/src/views/shop/bill/storeBill.vue @@ -106,11 +106,9 @@ key: "billPrice", minWidth: 100, render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.billPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.billPrice,color:this.$mainColor}} ); }, + }, diff --git a/seller/src/views/statistics/goods.vue b/seller/src/views/statistics/goods.vue index 8dc3a546..98a59fea 100644 --- a/seller/src/views/statistics/goods.vue +++ b/seller/src/views/statistics/goods.vue @@ -47,10 +47,7 @@ export default { title: "销售金额", key: "price", render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.price) - ); + return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} ); }, }, ], diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue index d9e00b70..1f6c1b63 100644 --- a/seller/src/views/statistics/order.vue +++ b/seller/src/views/statistics/order.vue @@ -260,10 +260,7 @@ export default { title: "价格", key: "flowPrice", render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.flowPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} ); }, }, ], @@ -329,11 +326,9 @@ export default { title: "申请退款金额", key: "applyRefundPrice", render: (h, params) => { - return h( - "div", - this.$options.filters.unitPrice(params.row.applyRefundPrice, "￥") - ); + return h("priceColorScheme", {props:{value:params.row.applyRefundPrice,color:this.$mainColor}} ); }, + }, { title: "申请原因", diff --git a/seller/src/views/statistics/order/refundOrder.vue b/seller/src/views/statistics/order/refundOrder.vue index d9d9fbfb..116c0441 100644 --- a/seller/src/views/statistics/order/refundOrder.vue +++ b/seller/src/views/statistics/order/refundOrder.vue @@ -18,7 +18,9 @@
申请退款金额 - {{res.applyRefundPrice || '0'}} + + +
商家备注