Merge branch 'dev4.5.2' of http://127.0.0.1:8080/qmx/jy into dev4.5.2

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

@@ -259,7 +259,7 @@ var vNode = {
                 entId: _this.entInfo.id
             }
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/winner'
 
             } else {
@@ -383,7 +383,7 @@ var vNode = {
         getEntBaseInfo: function () {
             var _this = this
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/entDetail'
             } else {
                 urls = '/bigmember/portrait/ent/detail'

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

@@ -135,8 +135,10 @@ var vNode = {
                         var power = res.data.power
                         // 判断是否是超级订阅会员、老用户还是新用户
                         if (res.data.viper) {
+                            $('.bigVip_com').css({'display':'flex'})
                             _this.isVip = true
                         } else {
+                            $('.bigVip_com').css({'display':'flex'})
                             if(res.data.vipStatus > 0) {
                                 _this.vipststus = res.data.vipststus
                             }

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

@@ -259,9 +259,8 @@ var vNode = {
                 entId: _this.entInfo.id
             }
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/winner'
-
             } else {
                 urls = '/bigmember/portrait/winner/getData'
             }
@@ -383,7 +382,7 @@ var vNode = {
         getEntBaseInfo: function () {
             var _this = this
             let urls = ''
-            if (_this.svip) {
+            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
                 urls = '/bigmember/portrait/subVipPortrait/entDetail'
             } else {
                 urls = '/bigmember/portrait/ent/detail'

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

@@ -504,12 +504,19 @@ var vm = new Vue({
             $('#go-customer-4').trigger('click')
         },
         toDetail: function (id) {
-            if (this.powerInfo.vip > 1) {
-                // 去超级订阅画像
-                window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
+            // 去超级订阅画像
+            var svipLink = '/swordfish/page_big_pc/svip/ent_ser_portrait/' + id
+            // 大会员画像
+            var memberLink = '/swordfish/page_big_pc/ent_portrait/' + id
+
+            if (this.powerInfo.member) {
+                if (this.powerInfo.vip > 0) {
+                    window.open(svipLink)
+                } else {
+                    window.open(memberLink)
+                }
             } else {
-                // 去大会员画像
-                window.open('/swordfish/page_big_pc/ent_portrait/' + id)
+                window.open(svipLink)
             }
         },
         calcListItemForCap: function (p) {

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

@@ -128,8 +128,10 @@ var vNode = {
                         var power = res.data.power
                         // 判断是否是超级订阅会员、老用户还是新用户
                         if (res.data.viper) {
+                            $('.bigVip_com').css({'display':'flex'})
                             _this.isVip = true
                         } else {
+                            $('.bigVip_com').css({'display':'flex'})
                             if(res.data.vipStatus > 0) {
                                 _this.vipststus = res.data.vipststus
                             }

src/web/templates/pc/biddetail_rec.html

@@ -59,7 +59,7 @@ function isWechat() {
         <div class="tags-inputs">
           <div class="tag-input">
             <div class="tag-labels"></div>
-            <input type="text" class="clear-input">
+            <input type="text" class="clear-input" maxlength="5" oninput="this.value=this.value.replace(/\s+/g,'')">
             <div class="tag-placeholder">新增标签回车保存</div>
           </div>
           <div class="add-tag-button">添加并使用</div>
@@ -483,7 +483,11 @@ function isWechat() {
 							<td class="tab-type">中标单位</td>
 							<td class="tab-cont">
                                 {{if .T.isMember}}
+                                  {{if .T.isVip}}
+                                    <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/svip/ent_ser_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
+                                  {{else}}
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/ent_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
+                                  {{end}}
                                 {{else}}
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/svip/ent_ser_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
                                 {{end}}

src/web/templates/pc/supsearch.html

@@ -1176,7 +1176,7 @@ $(function(){
         <div class="tags-inputs">
           <div class="tag-input">
             <div class="tag-labels"></div>
-            <input type="text" class="clear-input">
+            <input type="text" class="clear-input" maxlength="5" oninput="this.value=this.value.replace(/\s+/g,'')">
             <div class="tag-placeholder">新增标签回车保存</div>
           </div>
           <div class="add-tag-button">添加并使用</div>