Merge branch 'feature/GFRS-1523【待确定】商品商城' into dev

# Conflicts:
#	src/assets/js/utils/request.js

src/assets/js/utils/request.js

@@ -71,6 +71,10 @@ let survey = [
 let manpower = [
   '/customer/answer/queryList' //DISC性格分析
 ]
+let productStore = [
+  '/customer/shop/getShopList', //获取商城列表/详情
+  '/customer/shop/getShareList' //查询分享轨迹(转发记录)
+]
 // 卡单
 let cardList = []
 //续期管理
@@ -85,9 +89,18 @@ let preserve = [
   '/edor/edor/queryEdorList' //保全进度查询
 ]
 
-let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...manpower, ...renewalManage, ...preserve]
-
-// let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale]
+let whiteList = [
+  '/customer/agent/getCustomersList',
+  ...proposal,
+  ...sale,
+  ...agentEnter,
+  ...claims,
+  ...survey,
+  ...manpower,
+  ...renewalManage,
+  ...preserve,
+  ...productStore
+]
 
 // 创建axios实例
 const service = axios.create({