Merge remote-tracking branch 'origin/dev4.5.2' into dev4.5.2

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

@@ -118,7 +118,8 @@ var vNode = {
                 usage: 0, // 本月已使用次数
                 provin: 0, // 购买省份数量
                 visited: false // 是否查看中标信息
-            }
+            },
+            portrait:'winner'
         }
     },
     created: function () {
@@ -204,7 +205,7 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
         },
         surplus: function () {
             return this.entvisit.total >= this.entvisit.usage
@@ -259,7 +260,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 +384,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'
@@ -498,6 +499,7 @@ var vNode = {
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
                                 _this.getEntVisits()
+                                _this.portrait = 'winnerVip'
                             }
                             _this.singleTab = false
                         }

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

@@ -258,7 +258,7 @@
                     <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>
                 </div>
                 <div class="bg-white tab-card cell-list history-list" v-if="conf._4 && tabActiveName == '2' && !getStatus">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                    <hispro-component :type="portrait" :id="entInfo.id"></hispro-component>
                 </div>
                 <div class="vip_component" v-if="getStatus" 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>

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/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html

@@ -16,9 +16,9 @@
     <div class="j-main portraited" id="proRecord" v-cloak>
       <div class="j-container">
         <div class="j-main">
-          <div class="t-bg flex">
+          <div class="t-bg flex" style="min-height:3.28rem;">
             <div class="nums">
-              <span>{points.total}</span>个
+              <span>{points.total - points.usage}</span>个
               <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
             </div>
             <div class="btns flex">

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -24,11 +24,6 @@
     {{include "/common/js.html"}}
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js'></script>
     <title>搜索</title>
-    <script>
-        try{
-            JyObj.hiddenBottom("1");
-        }catch(e){}
-    </script>
 </head>
 <body class="p13" id="home_main" data-weui-theme="light">
 <style>
@@ -175,10 +170,10 @@
                         <div class="jy_sprite_home_icon icon_1"></div>
                         <span>投标决策</span>
                     </a>
-                    <!-- <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
+                    <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
                         <div class="jy_sprite_home_icon_add icon_9"></div>
                         <span>潜在项目预测</span>
-                    </a> -->
+                    </a>
                     <a class="tab_item" data-only-name="中标企业预测" id="mainSearch-tab3">
                         <div class="jy_sprite_home_icon icon_3"></div>
                         <span>中标企业预测</span>
@@ -190,11 +185,7 @@
                     <a class="tab_item" data-only-name="剑鱼文库" id="">
                       <div class="jy_sprite_home_icon icon_2"></div>
                       <span>剑鱼文库</span>
-                    </a>
-                    <a class="tab_item" data-only-name="剑鱼伙伴" id="mainSearch-tab2">
-                        <div class="jy_sprite_home_icon_add icon_9"></div>
-                        <span>剑鱼伙伴</span>
-                    </a>
+                  </a>
                 </div>
                 <div class="tab_container">
                     <a class="tab_item" data-only-name="数据导出" id="mainSearch-tab5">
@@ -957,17 +948,17 @@
                     }
                     break
                 }
-                // case '潜在项目预测': {
-                //     sessionStorage.setItem('landinfo', JSON.stringify({
-                //         anchor: '潜在项目预测'
-                //     }))
-                //     if ($this.attr('data-access')) {
-                //         window.location.href = '/jyapp/big/page/forecast_list';
-                //     } else {
-                //         location.href = '/jyapp/big/page/landingPage';
-                //     }
-                //     break
-                // }
+                case '潜在项目预测': {
+                    sessionStorage.setItem('landinfo', JSON.stringify({
+                        anchor: '潜在项目预测'
+                    }))
+                    if ($this.attr('data-access')) {
+                        window.location.href = '/jyapp/big/page/forecast_list';
+                    } else {
+                        location.href = '/jyapp/big/page/landingPage';
+                    }
+                    break
+                }
                 case '中标企业预测':  {
                     sessionStorage.setItem('landinfo', JSON.stringify({
                         anchor: '中标企业预测'
@@ -1018,24 +1009,6 @@
                     }
                     break
                 }
-                case '剑鱼伙伴': {
-                    if(userId==""){
-                        window.location.href='/jyapp/free/login?back=index';
-                    }else{
-                        $.ajax({
-                            url: '/distribution/partner/isPartner?t=' + new Date().getTime(),
-                            type: 'POST',
-                            success: function (r) {
-                                if (r.isPartner) {
-                                    window.location.href = "/page_partner/home"
-                                } else {
-                                    window.location.href = "/page_partner/partner/partner.html" // 协议页面
-                                }
-                            }
-                        })
-                    }
-                    break
-                }
                 case '签到': {
                     if(userId==""){
                         window.location.href='/jyapp/free/login?back=index';

src/jfw/modules/weixin/src/github.com/wizjin/weixin/weixin.go

@@ -792,13 +792,18 @@ func (wx *Weixin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			log.Println("Weixin parse message failed:", err)
 			http.Error(w, "", http.StatusBadRequest)
 		} else {
-			if msg.Event == EventTemplateSent || msg.Event == EventView {
+			//update by wcj on 2021-07-29
+			//update before
+			/*if msg.Event == EventTemplateSent || msg.Event == EventView {
 				http.Error(w, "", http.StatusNotFound)
 			} else {
 				wx.routeRequest(w, &msg)
-			}
+			}*/
+			//update after
+			wx.routeRequest(w, &msg)
 		}
 	}
+	w.Write([]byte("success")) //add by wcj on 2021-07-30
 	return
 }
 
@@ -819,7 +824,7 @@ func (wx *Weixin) routeRequest(w http.ResponseWriter, r *Request) {
 		route.handler(writer, r)
 		return
 	}
-	http.Error(w, "", http.StatusNotFound)
+	//http.Error(w, "", http.StatusNotFound)
 	return
 }
 

src/jfw/modules/weixin/src/wx/wx.go

@@ -109,10 +109,20 @@ func MenuClickHandler(w ResponseWriter, r *Request) {
 	clickButtonKey := r.EventKey
 	if replyText, ok := menuClickReplyTextMap[clickButtonKey]; ok {
 		w.PostText(replyText)
-		//二维码
-		mediaId, err := w.UploadMediaFromFile("image", tools.BusinessCoop)
+		CBKey := fmt.Sprintf("%s_%d", clickButtonKey, time.Now().Day())
+		mediaId := redis.GetStr("other", CBKey)
+		if mediaId == "" {
+			//二维码
+			_mediaId, err := w.UploadMediaFromFile("image", tools.BusinessCoop)
+			if _mediaId != "" && err == nil {
+				mediaId = _mediaId
+			}
+		}
 		// log.Println(mediaId, "--", err, "--", tools.BusinessCoop)
-		if mediaId != "" && err == nil {
+		if mediaId != "" {
+			go func() {
+				redis.Put("other", CBKey, mediaId, 24*60*60)
+			}()
 			w.PostImage(mediaId)
 		}
 	}

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

@@ -116,7 +116,8 @@ var vNode = {
                 usage: 0, // 本月已使用次数
                 provin: 0, // 购买省份数量
                 visited: false // 是否查看中标信息
-            }
+            },
+            portrait:'winner'
         }
     },
     created: function () {
@@ -203,7 +204,7 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
         },
         surplus: function () {
             return this.entvisit.total >= this.entvisit.usage
@@ -259,9 +260,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 +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'
@@ -498,6 +498,7 @@ var vNode = {
                                 _this.entInfo.followSearchFinish = true
                                 _this.entInfo.entExist = false
                                 _this.getEntVisits()
+                                _this.portrait = 'winnerVip'
                             }
                             _this.singleTab = false
                         }

src/web/staticres/common-module/collection/js/history-project.js

@@ -83,9 +83,12 @@ var hisproComponent = {
       if(this.type == 'winner') {
         item.url = '/bigmember/portrait/winner/contacts'
         item.datas.entId = this.id
-      } else {
+      } else if(this.type == 'buyer') {
         item.url = '/bigmember/portrait/buyer/contacts'
         item.datas.buyer = this.buyer
+      } else {
+        loading.clear()
+        return
       }
       $.ajax({
         type: "POST",

src/web/staticres/common-module/collection/js/index-wx.js

@@ -76,12 +76,13 @@ var vNode = {
   },
   created () {
     var recover = this.recover()
-    if (!recover) {
-      let lid = utils.getParam('tag')
+    let lid = utils.getParam('tag')
       if(lid) {
         lid = decodeURIComponent(lid)
         this.getTagsList(lid)
-      }else{
+      }
+    if (!recover) {
+      if(!lid) {
         this.getList()
         this.getTagsList()
       }

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

@@ -75,12 +75,13 @@ var vNode = {
   },
   created () {
     var recover = this.recover()
+    let lid = utils.getParam('tag')
+    if(lid) {
+      lid = decodeURIComponent(lid)
+      this.getTagsList(lid)
+    }
     if (!recover) {
-      let lid = utils.getParam('tag')
-      if(lid) {
-        lid = decodeURIComponent(lid)
-        this.getTagsList(lid)
-      }else{
+      if(!lid) {
         this.getList()
         this.getTagsList()
       }

src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -90,7 +90,7 @@ var vm = new Vue({
       }).done(res => {
         if (res.error_code == 0) {
           this.points = res.data
-          if (res.data.total == 0) {
+          if (res.data.provin === -1 && res.data.total == 0) {
             this.contracted = true
             this.$dialog.alert({
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
@@ -117,7 +117,7 @@ var vm = new Vue({
           }
         }
 
-        if (r.data.list) {
+        if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           var _this = this
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
@@ -132,6 +132,8 @@ var vm = new Vue({
               checked: false
             }
           }))
+        } else {
+          this.listInfo.finished = true
         }
 
         this.listInfo.loading = false
@@ -159,16 +161,29 @@ var vm = new Vue({
     },
     helpTiped() {
       let _this = this
-      this.$dialog.alert({
-        message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
-        className: 'pro-log',
-        messageAlign: 'left',
-        confirmButtonColor: '#2ABED1',
-        confirmButtonText: '前往升级',
-        closeOnClickOverlay: true
-      }).then(() => {
-        location.href = '/front/vipsubscribe/toSubVipSetPage'
-      })
+      if (_this.points.provin === -1&&_this.points.usage !== _this.points.total) {
+        this.$dialog.alert({
+          message: '每订购1个省，可查看50个企业画像/月。',
+          className: 'pro-log',
+          messageAlign: 'left',
+          confirmButtonColor: '#2ABED1',
+          confirmButtonText: '我知道了',
+          closeOnClickOverlay: true
+        }).then(() => {
+          // location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+        })
+      } else {
+        this.$dialog.alert({
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
+          className: 'pro-log',
+          messageAlign: 'left',
+          confirmButtonColor: '#2ABED1',
+          confirmButtonText: '前往升级',
+          closeOnClickOverlay: true
+        }).then(() => {
+          location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+        })
+      }
     },
     confirmed(val) {
       this.years = val.getFullYear()

src/web/staticres/common-module/portraitRecord/js/index.js

@@ -90,7 +90,7 @@ var vm = new Vue({
       }).done(res => {
         if (res.error_code == 0) {
           this.points = res.data
-          if (res.data.total == 0) {
+          if (res.data.provin === -1 && res.data.total == 0) {
             this.contracted = true
             this.$dialog.alert({
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
@@ -117,7 +117,7 @@ var vm = new Vue({
           }
         }
 
-        if (r.data.list) {
+        if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           var _this = this
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
@@ -132,6 +132,8 @@ var vm = new Vue({
               checked: false
             }
           }))
+        } else {
+          this.listInfo.finished = true
         }
 
         this.listInfo.loading = false
@@ -159,16 +161,29 @@ var vm = new Vue({
     },
     helpTiped() {
       let _this = this
-      this.$dialog.alert({
-        message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
-        className: 'pro-log',
-        messageAlign: 'left',
-        confirmButtonColor: '#2ABED1',
-        confirmButtonText: '前往升级',
-        closeOnClickOverlay: true
-      }).then(() => {
-        location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
-      })
+      if (_this.points.provin === -1&&_this.points.usage !== _this.points.total) {
+        this.$dialog.alert({
+          message: '每订购1个省，可查看50个企业画像/月。',
+          className: 'pro-log',
+          messageAlign: 'left',
+          confirmButtonColor: '#2ABED1',
+          confirmButtonText: '我知道了',
+          closeOnClickOverlay: true
+        }).then(() => {
+          // location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+        })
+      } else {
+        this.$dialog.alert({
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
+          className: 'pro-log',
+          messageAlign: 'left',
+          confirmButtonColor: '#2ABED1',
+          confirmButtonText: '前往升级',
+          closeOnClickOverlay: true
+        }).then(() => {
+          location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+        })
+      }
     },
     confirmed(val) {
       this.years = val.getFullYear()

src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -41,7 +41,7 @@ var vm = new Vue({
             statusEnum: ['存续', '吊销', '注销', '撤销'],
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
             seeList: {
-                pageNum: 1, // 当前页
+                pageNum: 0, // 当前页
                 pageSize: 50, // 每页多少条数据
                 total: 0, // 总页数
                 list: [] // 返回的数据
@@ -88,13 +88,14 @@ var vm = new Vue({
             }).done(res => {
                 var _this = this
                 if (res.error_code == 0 && res.data.list) {
-                    if (res.data.count) {
-                        this.listState.total = res.data.count
+                    if (res.data.total) {
+                        this.listState.total = res.data.total
                     }
                     res.data.list.forEach(v => {
                         const arrs = {
                             name: v.company_name,
-                            abbr: getShortName(v.company_name),
+                            abbr1: getShortName(v.company_name).substring(0,2),
+                            abbr2: getShortName(v.company_name).substring(2,4),
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
                             legal: v.legal_person,
                             money: v.capital,

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/staticres/vipsubscribe/js/historypush.js

@@ -83,7 +83,7 @@ var vm = new Vue({
         }
       })
     }
-    utils.iosBackRefresh()
+    // utils.iosBackRefresh()
   },
   methods: {
     recover: function () {

src/web/templates/frontRouter/pc/seeHistory/sess/index.html

@@ -47,9 +47,9 @@
             </div>
         </div>
         <div class="see-content w" v-show="seeList.length !== 0">
-            <div class="lists flex" v-for="item in seeList" :key="item._id">
+            <div class="lists flex" v-for="item in seeList.list" :key="item._id">
                 <div class="words-img" :style="{'background-color': item.color}" @click="detailed(item._id)">
-                    <span>{item.abbr.substring(0,2)}</span><span class="xin-xi">{item.abbr.substring(2,4)}</span>
+                    <span>{item.abbr1}</span><span class="xin-xi">{item.abbr2}</span>
                 </div>
                 <div class="r-conts flex">
                     <h3 class="flex" @click="detailed(item._id)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>

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

@@ -263,7 +263,7 @@
                     <vip-component @tabactive="tabActive" 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" v-if="conf._4 && tabActiveName == '2' && !getStatus">
-                    <hispro-component type="winner" :id="entInfo.id"></hispro-component>
+                    <hispro-component :type="portrait" :id="entInfo.id"></hispro-component>
                 </div>
                 <div class="vip_component" v-if="getStatus" 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>

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/frontRouter/wx/portraitRecord/sess/index.html

@@ -32,7 +32,7 @@
         <div class="j-main">
           <div class="t-bg flex">
             <div class="nums">
-              <span>{points.total}</span>个
+              <span>{points.total - points.usage}</span>个
               <img src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
             </div>
             <div class="btns flex">

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}}
@@ -569,7 +573,7 @@ function isWechat() {
 						infoId:{{.T.obj._id}}
 					},
 					success:function(data){
-						if(data.data.attachment !=null && data.data.attachment.length!==0){
+						if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
 							var html = ''
 							for(var i=0;i<data.data.attachment.length;i++) {
 								html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' href="+data.data.attachment[i].downurl+">"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"

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>