From cca4245316b33cca98075f77310fb8e46963d960 Mon Sep 17 00:00:00 2001 From: mabo Date: Wed, 19 May 2021 14:45:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81?= =?UTF-8?q?=EF=BC=8C=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/main.js | 2 +- .../views/distribution/distributionGoods.vue | 2 +- .../goods/goods-seller/goodsOperation.vue | 10 ++++----- .../order/after-order/returnGoodsOrder.vue | 16 +++++++++----- .../order/after-order/returnMoneyOrder.vue | 16 +++++++++----- seller/src/views/order/order/orderDetail.vue | 22 +++++++++++-------- 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/seller/src/main.js b/seller/src/main.js index 837264e7..094434c9 100644 --- a/seller/src/main.js +++ b/seller/src/main.js @@ -57,7 +57,7 @@ Vue.prototype.getStore = getStore; Vue.prototype.removeStore = removeStore; Vue.prototype.md5 = md5; Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') { // 跳转买家端商品 - window.open(`${link}/goodsDetail?goodsId=${goodsId}&skuId=${skuId}`, '_blank') + window.open(`${link}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') }; Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码 return `https://m-b2b2c.pickmall.cn/pages/product/goods?id=${skuId}&goodsId=${goodsId}` diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue index 386074f0..90c2d864 100644 --- a/seller/src/views/distribution/distributionGoods.vue +++ b/seller/src/views/distribution/distributionGoods.vue @@ -33,7 +33,7 @@
{{row.goodsName}}
- +
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index f1f56865..abd43569 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -1176,8 +1176,8 @@ export default { }, //选择运费模板则展示运费规则 logisticsTemplateChange(v) { - if (v == "STORE") { - //如果卖家承担运费 则需要查询运费规则 + if (v == "BUYER") { + // 如果买家承担运费 则需要查询运费规则 API_Shop.getShipTemplate().then((res) => { if (res.success) { this.logisticsTemplate = res.result; @@ -1244,7 +1244,7 @@ export default { ...response.result, }; console.warn(this.baseInfoForm); - if (this.baseInfoForm.freightPayer != "BUYER") { + if (this.baseInfoForm.freightPayer === "BUYER") { API_Shop.getShipTemplate().then((res) => { if (res.success) { this.logisticsTemplate = res.result; @@ -1847,8 +1847,8 @@ export default { // this.$Message.error("请选择店内分类"); // return; // } - //如果选择的是买家承担运费 则运费模板重置为0 - if (this.baseInfoForm.freightPayer == "BUYER") { + //如果选择的是卖家承担运费 则运费模板重置为0 + if (this.baseInfoForm.freightPayer !== "BUYER") { this.baseInfoForm.templateId = 0; } diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index d4c65068..0d1092b5 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -61,16 +61,22 @@ > -