From 877ccc059e835e08bd9e77813fd5cea1b7a64c81 Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 27 Jul 2021 18:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=AE=A1=E7=90=86=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E5=94=AE=E5=90=8E=E8=AF=A6=E6=83=85=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=BC=9A=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home/orderCenter/OrderDetail.vue | 14 +++++-- .../src/views/goods/goods-review/index.vue | 39 ++++++++++++++----- .../views/lili-floor-renovation/modelForm.vue | 2 +- .../lili-floor-renovation/modelFormItem.vue | 2 +- .../modelList/carousel.vue | 2 +- .../modelList/firstPageAdvert.vue | 2 +- .../modelList/newGoodsSort.vue | 2 +- .../modelList/recommend.vue | 2 +- .../shrinkable-menu/shrinkable-menu.vue | 1 - .../views/page/article-manage/hotWords.vue | 2 +- .../seller/bill/accountStatementBill.vue | 21 +++++----- .../src/views/sys/menu-manage/menuManage.vue | 22 ----------- .../src/views/sys/oss-manage/ossManage.vue | 24 +++++++++--- .../after-order/reurnGoodsOrderDetail.vue | 4 +- .../views/order/receiptManager/receipt.vue | 10 ++--- 15 files changed, 84 insertions(+), 65 deletions(-) diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index bf0223fd..1709b4c1 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -31,11 +31,16 @@

配送方式：{{order.deliveryMethodValue}}

配送状态：{{order.deliverStatusValue}}

-
+

发票信息

-

发票抬头：{{order.order.receiptVO.receiptTitle}}

-

发票内容：{{order.order.receiptVO.receiptContent}}

-

纳税人识别号：{{order.order.receiptVO.taxpayerId}}

+ +
+ 未开发票 +
@@ -155,6 +160,7 @@ export default { p { color: #999; margin: 3px; + margin-left: 5px; } h3 { font-weight: normal; diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue index 4db7c2a5..ac2477a5 100644 --- a/manager/src/views/goods/goods-review/index.vue +++ b/manager/src/views/goods/goods-review/index.vue @@ -12,8 +12,6 @@ - @@ -142,14 +145,28 @@ export default { } else { return h("Tag", {props: {color: "red",},}, "差评"); } + } + }, + { + title: "物流评分", + key: "deliveryScore", + render: (h, params) => { + return h('div',params.row.deliveryScore || 5 + '星') }, }, { - title: "评价内容", - key: "content", - align: "left", - minWidth: 200, - tooltip: true, + title: "服务评分", + key: "deliveryScore", + render: (h, params) => { + return h('div',params.row.serviceScore || 5 + '星') + }, + }, + { + title: "描述评分", + key: "deliveryScore", + render: (h, params) => { + return h('div',params.row.descriptionScore || 5 + '星') + }, }, { title: "评价时间", @@ -348,4 +365,8 @@ label { .div-height{ line-height: 25px; } +.score-content { + margin: 5px 0; + span{margin-right: 20px;} +} diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue index da0a8a80..21d50310 100644 --- a/manager/src/views/lili-floor-renovation/modelForm.vue +++ b/manager/src/views/lili-floor-renovation/modelForm.vue @@ -125,7 +125,7 @@ > - + diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue index 4603c14c..ec19150b 100644 --- a/manager/src/views/lili-floor-renovation/modelFormItem.vue +++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue @@ -130,7 +130,7 @@ > - + diff --git a/manager/src/views/lili-floor-renovation/modelList/carousel.vue b/manager/src/views/lili-floor-renovation/modelList/carousel.vue index 64667370..b9d70919 100644 --- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue +++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue @@ -113,7 +113,7 @@ > - + diff --git a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue index 71a89ec0..0bf56950 100644 --- a/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue +++ b/manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue @@ -58,7 +58,7 @@ > - + diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue index 25c1a013..88196772 100644 --- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue +++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue @@ -134,7 +134,7 @@ > - + diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue index b3572370..7dddd9f3 100644 --- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue +++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue @@ -200,7 +200,7 @@ > - + diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue index 01afa6c9..389471e5 100644 --- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue +++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue @@ -45,7 +45,6 @@ export default { // 监听路由变化 $route: { handler: function (val, oldVal) { - console.log(val); if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) { this.selectNav(val.meta.firstRouterName) } diff --git a/manager/src/views/page/article-manage/hotWords.vue b/manager/src/views/page/article-manage/hotWords.vue index 78d7041c..d2d57329 100644 --- a/manager/src/views/page/article-manage/hotWords.vue +++ b/manager/src/views/page/article-manage/hotWords.vue @@ -13,7 +13,7 @@
- +

{{ words }}
diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue index a632d7b5..f4b2b339 100644 --- a/manager/src/views/seller/bill/accountStatementBill.vue +++ b/manager/src/views/seller/bill/accountStatementBill.vue @@ -14,7 +14,7 @@ -
+
- - - - - @@ -201,17 +190,6 @@ - - - - - diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index 50f5455d..0db9863c 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -26,9 +26,7 @@ style="width: 200px" /> - + - +
@@ -273,6 +273,12 @@ import config from "@/config"; var dp; export default { name: "oss-manage", + props:{ + isComponent:{ + default: false, + type:Boolean + } + }, data() { return { config, // api地址 @@ -551,6 +557,11 @@ export default { pageSizeOpts: [5, 10, 20], // 页码展示项 }; }, + watch:{ + selectImage(val) { + if (val) this.init() + } + }, methods: { /** * 选择 @@ -811,11 +822,14 @@ export default { }, }, mounted() { - this.init(); + if(!this.isComponent) { // 是组件的话，初始化不调用接口 + this.init(); + } this.baseUrl = process.env.NODE_ENV === "development" ? this.config.api_dev.common : this.config.api_prod.common; }, + }; diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index 48dd96e8..b6101c2f 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -507,7 +507,7 @@ export default { }, // 返回售后状态中文描述 filterStatus(status) { - let label = ""; + let label = ''; for (let i = 0; i < this.afterSaleStatus.length; i++) { const obj = this.afterSaleStatus[i]; if (obj.status === status) { @@ -518,7 +518,7 @@ export default { return label; }, }, - activated() { + mounted() { this.sn = this.$route.query.sn; this.getDetail(); }, diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index 896aff61..30509f6d 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -14,8 +14,8 @@ @@ -50,7 +50,7 @@ export default { pageSize: 10, // 页面大小 sort: "createTime", // 默认排序字段 order: "desc", // 默认排序方式 - receiptStatus: "", // 起始时间 + receiptStatus: "", // 发票状态 }, columns: [ { @@ -110,13 +110,13 @@ export default { width: 100, tooltip: true, render: (h, params) => { - if (params.row.receiptStatus == 0) { + if (params.row.receiptStatus === 0) { return h("div", [ h("tag", { props: { color: "volcano" } }, "未开票"), ]); } else { return h("div", [ - h("tag", { props: { color: "green" } }, "未开票"), + h("tag", { props: { color: "green" } }, "已开票"), ]); } },