Merge branch 'feature/开门红' into dev

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

src/assets/js/utils/request.js

@@ -2,11 +2,9 @@ import axios from 'axios'
 import AESTools from '@/assets/js/utils/cryptoJsUtil'
 import configApp from '@/config'
 import { Dialog, Toast } from 'vant'
-import dateUtil from '@/assets/js/utils/date-utils'
 import MD5 from 'js-md5'
 import CacheUtils from '@/assets/js/utils/cacheUtils'
-
-import { device } from '@/assets/js/business-common.js'
+import BusinessCommon from '@/assets/js/business-common.js'
 let proposal = [
   '/proposal/proposal/list',
   '/proposal/proposal/toInsurance',
@@ -148,7 +146,7 @@ service.interceptors.request.use(
      */
     if (relativePath === '/customer/agent/info' && !token) {
       // 设备类型
-      const target = device()
+      const target = BusinessCommon.device()
       // 安卓or苹果
       if (target.isAndroid || target.isIphone) {
         // eslint-disable-next-line no-undef