Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

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

@@ -1136,7 +1136,7 @@ var vNode = {
       var url = this.getProjectNewsUrl()
       var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
       if (this.conf._4) {
-        location.href = './free_high_set?header=中标分析高级设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+        location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
       } else {
         this.$dialog.confirm({
           className:'promatch',

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

@@ -208,11 +208,15 @@
             <span v-if="isMember && (hasOnePower && surplus && isVip)" class="bid_surplus">剩余:${entvisit.total -
               entvisit.usage}</span>
           </template>
-          <div class="vip_component" v-if="!showContacts"
-            style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+          <div v-if="!showContacts" style="margin-top: .24rem;">
+            <div style="background: #fff;padding: .24rem .32rem 0;">
+              <span class="win-bid-title">企业通讯录</span>
+            </div>
+            <div class="vip_component"
+            style="height:11.04rem;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" :newvip="isVip"
-              imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'>
-            </vip-component>
+            imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+            </div>
           </div>
           <div class="bg-white tab-card cell-list history-list" v-else>
             <hispro-component type="winner" :id="entInfo.id"></hispro-component>

src/web/staticres/common-module/big-member/js/high_set.js

@@ -97,7 +97,7 @@ var highSet = new Vue({
     },
     hasSpace () {
       var key = this.conf.keywords
-      return key.length > 1 && key.replace(/^\s\s*/,'').indexOf(' ') > -1
+      return key && key.length > 1 && key.replace(/^\s\s*/,'').indexOf(' ') > -1
     },
     filterInfoUrl: function () {
       var path = ''
@@ -323,7 +323,6 @@ var highSet = new Vue({
         }
       }
       this.$refs.projectAreaSelector.arrangeListMap(map)
-      console.log(this.selectAreaList, '111')
       this.$refs.projectAreaSelector.setState(this.selectAreaList)
     },
     // 过滤行业数据
@@ -359,7 +358,7 @@ var highSet = new Vue({
       })
       console.log(resArr, '过滤好的行业数据')
       this.$refs.industryCom.formatIndustryData(resArr)
-      this.$refs.industryCom.setState(this.selectIndustryList)
+      // this.$refs.industryCom.setState(this.selectIndustryList)
     },
     // 分析方式
     checkMatch: function (item) {
@@ -370,20 +369,18 @@ var highSet = new Vue({
       this.conf.keywords = val.replace(/^\s\s*/,'')
     },
     onCancel: function (data) {
-      console.log(data)
       if (!data) {
         this.selectScopeList = ['purchasing']
         this.$refs.matchTypeSelector.setState(this.selectScopeList)
       } else if (data.name == 'areaItem') {
         this.$refs.projectAreaSelector.setState(this.selectAreaList)
       } else if (data.name == 'industryItem') {
-        this.$refs.industryCom.setState(this.selectIndustryList)
+        this.$refs.industryCom.setState([])
       } else if (data.name == 'dateItem') {
         
       }
     },
     onConfirm: function (data) {
-      console.log(data)
       if (data.name === 'areaItem') {
         if (data.data.length === 0) {
           this.conf.area = '全国'

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

@@ -1138,7 +1138,7 @@ var vNode = {
       var url = this.getProjectNewsUrl()
       var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
       if (this.conf._4) {
-        location.href = '/big/wx/page/free_high_set?header=中标分析高级设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+        location.href = '/big/wx/page/free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
       } else {
         this.$dialog.confirm({
           className: 'promatch',

src/web/staticres/common-module/collection/js/industry-mobile.js

@@ -139,8 +139,8 @@ var industryComponent = {
       this.setState()
     },
     // 回显数据
-    setState: function() {
-      let indArr = this.selectindustrylist
+    setState: function(data) {
+      let indArr = data ? data : this.selectindustrylist
       let newindArr = []
       let bool = true
       if(indArr && indArr.length == 0) {
@@ -270,6 +270,7 @@ var industryComponent = {
         name: 'industryItem',
         data: ''
       }
+      this.setState()
       this.$emit('cancel', params)
       return params
     },

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

@@ -209,8 +209,13 @@
                     <span v-if="isShowUpTip" class="bid_upgrade">升级</span>
                     <span v-if="isMember && (hasOnePower && surplus && isVip)" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
-                <div class="vip_component" v-if="!showContacts" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
-                  <vip-component data-cl-event="c_wx_free_buttonclick" @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                <div v-if="!showContacts">
+                  <div style="background: #fff;padding: .24rem .32rem 0;">
+                    <span class="win-bid-title">企业通讯录</span>
+                  </div>
+                  <div class="vip_component" style="height:11.04rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">
+                    <vip-component data-cl-event="c_wx_free_buttonclick" @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
+                  </div>
                 </div>
                 <div class="bg-white tab-card cell-list history-list" v-else>
                   <hispro-component type="winner" :id="entInfo.id"></hispro-component>