Merge branch 'dev/v4.8.93.1_cyl' of qmx/jy into hotfix/v4.8.93.1

src/web/staticres/public-pc/js/article-content.js

@@ -91,7 +91,10 @@ var bidNode = {
       ],
     },
     buyerInfo: {},
-    winnerInfo: {}
+    winnerInfo: {
+      company_name: '',
+      winnerSeoId: '',
+    }
   },
   created () {
     this.getBidInfo()
@@ -331,8 +334,13 @@ var bidNode = {
       }
     })
     },
-    setMouseover: function (data) {
-		this.getWinnerFreeData(data)
+    setMouseover: function (entName, entId) {
+      this.winnerInfo.company_name = entName
+      var winnerSeoMap = goTemplateData.params.obj.winnerSeoMap
+      if (winnerSeoMap) {
+        this.winnerInfo.winnerSeoId = winnerSeoMap[entName]
+      }
+		  this.getWinnerFreeData(entId)
     },
     // 中标企业画像免费数据
     getWinnerFreeData: function(id) {
@@ -341,9 +349,9 @@ var bidNode = {
         return
       }
 	    if (sessionStorage.getItem(id)&& sessionStorage.getItem(id)!=""){
-		    _this.winnerInfo= JSON.parse(sessionStorage.getItem(id))
-		    return
-	   }
+		    _this.$set(_this, 'winnerInfo', JSON.parse(sessionStorage.getItem(id)))
+        return
+	    }
 //      _this.portraitLoaded.winner = true;
       $.ajax({
         type: 'POST',
@@ -385,7 +393,8 @@ var bidNode = {
             })
           }
         }
-        _this.winnerInfo = res.data
+        // _this.winnerInfo = res.data
+        _this.$set(_this, 'winnerInfo', res.data)
         sessionStorage.setItem(id,JSON.stringify(res.data))
       } ,
         error:function (){
@@ -1576,15 +1585,17 @@ $(function(){
       }
     }
     //中标单位由一个改为多个
-    var winnerMap = goTemplateData.params.obj.winnerMap;
-    if(!winnerMap){
+    // var winnerMap = goTemplateData.params.obj.winnerMap;
+    var winnerSeoMap = goTemplateData.params.obj.winnerSeoMap
+    if(!winnerSeoMap){
       return;
     }
-    var winnerId = winnerMap[$(this).text()]
-    if (!winnerId) {
+    // var winnerId = winnerMap[$(this).text()]
+    var winnerSeoId = winnerSeoMap[$(this).text()]
+    if (!winnerSeoId) {
       return
     }
-    return window.open('/qy/' + winnerId + '.html')
+    return window.open('/qy/' + winnerSeoId + '.html')
   	var memberLink = "/swordfish/page_big_pc/ent_portrait/" + winnerMap[$(this).text()]
     var vipLink = "/swordfish/page_big_pc/svip/ent_ser_portrait/" + winnerMap[$(this).text()]
     if (resource === "BI") {

src/web/staticres/tags/js/no-login-detail.js

@@ -1006,15 +1006,17 @@ $(function(){
       }
     }
     //中标单位由一个改为多个
-    var winnerMap = goTemplateData.params.obj.winnerMap;
-    if(!winnerMap){
+    // var winnerMap = goTemplateData.params.obj.winnerMap;
+    var winnerSeoMap = goTemplateData.params.obj.winnerSeoMap
+    if(!winnerSeoMap){
       return;
     }
-    var winnerId = winnerMap[$(this).text()]
-    if (!winnerId) {
+    // var winnerId = winnerMap[$(this).text()]
+    var winnerSeoId = winnerSeoMap[$(this).text()]
+    if (!winnerSeoId) {
       return
     }
-    return window.open('/qy/' + winnerId + '.html')
+    return window.open('/qy/' + winnerSeoId + '.html')
   	var memberLink = "/swordfish/page_big_pc/ent_portrait/" + winnerMap[$(this).text()]
     var vipLink = "/swordfish/page_big_pc/svip/ent_ser_portrait/" + winnerMap[$(this).text()]
     if (isMember) {

src/web/templates/pc/biddetail_rec.html

@@ -1278,7 +1278,7 @@
                                             trigger="hover">
                                         <div slot="reference">
                                             {{ range $index, $value := .T.obj.winnerMap }}
-                                            <span class="cont-cont portrait_img no-show-tip winners"  @mouseenter="setMouseover('{{$value}}')">{{$index}}</span>
+                                            <span class="cont-cont portrait_img no-show-tip winners"  @mouseenter="setMouseover('{{$index}}', '{{$value}}')">{{$index}}</span>
                                             <span class='winner-point'>、</span>
                                             {{end}}
                                         </div>
@@ -1338,7 +1338,8 @@
                                                         </div>
                                                     </div>
                                                     <div class="bidfoot">
-                                                        <div class="bid_button_cancel bid_btn" @click="window.open(`/swordfish/page_big_pc/svip/ent_ser_portrait/${winnerInfo.entid}`)">查看详情</div>
+                                                        <div class="bid_button_cancel bid_btn" v-if="winnerInfo.winnerSeoId" @click="window.open(`/qy/${winnerInfo.winnerSeoId}.html`)">查看详情</div>
+                                                        <div class="bid_button_cancel bid_btn" v-else @click="window.open(`/swordfish/page_big_pc/svip/ent_ser_portrait/${winnerInfo.entid}`)">查看详情</div>
                                                         <div class="bid_button_confirm bid_btn" @click="goCollect('article_ent_portrait')">一键预约</div>
                                                     </div>
                                                 </div>