From 80d070bb67c6af943f57f8efba87facda4793919 Mon Sep 17 00:00:00 2001 From: mabo Date: Thu, 22 Jul 2021 18:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=94=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/couponCenter.vue | 2 +- buyer/src/pages/home/enumeration.js | 4 - .../src/pages/home/memberCenter/Favorites.vue | 7 +- manager/src/api/order.js | 15 +- manager/src/config/index.js | 13 +- .../views/goods/goods-info/goodsDetail.vue | 4 - .../after-order/afterSaleOrderDetail.vue | 773 ++++++++---------- manager/src/views/seller/shop/shopDetail.vue | 8 +- 8 files changed, 361 insertions(+), 465 deletions(-) diff --git a/buyer/src/pages/couponCenter.vue b/buyer/src/pages/couponCenter.vue index b2da1057..3c71aa07 100644 --- a/buyer/src/pages/couponCenter.vue +++ b/buyer/src/pages/couponCenter.vue @@ -5,7 +5,7 @@
- +

领券中心

diff --git a/buyer/src/pages/home/enumeration.js b/buyer/src/pages/home/enumeration.js index 416a30e4..ee39e556 100644 --- a/buyer/src/pages/home/enumeration.js +++ b/buyer/src/pages/home/enumeration.js @@ -52,10 +52,6 @@ export const afterSaleStatusList = [ name: '买家退货，待卖家收货', status: 'BUYER_RETURN' }, - { - name: '商家换货/补发', - status: 'SELLER_RE_DELIVERY' - }, { name: '卖家确认收货', status: 'SELLER_CONFIRM' diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue index f57a6b94..9cf21931 100644 --- a/buyer/src/pages/home/memberCenter/Favorites.vue +++ b/buyer/src/pages/home/memberCenter/Favorites.vue @@ -8,8 +8,11 @@
-
- {{params.type === 'GOODS'? item.goodsName : item.storeName}} +
+ {{item.goodsName}} +
+
+ {{item.storeName}}
{{item.price | unitPrice('￥')}} diff --git a/manager/src/api/order.js b/manager/src/api/order.js index da6f6ae7..9b37f96f 100644 --- a/manager/src/api/order.js +++ b/manager/src/api/order.js @@ -117,16 +117,10 @@ export const getAfterSaleOrderPage = (params) => { export const getAfterSaleOrderDetail = (sn) => { return getRequest(`/afterSale/get/${sn}`) } - //售后单查询物流 -export const getSellerDeliveryTraces = (sn, params) => { - return getRequest(`/afterSale/getSellerDeliveryTraces/${sn}`, params) +export const getAfterSaleTraces = (sn) => { + return getRequest(`/afterSale/getDeliveryTraces/${sn}`) } -//售后单查询物流 -export const getAfterSaleTraces = (sn, params) => { - return getRequest(`/afterSale/getDeliveryTraces/${sn}`, params) -} - // 获取商家选中的物流公司 export const getLogisticsChecked = () => { return getRequest(`/logistics/getChecked`) @@ -157,6 +151,11 @@ export const refundLog = (params) => { return getRequest(`/refundLog`, params) } +//售后单商家收货信息 +export const storeAddress = (sn) => { + return getRequest(`/afterSale/getStoreAfterSaleAddress/${sn}`) +} + diff --git a/manager/src/config/index.js b/manager/src/config/index.js index c296c0c7..8c65db4f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,11 +17,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: "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.101:8890', + buyer: 'http://192.168.0.101:8888', + seller: 'http://192.168.0.101:8889', + manager: 'http://192.168.0.101:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue index 3cdb57e4..b480b597 100644 --- a/manager/src/views/goods/goods-info/goodsDetail.vue +++ b/manager/src/views/goods/goods-info/goodsDetail.vue @@ -149,12 +149,8 @@ export default { this.previewGoodsPicture = url; this.goodsPictureVisible = true; } - , } - , - } -;