Merge branch 'master' into feature/v4.8.92

src/jfw/front/nzjProject.go

@@ -383,7 +383,6 @@ func getNzjList(infoMap map[string]interface{}) (count int64, list *[]map[string
 	if isEmpty(infoMap) {
 		return nzjEmptySearch(pageNum, pageSize)
 	}
-
 	categoryCodeArr := public.GlobalCommonMysql.SelectBySql(fmt.Sprintf(`SELECT category_code FROM Jianyu_subjectdb.dwd_f_nzj_category_rule WHERE stage_info = '%s'`, common.InterfaceToStr(infoMap["keyWord"])))
 	if categoryCodeArr != nil && len(*categoryCodeArr) > 0 {
 		var codes []string
@@ -393,18 +392,10 @@ func getNzjList(infoMap map[string]interface{}) (count int64, list *[]map[string
 		infoMap["keyCode"] = codes
 	}
 	musts := esQuery(infoMap)
-	if pageNum == 1 {
-		count = elastic.Count(proposed, proposed, fmt.Sprintf(`{"query": {"bool": {"must": [%s]}}}`, strings.Join(musts, ",")))
-		if count == 0 {
-			return count, nil
-		}
-		if count > common.Int64All(config.Sysconfig["nzjLimit"]) {
-			count = common.Int64All(config.Sysconfig["nzjLimit"])
-		}
-	}
-
-	list = elastic.Get(proposed, proposed, fmt.Sprintf(`{"query": {"bool": {"must": [%s]}},"_source":["projectname","area","area_city","lasttime","project_stage","ownerclass","proposed_id","category","project_stage"],"sort":[{"lasttime":{"order":"desc"}}],"from":%d,"size":%d}`, strings.Join(musts, ","), (pageNum-1)*pageSize, pageSize))
-	if list != nil && len(*list) > 0 {
+	var listArr []map[string]interface{}
+	_, count, listArr = elastic.GetAggs(proposed, proposed, fmt.Sprintf(`{"track_total_hits": true,"query": {"bool": {"must": [%s]}},"_source":["projectname","area","area_city","lasttime","project_stage","ownerclass","proposed_id","category","project_stage"],"sort":[{"lasttime":{"order":"desc"}}],"from":%d,"size":%d}`, strings.Join(musts, ","), (pageNum-1)*pageSize, pageSize))
+	if listArr != nil && len(listArr) > 0 {
+		list = &listArr
 		for _, v := range *list {
 			v["proposed_id"] = encrypt.SE2.Encode2Hex(common.InterfaceToStr(v["proposed_id"]))
 			//v["lasttime"] = MillisecondsToStr(common.Int64All(v["lasttime"]))
@@ -413,6 +404,10 @@ func getNzjList(infoMap map[string]interface{}) (count int64, list *[]map[string
 			}
 		}
 	}
+
+	if count > common.Int64All(config.Sysconfig["nzjLimit"]) {
+		count = common.Int64All(config.Sysconfig["nzjLimit"])
+	}
 	return
 }
 

src/jfw/front/shorturl.go

@@ -141,7 +141,7 @@ func (s *Short) Article(stype, id string) error {
 func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bool) error {
 	log.Println(stype, "----stype:---", id)
 	//电脑端 剑鱼快照页面访问
-	if stype == "content" && !bm {
+	if !bm {
 		//工作桌面内嵌 快照页
 		//老地址（地址不包含aside）且非工作桌面地址
 		if !strings.Contains(s.Request.URL.String(), "aside") && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
@@ -819,7 +819,7 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 	//大会员中标企业跳转至画像
 	if obj["entidlist"] != nil {
 		if s_winner := util.ObjToString(obj["s_winner"]); s_winner != "" {
-			entIdArr, winnerMap := []string{}, map[string]interface{}{}
+			entIdArr, winnerMap, winnerSeoMap := []string{}, map[string]interface{}{}, map[string]interface{}{}
 			swinnerArr := strings.Split(s_winner, ",")
 			eidList, _ := obj["entidlist"].([]interface{})
 			//先查询entlist 如果长度和s_winner不一致 根据企业名称查询id
@@ -831,10 +831,9 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 					if rData != nil && len(*rData) == 1 {
 						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
 							entIdArr = append(entIdArr, encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
-							if b {
-								winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
-							} else {
-								winnerMap[v] = (*rData)[0]["nseo_id"]
+							winnerMap[v] = encrypt.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
+							if !b {
+								winnerSeoMap[v] = (*rData)[0]["nseo_id"]
 							}
 						}
 					}
@@ -845,15 +844,15 @@ func FieldProcessing(obj map[string]interface{}, ssOpenid interface{}, industry,
 					if vstr == "-" || vstr == "" {
 						continue
 					}
-					if b {
-						winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
-					} else {
-						winnerMap[swinnerArr[k]] = EsSeoId(true, vstr)
+					winnerMap[swinnerArr[k]] = encrypt.EncodeArticleId2ByCheck(vstr)
+					if !b {
+						winnerSeoMap[swinnerArr[k]] = EsSeoId(true, vstr)
 					}
 				}
 			}
 			obj["entId"] = entIdArr
 			obj["winnerMap"] = winnerMap
+			obj["winnerSeoMap"] = winnerSeoMap
 		}
 	}
 	//移动端需要处理--剑鱼币

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,14 @@ 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 +350,12 @@ var bidNode = {
         return
       }
 	    if (sessionStorage.getItem(id)&& sessionStorage.getItem(id)!=""){
-		    _this.winnerInfo= JSON.parse(sessionStorage.getItem(id))
-		    return
-	   }
+        var winnerI = JSON.parse(sessionStorage.getItem(id))
+        for (var key in winnerI) {
+          _this.$set(_this.winnerInfo, key, winnerI[key])
+        }
+        return
+	    }
 //      _this.portraitLoaded.winner = true;
       $.ajax({
         type: 'POST',
@@ -385,8 +397,12 @@ var bidNode = {
             })
           }
         }
-        _this.winnerInfo = res.data
-        sessionStorage.setItem(id,JSON.stringify(res.data))
+        // _this.winnerInfo = res.data
+        var dataMap = res.data
+        for (var key in dataMap) {
+          _this.$set(_this.winnerInfo, key, dataMap[key])
+        }
+        sessionStorage.setItem(id,JSON.stringify(_this.winnerInfo))
       } ,
         error:function (){
           _this.portraitLoaded.winner = false;
@@ -1576,15 +1592,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>