分支合并

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

@@ -29,6 +29,7 @@ var vNode = {
                 _13: false,
                 // 是否有企业情报历史记录权限
                 _12: false,
+                isMember: 0 // 是否是大会员
             },
             powerInfo: {},
             tabActiveName: '1',
@@ -517,6 +518,7 @@ var vNode = {
                                 _this.bidcollPowerInfo.vip = 1
                             }
                         }
+                        _this.conf.isMember = res.data.memberStatus
                     } else {
                         _this.$toast(res.error_msg)
                     }
@@ -783,11 +785,14 @@ var vNode = {
             var rows = []
             var columns = ['月份']
             var count = 0
-
+            var allNum = []
             // 1. 先将月份提取出来, 并排序
             var yearArr = []
             for (var key in data) {
                 yearArr.push(parseInt(key))
+                for (var n in data[key]) {
+                  allNum.push(data[key][n])
+                }
             }
             yearArr.sort(function (a, b) { return a - b })
 
@@ -812,9 +817,9 @@ var vNode = {
                 })
                 rows.push(columnsItem)
             }
-
+            var maxNum = Math.max.apply(Math, allNum.map(function(o) { return o }))
             // 数据总量为0，不赋值
-            if (count != 0) {
+            if (count != 0 && maxNum !== 0) {
                 this.monthZbData.columns = columns;
                 this.monthZbData.rows = rows;
             }

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -984,7 +984,7 @@ ul {
 
 #tab1 .itemInfo>ul>li p.textcontent {
     /* flex: 1; */
-    width: 4.2rem;
+    width: 4rem;
     line-height: 20px;
     font-size: 14px;
     color: #171826;

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

@@ -255,14 +255,14 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus && !conf._13" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
-                <div class="bg-white tab-card cell-list history-list">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                <div class="vip_component" v-if="isMember" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
                 </div>
-                <!-- <div class="vip_component" v-if="isMember" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_9" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
-                </div> -->
+                <div class="bg-white tab-card cell-list history-list" v-else>
+                  <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+              </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
                     <!-- e-charts和sticky同时使用时候，需要手动降低css层级(z-index: 1)，确保tooltip不遮挡固定定位头部 -->
@@ -280,7 +280,7 @@
                     <div class="tab-card-tip">注：项目金额指所有项目的中标金额之和，少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_2" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_2" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
@@ -296,7 +296,7 @@
                     <div class="tab-card-tip">注：少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_3" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_3" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
@@ -312,7 +312,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_4" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_4" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0 && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
@@ -328,7 +328,7 @@
                     <div class="tab-card-tip">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_5" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_5" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0 && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
@@ -338,7 +338,7 @@
                     <div class="tab-card-tip">注：各客户类型占比以中标金额计算，最多展示占比排名前十的客户类型。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_6" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_6" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0 && !getStatus">
                     <div class="tab-card-title">重点客户</div>
@@ -368,7 +368,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_7" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
+                    <vip-component @tabactive="tabActive" type="item_7" :power="conf" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
                 </div>
             </van-tab>
         </van-tabs>

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

@@ -42,7 +42,7 @@
             <p class="empty-text">暂无企业情报历史记录</p>
         </div>
         <div class="vip_component bigVip_com" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
-            <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
+            <vip-component type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
         </div>
         <ul class="ent-change-list" v-else key="changeList">
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
@@ -96,7 +96,8 @@ var vNode = {
         },
         powerInfo: {},
         conf: {
-            _12: false
+            _12: false,
+            isMember: 0
         },
         isVip: false,
         vipststus: 0
@@ -148,6 +149,7 @@ var vNode = {
                             _this.conf._12 = true
                             $('.bigVip_com').css({'display':'flex'})
                         }
+                        _this.conf.isMember = res.data.memberStatus
                     }
                 }
             })

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

@@ -129,13 +129,13 @@
                 </div>
             </div>
             <!-- 历史项目联系人 -->
-            <!-- <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png') no-repeat;background-size:100% 100%">
+            <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png') no-repeat;background-size:100% 100%">
               <p class="example-title">历史项目联系方式</p>
               <buyer-example :status="bigStatus" :power="power" type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png'></buyer-example>
-            </div> -->
-            <!-- <div v-else> -->
+            </div>
+            <div v-else>
               <hispro-component class="history-list" type="buyer" :buyer="buyer.name"></hispro-component>
-            <!-- </div> -->
+            </div>
             <!-- 年度项目统计 -->
             <div class="years" v-if="isShow.showYearData">
                 <div class="chart_title">年度项目统计</div>

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -21,7 +21,14 @@
     <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.0.0-alpha.12/dist/html2canvas.min.js"></script>
 
     {{include "/common/js.html"}}
-
+    <style>
+      .unitbtn{
+        margin-left: .28rem;
+        font-size: 0.26rem;
+        white-space: nowrap;
+        color:#2ABED1;
+      }
+    </style>
 </head>
 <body>
 <div class="loading_" id="loading" style="display: none;">
@@ -1392,7 +1399,7 @@
           rerbuyertel=""
           buyertel_show = "hide"
       }
-      outhtml +='<li class="caigouunit"><p class="name">采购单位</p><div class="unitcenter"><p  class="textcontent">'+rerbuyer+'</p><div class="unitbtn '+rerbuyer_show+'"><span class="iconunit"></span></div></div></li>'
+      outhtml +='<li class="caigouunit"><p class="name">采购单位</p><div class="unitcenter"><p  class="textcontent">'+rerbuyer+'</p><div class="unitbtn '+rerbuyer_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></div></li>'
       outhtml +='<li><p class="name">采购联系人</p><p class="textcontent">'+rerbuyerperson+'</p></li>'+
           '<li class="bbm0"><p class="name">采购电话</p><p class="textcontent">'+rerbuyertel+'</p><a class="border-tel_ '+buyertel_show+'" style="position: static;display:block" datalink="/jyapp/vipsubscribe/introducePage"><div class="tel"></div></a></li>'
       if(packageCon==""){
@@ -1440,7 +1447,7 @@
 
           if(count>=5){
               $("#bidInfoTitle").show();
-              var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+ rerwinnerEntId +'"><p class="name">中标单位</p><div class="unitcenter"><p class="textcontent">'+rerwinner+'</p><div class="unitbtn '+rerwinner_show+'"><span class="iconunit"></span></div></li>'
+              var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+ rerwinnerEntId +'"><p class="name">中标单位</p><div class="unitcenter"><p class="textcontent">'+rerwinner+'</p><div class="unitbtn '+rerwinner_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></li>'
               bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p></li>'
               if(winnertel!=""){
                   bidInfohtml +='<li class="bbm0 winnertel bigwinnertel" style="position: relative; margin-bottom: 10px;border-bottom: 0px !important"><p class="name">联系方式</p>'

src/web/staticres/common-module/collection/js/buyer-example.js

@@ -72,9 +72,9 @@ var buyerExample = {
       switch (this.type) {
           // 历史项目联系方式
         case 'item_1': {
-          textMap.headText.top = ' 获取采购单位类似项目联系人、'
-          textMap.headText.bot = '联系方式等，一键拨打！',
-          textMap.source = ''
+          textMap.headText.top = '采购单位项目动态全面获取,'
+          textMap.headText.bot = '帮助企业洞察采购需求，开发新客户！',
+          textMap.source = 'buyer_portrait_contacts'
           break
         }
           // 年度项目统计

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

@@ -26,7 +26,8 @@ var vNode = {
                 // 是否显示，企业全景分析
                 _4: false,
                 // 是否显示中标企业动态
-                _13: false
+                _13: false,
+                isMember: 0 // 是否是大会员
             },
             powerInfo: {},
             tabActiveName: '1',
@@ -516,6 +517,7 @@ var vNode = {
                                 _this.bidcollPowerInfo.vip = 1
                             }
                         }
+                        _this.conf.isMember = res.data.memberStatus
                     } else {
                         _this.$toast(res.error_msg)
                     }
@@ -782,11 +784,14 @@ var vNode = {
             var rows = []
             var columns = ['月份']
             var count = 0
-
+            var allNum = []
             // 1. 先将月份提取出来, 并排序
             var yearArr = []
             for (var key in data) {
                 yearArr.push(parseInt(key))
+                for (var n in data[key]) {
+                  allNum.push(data[key][n])
+                }
             }
             yearArr.sort(function (a, b) { return a - b })
 
@@ -811,9 +816,9 @@ var vNode = {
                 })
                 rows.push(columnsItem)
             }
-
+            var maxNum = Math.max.apply(Math, allNum.map(function(o) { return o }))
             // 数据总量为0，不赋值
-            if (count != 0) {
+            if (count != 0 && maxNum !== 0) {
                 this.monthZbData.columns = columns;
                 this.monthZbData.rows = rows;
             }

src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -11,7 +11,7 @@ var vipDialog = `
     </div>
   </div>
   <div class="openBtn">
-      <button class="goBtn" @click="goOpen">{{getTextMap.btnText}}</button>
+      <button class="goBtn" @click="goOpen(getTextMap.source)">{{getTextMap.btnText}}</button>
   </div>
 </div>
 `
@@ -47,6 +47,12 @@ var vipComponent = {
       default: function () {
         return 0
       }
+    },
+    "power": {
+      type: Object,
+      default: function () {
+        return {}
+      }
     }
   },
   data: function() {
@@ -67,7 +73,8 @@ var vipComponent = {
         headText: {
           top: '通过实时监控项目的招标、中标、合同等',
           bot: '信息，全面挖掘更多潜在商机！'
-        }
+        },
+        source: ''
       }
       if (this.entvisit.total <= this.entvisit.usage || this.vipststus > 0) {
         if (this.entvisit.provin == 0) {
@@ -89,54 +96,74 @@ var vipComponent = {
         }
           // 年度项目统计
         case 'item_2': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '年度项目规模、增长趋势一目了然，'
           textMap.headText.bot = '快速分析市场！'
+          textMap.source = 'ent_portrait_yearData'
           break
         }
           // 月度中标金额统计
         case 'item_3': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '纵向对比采购单位近三年月度采购规模，'
           textMap.headText.bot = '不错过任何商机！'
+          textMap.source = 'ent_portrait_monthData'
           break
         }
           // 市场区域分布
         case 'item_4': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '通过企业市场规模、市场格局，'
           textMap.headText.bot = '分析企业的市场发展现状！'
+          textMap.source = 'ent_portrait_areaData'
           break
         }
           // 各类客户平均折扣率
         case 'item_5': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '通过近3年各类客户平均折扣率范围，'
           textMap.headText.bot = '透视企业的行业盈利能力！'
+          textMap.source = 'ent_portrait_discountRate'
           break
         }
           // 客户类型分布
         case 'item_6': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '通过企业主要客户类型分析，'
           textMap.headText.bot = '洞悉企业业务模式、经营状况！'
+          textMap.source = 'ent_portrait_top10'
           break
         }
           // 重点客户
         case 'item_7': {
+          textMap.titleText = '开通大会员'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '通过挖掘企业重点客户，直观了解采购单位'
           textMap.headText.bot = '与供应商关系远近，辅助投标决策！'
+          textMap.source = 'ent_portrait_topShow'
           break
         }
           // 企业情报历史记录
         case 'item_8': {
           textMap.titleText = '开通大会员'
-          textMap.btnText = '免费体验'
+          textMap.btnText = this.power.isMember > 0 && !this.power._12 ? '联系客服' : '免费体验'
           textMap.headText.top = '快速查询全国企业工商信息、法人信息、'
           textMap.headText.bot = '联系方式，全面掌控企业动态！'
+          textMap.source = 'ent_portrait_changeList'
           break
         }
           // 历史项目联系方式
         case 'item_9': {
           textMap.titleText = '开通大会员'
-          textMap.btnText = '免费体验'
+          textMap.btnText = this.power.isMember > 0 && !this.power._4 ? '联系客服' : '免费体验'
           textMap.headText.top = '获取企业历史项目联系人信息，'
           textMap.headText.bot = '直接与甲方或渠道商项目负责人对接！'
+          textMap.source = 'ent_portrait_contacts'
           break
         }
         default: {
@@ -149,7 +176,7 @@ var vipComponent = {
     },
   },
   methods: {
-    goOpen: function() {
+    goOpen: function(source) {
       // 点击按钮保存tabActiveName值
       this.$emit('tabactive', 'save')
       let isWeixin = utils.isWeiXinBrowser
@@ -164,7 +191,7 @@ var vipComponent = {
             location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
           }
         } else if (this.getTextMap.btnText == '免费体验') {
-          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait'
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '去升级') {
           location.href = '/jyapp/vipsubscribe/upgradePage'
         } else if(this.getTextMap.btnText == '联系客服') {
@@ -182,7 +209,7 @@ var vipComponent = {
             location.href = '/front/vipsubscribe/vipsubscribe_new'
           }
         } else if (this.getTextMap.btnText == '免费体验') {
-          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=ent_portrait'
+          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '去升级') {
           location.href = '/front/vipsubscribe/upgradePage'
         } else if(this.getTextMap.btnText == '联系客服') {

src/web/staticres/css/wxcontentinfo.css

@@ -81,7 +81,8 @@
 }
 
 #tab1 .itemInfo>ul>li p.textcontent {
-  width: 4.2rem;
+  width: 4rem;
+  margin-right: 0.28rem;
 }
 #tab1 .itemInfo>ul>li .unitcenter {
   display: flex;

src/web/staticres/js/pc-collect-user-info.js

@@ -219,7 +219,7 @@ var vm = new Vue({
       }
     }
     var validEmail = function(rule,value,callback) {
-      var status = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)
+      var status = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)
       if (value === '') {
         return callback(new Error('邮箱为必填项'));
       } else {
@@ -446,7 +446,7 @@ var vm = new Vue({
         // hireType: this.form.mold, // 受雇类型值
         company: this.form.companyName, // 公司名称
         companyType: this.form.companyType.join(','), 
-        position: this.form.job == '其他' ? this.form.otherJob : this.form.job, 
+        position: this.form.job == '其他' ? ('其他/' + this.form.otherJob) : this.form.job,
         // company_size: this.form.scale,
         workScope: this.form.business,
         partnerNeeds: this.form.need, 
@@ -511,7 +511,7 @@ var vm = new Vue({
             if (res.data.position) {
               if (jobJson.indexOf(res.data.position) == -1) {
                 _this.form.job = '其他'
-                _this.form.otherJob = res.data.position
+                _this.form.otherJob = res.data.position.replace('其他/', '')
               } else {
                 _this.form.job = res.data.position
               }

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -135,13 +135,13 @@
               </div>
           </div>
           <!-- 历史项目联系人 -->
-          <!-- <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png?v=1') no-repeat;background-size:100% 100%;">
+          <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png?v=1') no-repeat;background-size:100% 100%;">
             <p class="example-title">历史项目联系方式</p>
             <buyer-example :status="bigStatus" :power="power" type="item_1" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/01.png'></buyer-example>
-          </div> -->
-          <!-- <div v-else> -->
+          </div>
+          <div v-else>
             <hispro-component class="history-list" type="buyer" :buyer="buyer.name"></hispro-component>
-          <!-- </div> -->
+          </div>
           <!-- 年度项目统计 -->
           <div class="years" v-if="isShow.showYearData">
               <div class="chart_title">年度项目统计</div>

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -547,7 +547,7 @@
       this.ajaxGetEchoInfo()
       this.wxTweetAjax('isICRP') // 公众号推文进入的埋点
       this.bigDocAjax('ICRP') // 进入留资页面埋点
-      this.fromBuyerAjax('isICRP') // 采购单位画像、企业画像进来埋点
+      // this.fromBuyerAjax('isICRP') // 采购单位画像、企业画像进来埋点
     },
     computed: {
       isShowCancel () {

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

@@ -260,14 +260,14 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus && !conf._13" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_1" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
-                <div class="bg-white tab-card cell-list history-list">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                <div class="vip_component" v-if="isMember" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                </div>
+                <div class="bg-white tab-card cell-list history-list" v-else>
+                  <hispro-component type="winner" :id="entInfo.id"></hispro-component>
                 </div>
-                <!-- <div class="vip_component" v-if="isMember" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_9" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
-                </div> -->
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && annualData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">年度项目统计</div>
                     <!-- e-charts和sticky同时使用时候，需要手动降低css层级(z-index: 1)，确保tooltip不遮挡固定定位头部 -->
@@ -285,7 +285,7 @@
                     <div class="tab-card-tip">注：项目金额指所有项目的中标金额之和，少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_2" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_2" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && monthZbData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
@@ -301,7 +301,7 @@
                     <div class="tab-card-tip">注：少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_3" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_3" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && tabActiveName == '2' && mapChartData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
@@ -317,7 +317,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_4" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_4" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && tabActiveName == '2' && rateData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
@@ -333,7 +333,7 @@
                     <div class="tab-card-tip">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_5" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_5" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-show="conf._4 && tabActiveName == '2' && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0  && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
@@ -343,7 +343,7 @@
                     <div class="tab-card-tip">注：各客户类型占比以中标金额计算，最多展示占比排名前十的客户类型。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_6" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_6" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && tabActiveName == '2' && importantCustomers.length !== 0  && !getStatus">
                     <div class="tab-card-title">重点客户</div>
@@ -373,7 +373,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png') no-repeat;background-size:100% 100%">
-                    <vip-component @tabactive="tabActive" type="item_7" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
+                    <vip-component @tabactive="tabActive" :power="conf" type="item_7" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png'></vip-component>
                 </div>
             </van-tab>
         </van-tabs>

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

@@ -43,7 +43,7 @@
             <p class="empty-text">暂无企业情报历史记录</p>
         </div>
         <div class="vip_component bigVip_com" v-if="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
-            <vip-component type="item_8" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
+            <vip-component type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png'></vip-component>
         </div>
         <ul class="ent-change-list" v-else key="changeList">
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
@@ -90,7 +90,8 @@ var vNode = {
         },
         powerInfo: {},
         conf: {
-            _12: false
+            _12: false,
+            isMember: 0
         },
         isVip: false,
         vipststus: 0
@@ -141,6 +142,7 @@ var vNode = {
                             _this.conf._12 = true
                             $('.bigVip_com').css({'display':'flex'})
                         }
+                        _this.conf.isMember = res.data.memberStatus
                     }
                 }
             })

src/web/templates/weixin/wxinfocontent_rec.html

@@ -609,6 +609,11 @@ pre {
 .content img{
   width:100%;
 }
+.go-look{
+  font-size: .26rem;
+  white-space: nowrap;
+  color: #2ABED1
+}
 </style>
 </head>
 <body>
@@ -1642,7 +1647,7 @@ $(function(){
 		outhtml +='<li><p class="name">项目名称</p><p class="textcontent">'+rerprojectname+'</p><a dataName="项目名称" dataCont="'+rerprojectname+'" dataCode="projectname" onClick="recoveryAction(this)">纠错</a></li>'
 		var rerbuyer = {{.T.obj.buyer}};
 		if(rerbuyer==undefined||rerbuyer==null){
-			rerbuyer=""
+      rerbuyer=""
 		}
     var rerbuyerperson = {{.T.obj.buyerperson}};
 		if(rerbuyerperson==undefined||rerbuyerperson==null){
@@ -1652,7 +1657,7 @@ $(function(){
 		if(rerbuyertel==undefined||rerbuyertel==null){
 			rerbuyertel=""
 		}
-		outhtml +='<li><p class="name">采购单位</p><div class="unitcenter caigouunit"><p class="textcontent">'+rerbuyer+'</p></div><a dataName="采购单位" dataCont="'+rerbuyer+'" dataCode="buyer" onClick="recoveryAction(this)">纠错</a></li>'
+		outhtml +='<li><p class="name">采购单位</p><div class="unitcenter caigouunit"><p class="textcontent">'+rerbuyer+'</p><span class="go-look go-buyer">立即查看</span></div><a dataName="采购单位" dataCont="'+rerbuyer+'" dataCode="buyer" onClick="recoveryAction(this)">纠错</a></li>'
 		outhtml +='<li><p class="name">采购联系人</p><p class="textcontent">'+rerbuyerperson+'</p><a dataName="采购联系人" dataCont="'+rerbuyerperson+'" dataCode="buyerperson" onClick="recoveryAction(this)">纠错</a></li>'+
 					'<li class="bbm0"><p class="name">采购电话</p><p class="textcontent">'+rerbuyertel+'</p><a dataName="采购电话" dataCont="'+rerbuyertel+'" dataCode="buyertel" onClick="recoveryAction(this)">纠错</a></li>'
 		if(packageCon==""){
@@ -1668,8 +1673,12 @@ $(function(){
         rerwinner=""
       }
 			outhtml +='<li style="border-top:1px solid #ebebeb;"><p class="name">拟定单一来源采购供应商</p><p class="textcontent">'+rerwinner+'</p><a dataName="拟定单一来源采购供应商" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
-		}
-	$("#baseInfo ul").html(outhtml)
+    }
+    
+  $("#baseInfo ul").html(outhtml)
+  if (!rerbuyer) {
+    $('.go-buyer').hide()
+  }
 	//中标信息
 	if(isbid){
 		var rerwinner = {{.T.obj.winner}};
@@ -1694,7 +1703,7 @@ $(function(){
     }
     if(count>=5){
 		$("#bidInfoTitle").show();
-  		var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+rerwinnerEntId+'"><p class="name">中标单位</p><p class="textcontent" style="text-decoration-line: underline;color: #2ABED1;">'+rerwinner+'</p><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
+  		var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+rerwinnerEntId+'"><p class="name">中标单位</p><p class="textcontent" style="text-decoration-line: underline;color: #2ABED1;">'+rerwinner+'</p><span class="go-look go-winner">立即查看</span><a dataName="中标单位" dataCont="'+rerwinner+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
   		bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
       if(winnertel!=""){
         bidInfohtml +='<li class="bbm0 winnertel"><p class="name">联系方式</p>';
@@ -1706,6 +1715,9 @@ $(function(){
         bidInfohtml +='</li>'
       }
      $("#bidInfo ul").html(bidInfohtml)
+     if (!rerwinner) {
+        $('.go-winner').hide()
+      }
     }
 	}