Merge branch 'feature/增加机构名称简称' into feature/个险业绩排行优化

# Conflicts:
#	src/views/ebiz/institutionalPerform/UnderOffice.vue

src/assets/js/utils/request.js

@@ -1,5 +1,11 @@
 import axios from 'axios'
+import AESTools from '@/assets/js/utils/cryptoJsUtil'
+import configApp from '@/config'
 import { Dialog, Toast } from 'vant'
+import MD5 from 'js-md5'
+import CacheUtils from '@/assets/js/utils/cacheUtils'
+import BusinessCommon from '@/assets/js/business-common'
+
 let proposal = [
   '/proposal/proposal/list',
   '/proposal/proposal/toInsurance',
@@ -79,9 +85,6 @@ let productStore = [
   '/customer/shop/getShareList' //查询分享轨迹(转发记录)
 ]
 
-// 卡单
-let cardList = []
-
 // 续期
 let renewalManage = [
   '/renewal/getRenewalList' //续期列表查询
@@ -111,8 +114,8 @@ const service = axios.create({
 
 // request拦截器
 service.interceptors.request.use(
-  config => {
-    let relativePath = config.url && config.url.split('v1')[1]
+  async config => {
+    let relativePath = config.url && config.url.split(configApp.API_VERSION)[1]
     if (whiteList.includes(relativePath)) {
       Toast.loading({
         duration: 0, // 持续展示 toast
@@ -121,9 +124,37 @@ service.interceptors.request.use(
         message: '加载中……'
       })
     }
+    /**
+     * 请求拦截处理(待添加 判断走统一网关处理)
+     */
+    if (config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0]) && configApp.API_VERSION == 'v2') {
+      if (!config.data || config.data == null) {
+        config.data = {}
+      }
+      if (!!config.data && config.data != null) {
+        let encrypt = AESTools.AESEncrypt(JSON.stringify(config.data), configApp.REQ_PWD)
+        config.data = { data: encrypt }
+      }
+    }
 
-    config.headers['token'] = window.localStorage.getItem('token')
-    // config.headers['token'] = `f0003a753d1d492083248f723ab1b6e9`//TEST测试专用
+    // token 不存在初始化处理
+    let token = CacheUtils.getLocItem('token')
+    if (!token) {
+      // 设备类型
+      const target = BusinessCommon.device()
+      // 安卓or苹果(非浏览器)
+      if (!target.isWeixin && !target.isChrome) {
+        // eslint-disable-next-line no-undef
+        const res = await EWebBridge.webCallAppInJs('getToken')
+        CacheUtils.setLocItem('token', JSON.parse(res).token)
+      }
+    }
+
+    config.headers['token'] = CacheUtils.getLocItem('token')
+    // 添加请时间戳
+    let timeStr = new Date().getTime() + ''
+    config.headers['timeStr'] = timeStr
+    config.headers['signature'] = MD5(timeStr + CacheUtils.getLocItem('token'))
     return config
   },
   error => {
@@ -135,8 +166,18 @@ service.interceptors.request.use(
 // respone拦截器
 service.interceptors.response.use(
   response => {
-    const res = response.data
-    console.log(res, 'res')
+    let res = response.data
+    if (
+      configApp.API_VERSION == 'v2' &&
+      response.config.url &&
+      response.headers['content-type'].match(/application\/json/) &&
+      /api\/$/.test(response.config.url.split(configApp.API_VERSION)[0])
+    ) {
+      if (res.response) {
+        // 正常情況返回必有response 节点
+        res = JSON.parse(AESTools.AESDecrypt(res.response, configApp.REQ_PWD))
+      }
+    }
     Toast.clear()
     if (res.code != 0) {
       if (res.code == 10001 || res.code == 10002) {
@@ -154,7 +195,7 @@ service.interceptors.response.use(
       }
       return Promise.reject(res)
     } else {
-      return response.data.content
+      return res.content
     }
   },
   error => {