Merge remote-tracking branch 'origin/master'

src/views/MyManage/UnVerify/index.vue

@@ -40,6 +40,7 @@
           <li v-if="loginInfo.isQY === 2">
             <p class="content-title">
               厂商实名认证（办理“进口商品信息通报、GLN”等业务需先完成此认证）
+              <label :style="tycpdmFirmInfo.logoutFlag === 0?'color: #50c96b':'color: #ff0033'">{{tycpdmFirmInfo.logoutFlag === 0 ? '(审核中)' : tycpdmFirmInfo.logoutFlag === 2 ? '(审核不通过)' : ''}}</label>
             </p>
             <p>1、进口商品数据服务</p>
             <p class="list-cnt">

src/views/MyManage/index.vue

@@ -247,13 +247,15 @@ export default {
       if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
         this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
       }
-      this.routerList[0].link = '/MyManage/SystemMember/index',
-          this.routerList[2].children.push({
-            id: uuid("gs_nav"),
-            name: "企业信息",
-            index: 3,
-            link: '/MyManage/SystemMember/companyInfo'
-          })
+      this.routerList[0].link = '/MyManage/SystemMember/index'
+      if (this.loginInfo.carno) { // 申请条码卡的系统成员有企业信息菜单
+        this.routerList[2].children.push({
+          id: uuid("gs_nav"),
+          name: "企业信息",
+          index: 3,
+          link: '/MyManage/SystemMember/companyInfo'
+        })
+      }
       this.$store.commit("system/SET_SUB_NAV", this.routerList);
     } else if (this.userType === ADMIN) {
       this.$store.commit("system/SET_SUB_NAV", this.adminRouterList);