From 0837f5d9d9f986af28c00f80730689299c0acf37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 11 Jun 2021 19:01:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/plugins/request.js | 2 +- manager/src/views/order/order/orderList.vue | 206 +++++++++++------- manager/src/views/promotion/coupon/coupon.vue | 2 - .../goods/goods-seller/goodsOperation.vue | 1 + .../views/order/order/exportOrderDeliver.vue | 16 +- seller/src/views/order/order/orderList.vue | 16 +- 6 files changed, 149 insertions(+), 94 deletions(-) diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index d650d2a7..b937df34 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -71,7 +71,7 @@ service.interceptors.request.use( let jwtData = JSON.parse( decodeURIComponent(escape(window.atob(accessToken.split(".")[1]))) ); - if (jwtData.exp < new Date().getTime() / 1000) { + if (jwtData.exp < Math.round(new Date() / 1000)) { refresh() } } diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index e3112e29..19bb9905 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -1,47 +1,58 @@ @@ -57,49 +68,53 @@ export default { data() { return { // 表格的表头以及内容 - fields:{ - "订单编号":"sn", - "下单时间":"createTime", - "客户名称":"memberName", - "客户账号":"", - "收货人":"", - "收货人手机号":"", - "收货人地址":"", - "支付方式":{ + fields: { + 订单编号: "sn", + 下单时间: "createTime", + 客户名称: "memberName", + 客户账号: "", + 收货人: "", + 收货人手机号: "", + 收货人地址: "", + 支付方式: { field: "clientType", - callback:value=>{ + callback: (value) => { if (value == "H5") { - return "移动端" + return "移动端"; } else if (value == "PC") { - return "PC端" - } else if (value== "WECHAT_MP") { - return "小程序端" + return "PC端"; + } else if (value == "WECHAT_MP") { + return "小程序端"; } else if (value == "APP") { - return "移动应用端" + return "移动应用端"; } else { return value; } - } + }, }, - "配送方式":"", - "配送费用":"", - "订单商品金额":"", - "订单优惠金额":"", - "订单应付金额":"", - "商品SKU编号":"", - "商品数量":"groupNum", - "买家备注":"", - "订单状态":"", - "付款状态":{ - field:"payStatus", - callback:value=>{ - return value == "UNPAID" ? "未付款" : value == "PAID" ? "已付款" : "" - } + 配送方式: "", + 配送费用: "", + 订单商品金额: "", + 订单优惠金额: "", + 订单应付金额: "", + 商品SKU编号: "", + 商品数量: "groupNum", + 买家备注: "", + 订单状态: "", + 付款状态: { + field: "payStatus", + callback: (value) => { + return value == "UNPAID" + ? "未付款" + : value == "PAID" + ? "已付款" + : ""; + }, }, - "发货状态":"", - "发票类型":"", - "发票抬头":"", - "店铺":"storeName", + 发货状态: "", + 发票类型: "", + 发票抬头: "", + 店铺: "storeName", }, loading: true, // 表单加载状态 searchForm: { @@ -123,18 +138,14 @@ export default { { title: "订单号", key: "sn", - minWidth: 230, + minWidth: 240, tooltip: true, }, - { - title: "下单时间", - key: "createTime", - width: 200, - }, + { title: "订单来源", key: "clientType", - width: 95, + width: 120, render: (h, params) => { if (params.row.clientType == "H5") { return h("div", {}, "移动端"); @@ -149,15 +160,34 @@ export default { } }, }, + { + title: "订单类型", + key: "orderType", + width: 120, + render: (h, params) => { + if (params.row.orderType == "NORMAL") { + return h("div", [h("span", {}, "普通订单")]); + } else if (params.row.orderType == "PINTUAN") { + return h("div", [h("span", {}, "拼团订单")]); + } else if (params.row.orderType == "GIFT") { + return h("div", [h("span", {}, "赠品订单")]); + } else if (params.row.orderType == "VIRTUAL") { + return h("div", [h("tag", {}, "核验订单")]); + } + }, + }, { title: "买家名称", key: "memberName", - width: 130, + minWidth: 130, + tooltip: true, }, + { title: "订单金额", key: "flowPrice", - minWidth: 120, + minWidth: 100, + tooltip: true, render: (h, params) => { return h( "div", @@ -169,7 +199,7 @@ export default { { title: "订单状态", key: "orderStatus", - width: 95, + minWidth: 100, render: (h, params) => { if (params.row.orderStatus == "UNPAID") { return h("div", [h("span", {}, "未付款")]); @@ -188,12 +218,19 @@ export default { } }, }, + { + title: "下单时间", + key: "createTime", + width: 170, + sortable: true, + sortType: "desc", + }, { title: "操作", key: "action", align: "center", - width: 180, + width: 100, render: (h, params) => { return h("div", [ h( @@ -337,4 +374,11 @@ export default { diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index c49959e7..9e439e8b 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -232,9 +232,7 @@ export default { methods: { // 选中优惠券 父级传值 check(val,index) { - this.data[index].___selected = !this.data[index].___selected - this.$emit("selected", val); }, init() { diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index dfcac8cc..fc7417d4 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -381,6 +381,7 @@ +
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index cac35602..2340a62b 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -17,8 +17,8 @@
- +

选择或拖拽文件上传

@@ -42,12 +42,15 @@