Merge branch 'feature/v3.7.20' into dev/v3.7.20_tsz

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>

public/page/subsetting/sub_entrance.html

@@ -71,6 +71,43 @@
         .hide_{
           display: none !important;
         }
+  .oldUserTips{
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 99999;
+      background-color:rgba(0, 0, 0, 0.7);
+  }
+  .oldUserTips .keywordContent{
+          width: 6.06rem;
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%,-50%);
+  /* background-color: #fff; */
+        }
+  .oldUserTips .keywordContent img{
+  width: 100%;
+  display: block;
+  
+  }
+  .oldUserTips .keywordContent .keywordBtn{
+  width: 4.78rem;
+  height: 0.8rem;
+  border-radius: 0.4rem;
+  background-color: #2ABED1;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 0.36rem;
+  position: absolute;
+  bottom: 0.56rem;
+  left: 50%;
+  transform: translateX(-50%);
+  }
     </style>
 <script src="/common-module/public/head.js"></script>
 </head>
@@ -125,7 +162,7 @@
                         </a>
                         <a  class="j-cell keywords keywords_">
                             <div class="cell-hd">
-                                <div class="j-cell_left">关键词</div>
+                                <div class="j-cell_left">关键词<span class="iconfont icon-wenhao" @click.stop.prevent="keywordTip = true"></span></div>
                                 <div class="j-cell_right">
                                     <!-- <span class="j-cell-text ellipsis">请按关键词分类选择</span> -->
                                     <span class="j-cell-text keyWord_int ellipsis">请按关键词分类选择</span>
@@ -350,6 +387,13 @@
             <button @click="setSubStatus" type="button" class="sub-button sub-button-confirm">立即开启</button>
           </div>
         </van-dialog>
+          <!-- 关键词说明弹窗 -->
+        <div class="oldUserTips" v-show="keywordTip">
+          <div class = "keywordContent">
+          <img src="../../image/keyword-tip.png" />
+         <div class="keywordBtn" @click="keywordTip = false">我知道了</div>
+         </div>
+        </div>
     </div>
 
     <div class="keyTypeAlert" style="display: none;">
@@ -404,7 +448,7 @@
                         </a>
                         <a href="javascript:;" class="j-cell keywords">
                             <div class="cell-hd">
-                                <div class="j-cell_left">关键词</div>
+                                <div class="j-cell_left">关键词<span class="iconfont icon-wenhao"></span></div>
                                 <div class="j-cell_right">
                                     <!-- <span class="j-cell-text ellipsis">请按关键词分类选择</span> -->
                                     <span class="j-cell-text keyWord_int ellipsis">请按关键词分类选择</span>
@@ -561,6 +605,7 @@ var subNode = new Vue({
   },
   data: function () {
     return {
+      keywordTip:false,
       show: true,
       areaSelectorShow: false,
       // 提交信息

src/views/ent/EntExit.vue

@@ -70,7 +70,7 @@ export default class extends Vue {
       // res.data.authtTime = '2020-03-25 15:37:12'
       // res.data.authtTime = this.formatDate(new Date(res.data.authtTime.replace(/-/g, '/')))
       this.companyInfo = res.data.data
-      if (res.data.data.ent_auth_status === 0 || res.data.data.ent_auth_status === -1) {
+      if (res.data.data.ent_auth_status === 0 || res.data.data.ent_auth_status === -1 || res.data.data.ent_auth_status === -2) {
         this.entStatus = false
         this.active = 'active'
       } else if (res.data.data.ent_auth_status === 1) {

src/views/ent/EntInfo.vue

@@ -432,6 +432,10 @@ export default class extends Vue {
     '-1': {
       className: 'tag-danger',
       msg: '未通过'
+    },
+    '-2': {
+      className: 'tag-fail',
+      msg: '未认证'
     }
   };