Merge branch 'dev/v4.8.75_cyl' of qmx/jy into feature/v4.8.75

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -326,6 +326,11 @@ var vNode = {
       var entniche = info.vipStatus <= 0 && info.memberStatus <= 0 && info.entniche
       return memberCustom || isNewVip || entniche
     },
+    phoneUnlockTip () {
+      var info = this.powerInfo
+      var phone = this.entBaseInfo.phone
+      return info.isFree && phone && phone.indexOf('*') !== -1
+    },
     noShowTip: function () {
       return (!this.isFree && !this.updateVipStatus && !this.customerServiceStatus) || (this.isFree && this.canFreeTrial)
     }
@@ -1555,6 +1560,10 @@ var vNode = {
       //   }).then(function () {})
       // }
     },
+    goToUnlock: function () {
+      // this.savePageState()
+      location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait_contacts'
+    },
     //免费赠送企业全景分析体验 去解锁
     goGiveAnalysis: function () {
       location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait_freeuser';

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -163,7 +163,10 @@
                 </div>
                 <div class="card-column organization-code">
                   <div class="ent-info-label">联系方式</div>
-                  <div class="ent-info-text">${entBaseInfo.phone ? entBaseInfo.phone : '-'}</div>
+                  <div class="ent-info-text">
+                    <p>${entBaseInfo.phone ? entBaseInfo.phone : '-'}</p>
+                    <p class="highlight-text" v-show="phoneUnlockTip" @click="goToUnlock">解锁查看</p>
+                  </div>
                 </div>
               </div>
               <div class="card-row">

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -326,6 +326,11 @@ var vNode = {
       var entniche = info.vipStatus <= 0 && info.memberStatus <= 0 && info.entniche
       return memberCustom || isNewVip || entniche
     },
+    phoneUnlockTip () {
+      var info = this.powerInfo
+      var phone = this.entBaseInfo.phone
+      return info.isFree && phone && phone.indexOf('*') !== -1
+    },
     noShowTip: function () {
       return (!this.isFree && !this.updateVipStatus && !this.customerServiceStatus) || (this.isFree && this.canFreeTrial)
     }
@@ -774,6 +779,10 @@ var vNode = {
         this.changeFollowStateRequest()
       }
     },
+    goToUnlock: function () {
+      // this.savePageState()
+      location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=ent_portrait_contacts'
+    },
     goExpAnalysis () {
       location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=ent_portrait_freeuser';
     },

src/web/staticres/js/ent-search-index-pc.js

@@ -1,4 +1,4 @@
-var vm = new Vue({
+var entSearch = new Vue({
     el: '.vue-search-container',
     delimiters: ['${', '}'],
     components: {
@@ -9,6 +9,7 @@ var vm = new Vue({
     },
     data: function () {
         return {
+            isFree: true,
             foundingTime:'',//成立时间
             provinceMap: provinceMap,
             searchContent: pageInfo.searchContent,
@@ -295,7 +296,7 @@ var vm = new Vue({
             }
         },
         company_phone_show :function (){
-            return  this.isLogin && !window.isFree
+            return  this.isLogin && !this.isFree
         }
     },
     created: function () {
@@ -992,6 +993,10 @@ var vm = new Vue({
     }
 })
 
+function getPowerComplete () {
+    entSearch.isFree = window.isFree
+}
+
 ;(function () {
     var backUpLoginCallback = logic
     logic = function (data, num) {

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -167,7 +167,10 @@
                             </div>
                             <div class="card-column organization-code">
                                 <div class="ent-info-label">联系方式</div>
-                                <div class="ent-info-text">${entBaseInfo.phone ? entBaseInfo.phone : '-'}</div>
+                                <div class="ent-info-text">
+                                    <p>${entBaseInfo.phone ? entBaseInfo.phone : '-'}</p>
+                                    <p class="highlight-text" v-show="phoneUnlockTip" @click="goToUnlock">解锁查看</p>
+                                </div>
                             </div>
                         </div>
                         <div class="card-row">