Merge branch 'feature/国富之星' into dev

# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/cacheUtils.js
#	src/assets/js/utils/cryptoJsUtil.js
#	src/config/index.js
#	src/main.js

src/components/ebiz/manpower/UserInfoHeader.vue

@@ -1,9 +1,12 @@
 <!-- 头部用户信息 -->
 <template>
   <div class="user-info flex p15 bg-head align-items-e">
-    <img class="w40" src="../../../assets/images/bnf_avatar.png" />
-    <div class="add-list flex1 ml10">
-      <p class="fs16 font-bold">{{ userInfo.encryptionName }}</p>
+    <div class="avatar">
+      <img class="w40 star" src="../../../assets/images/avatar-border.gif" />
+      <img class="w40" src="../../../assets/images/bnf_avatar.png" />
+    </div>
+    <div class="add-list flex1 ml15">
+      <span class="fs16 font-bold name">{{ userInfo.encryptionName }}</span>
       <div class="">工号 | {{ userInfo.encryptionJobNo }}</div>
     </div>
   </div>
@@ -51,11 +54,34 @@ export default {
   color: white;
   height: 80px;
 
+  .avatar {
+    position: relative;
+    .star {
+      position: absolute;
+      transform: scale(1.5);
+    }
+  }
+
   .send-main {
     border-bottom: 10px solid #f5f5f5;
   }
   .add-list {
     line-height: 22px;
+    .name {
+      position: relative;
+    }
+    .name::after {
+      content: ' ';
+      background-image: url('~@/assets/images/gf-star.gif');
+      background-size: contain;
+      width: 88px;
+      height: 30px;
+      position: absolute;
+      transform-origin: 0 0;
+      transform: scale(0.5);
+      top: 0;
+      margin-left: 2px;
+    }
   }
   .font-bold {
     font-weight: bold;

src/config/index.js

@@ -5,7 +5,7 @@
  *
  */
 
-let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl, zssqUrl ,REQ_PWD, CACHE_ENCRYP, API_VERSION, assetsUpUrl// 保融支付的收银台服务地址
+let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl, zssqUrl, REQ_PWD, CACHE_ENCRYP, API_VERSION, assetsUpUrl // 保融支付的收银台服务地址
 
 // 可以多个接口域名，按需添加
 console.log('环境：', process.env.VUE_APP_FLAG)