Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

# Conflicts:
#	seller/src/config/index.js

manager/src/api/member.js

@@ -98,7 +98,7 @@ export const getMemberStatistics = params => {
 };
 
 
-// 获取会员注册统计列表
+// 获取流量统计
 export const getStatisticsList = params => {
   return getRequest("/statistics/view/list", params);
 };

seller/src/api/order.js

@@ -113,7 +113,7 @@ export const afterSaleSellerDelivery = (sn, params) => {
 };
 //查询物流
 export const getTraces = (sn, params) => {
-  return postRequest(`/orders/getTraces/${sn}`, params);
+  return getRequest(`/orders/getTraces/${sn}`, params);
 };
 //售后单查询物流
 export const getSellerDeliveryTraces = (sn, params) => {

seller/src/config/index.js

@@ -18,21 +18,16 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
+    common: "https://common-api.pickmall.cn",
-    buyer: 'https://buyer-api.pickmall.cn',
+    buyer: "https://buyer-api.pickmall.cn",
-    seller: 'https://store-api.pickmall.cn',
+    seller: "https://store-api.pickmall.cn",
-    manager: 'https://admin-api.pickmall.cn',
+    manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.103:8890',
-    // buyer: 'http://192.168.0.103:8888',
-    // seller: 'http://192.168.0.103:8889',
-    // manager: 'http://192.168.0.103:8887'
-
   },
   api_prod: {
-    common: 'https://common-api.pickmall.cn',
+    common: "https://common-api.pickmall.cn",
-    buyer: 'https://buyer-api.pickmall.cn',
+    buyer: "https://buyer-api.pickmall.cn",
-    seller: 'https://store-api.pickmall.cn',
+    seller: "https://store-api.pickmall.cn",
-    manager: 'https://admin-api.pickmall.cn'
+    manager: "https://admin-api.pickmall.cn"
   },
   /**
    *  @description api请求基础路径前缀