From c58d70524da4a8060e790d182865619acc3a5a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 9 Aug 2021 11:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9seller=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E9=85=8D=E7=BD=AE=E5=87=BA=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/order/flow/paymentLog.vue | 38 +++++++++++++++------ manager/src/views/order/flow/refundLog.vue | 30 ++++++++-------- seller/src/api/index.js | 1 + seller/src/config/index.js | 16 ++++----- 4 files changed, 52 insertions(+), 33 deletions(-) diff --git a/manager/src/views/order/flow/paymentLog.vue b/manager/src/views/order/flow/paymentLog.vue index 4942a812..e5f8a519 100644 --- a/manager/src/views/order/flow/paymentLog.vue +++ b/manager/src/views/order/flow/paymentLog.vue @@ -14,11 +14,12 @@ @@ -29,8 +30,8 @@
- + @@ -68,13 +69,21 @@ export default { align: "center", render: (h, params) => { if (params.row.paymentMethod === "WECHAT") { - return h("div", [h("Tag", {props: {color: "green",},}, "微信"),]); + return h("div", [ + h("Tag", { props: { color: "green" } }, "微信"), + ]); } else if (params.row.paymentMethod === "ALIPAY") { - return h("div", [h("Tag", {props: {color: "blue",},}, "支付宝"),]); + return h("div", [ + h("Tag", { props: { color: "blue" } }, "支付宝"), + ]); } else if (params.row.paymentMethod === "WALLET") { - return h("div", [h("Tag", {props: {color: "geekblue",},}, "余额支付"),]); + return h("div", [ + h("Tag", { props: { color: "geekblue" } }, "余额支付"), + ]); } else if (params.row.paymentMethod === "BANK_TRANSFER") { - return h("div", [h("Tag", {props: {color: "orange",},}, "银行转帐"),]); + return h("div", [ + h("Tag", { props: { color: "orange" } }, "银行转帐"), + ]); } else { return h("div", [h("Tag", {}, "暂未付款")]); } @@ -95,13 +104,19 @@ export default { key: "clientType", width: 130, render: (h, params) => { - if (params.row.clientType === "WECHAT_MP" || params.row.clientType === '小程序') { + if ( + params.row.clientType === "WECHAT_MP" || + params.row.clientType === "小程序" + ) { return h("div", [h("span", {}, "小程序")]); } else if (params.row.clientType === "APP") { return h("div", [h("span", {}, "APP")]); } else if (params.row.clientType === "PC") { return h("div", [h("span", {}, "PC网页")]); - } else if (params.row.clientType === "H5" || params.row.clientType === 'wap') { + } else if ( + params.row.clientType === "H5" || + params.row.clientType === "wap" + ) { return h("div", [h("span", {}, "移动端")]); } }, @@ -168,8 +183,9 @@ export default { this.searchForm.pageSize = 10; this.getDataList(); }, - changeDate (val) { // 改变日期格式 - this.searchForm.paymentTime = val + changeDate(val) { + // 改变日期格式 + this.searchForm.paymentTime = val; }, // 获取列表 getDataList() { diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue index 6a019d90..37e8c0cf 100644 --- a/manager/src/views/order/flow/refundLog.vue +++ b/manager/src/views/order/flow/refundLog.vue @@ -4,26 +4,24 @@
- + - + - +
- + @@ -67,13 +65,13 @@ export default { title: "第三方付款流水", key: "paymentReceivableNo", minWidth: 150, - tooltip: true + tooltip: true, }, { title: "第三方退款流水", key: "receivableNo", minWidth: 130, - tooltip: true + tooltip: true, }, { title: "退款金额", @@ -90,7 +88,7 @@ export default { title: "申请时间", key: "createTime", minWidth: 200, - tooltip: true + tooltip: true, }, { title: "退款状态", @@ -99,9 +97,13 @@ export default { width: 95, render: (h, params) => { if (params.row.isRefund == "1") { - return h("div", [h("Tag", {props: {color: "green",},}, "已退款")]); + return h("div", [ + h("Tag", { props: { color: "green" } }, "已退款"), + ]); } else { - return h("div", [h("Tag", {props: {color: "orange",},}, "未退款")]); + return h("div", [ + h("Tag", { props: { color: "orange" } }, "未退款"), + ]); } }, }, @@ -113,7 +115,7 @@ export default { methods: { // 初始化数据 init() { - this.getDataList(); + this.getDataList(); }, // 分页 改变页码 changePage(v) { @@ -150,7 +152,7 @@ export default { } }); this.loading = false; - } + }, }, mounted() { this.init(); diff --git a/seller/src/api/index.js b/seller/src/api/index.js index 84305fd3..6df3af21 100644 --- a/seller/src/api/index.js +++ b/seller/src/api/index.js @@ -6,6 +6,7 @@ import { deleteRequest, getRequestWithNoToken, postRequestWithNoToken, + commonUrl, } from "@/libs/axios"; //获取所有city diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 196a9cc1..5b81c21c 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,14 +18,14 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - // seller: "https://store-api.pickmall.cn", - // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.100:8890', - buyer: 'http://192.168.0.100:8888', - seller: 'http://192.168.0.100:8889', - manager: 'http://192.168.0.100:8887' + common: "https://common-api.pickmall.cn", + buyer: "https://buyer-api.pickmall.cn", + seller: "https://store-api.pickmall.cn", + manager: "https://admin-api.pickmall.cn" + // common: 'http://192.168.0.100:8890', + // buyer: 'http://192.168.0.100:8888', + // seller: 'http://192.168.0.100:8889', + // manager: 'http://192.168.0.100:8887' }, api_prod: { common: "https://common-api.pickmall.cn",