Răsfoiți Sursa

feat:app三级页中标单位多个

zhangxinlei1996 3 ani în urmă
părinte
comite
86b5ad4404

+ 12 - 22
src/jfw/modules/app/src/app/front/shorturl.go

@@ -14,6 +14,7 @@ import (
 	"jfw/public"
 	"log"
 	"qfw/util"
+	"qfw/util/elastic"
 	"qfw/util/jy"
 	"qfw/util/redis"
 
@@ -125,31 +126,20 @@ func (s *Short) Article(stype, id string) error {
 			//获取打赏文案
 			//util.ReadConfig(&config.Sysconfig)
 			if obj["entidlist"] != nil { //大会员中标企业跳转至画像
-
-				if winner := util.ObjToString(obj["winner"]); winner != "" {
-					s_winner := util.ObjToString(obj["s_winner"])
-					idObjs, _ := obj["entidlist"].([]interface{})
-					winnerId := ""
-					if names := strings.Split(s_winner, ","); len(names) > 1 {
-						index := 0
-						for i := 0; i < len(names); i++ {
-							if names[i] == winner {
-								index = i
-								break
-							}
-						}
-						if len(idObjs) > index {
-							winnerId = util.ObjToString(idObjs[index])
+				entIdArr, winnerMap := []string{}, map[string]interface{}{}
+				for _, v := range strings.Split(util.ObjToString(obj["s_winner"]), ",") {
+					winnerMap[v] = ""
+					//临时更改为企业名称查询企业id
+					rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":"%s"}},{"term":{"hname":"%s"}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, v, v))
+					if rData != nil && len(*rData) == 1 {
+						if entId := util.ObjToString((*rData)[0]["_id"]); entId != "" {
+							entIdArr = append(entIdArr, util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"])))
+							winnerMap[v] = util.EncodeArticleId2ByCheck(util.ObjToString((*rData)[0]["_id"]))
 						}
-					} else { //中标企业仅一个
-						if len(idObjs) > 0 {
-							winnerId = util.ObjToString(idObjs[0])
-						}
-					}
-					if winnerId != "" && winnerId != "-" {
-						obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
 					}
 				}
+				obj["entId"] = entIdArr
+				obj["winnerMap"] = winnerMap
 			}
 			s.T["userId"] = se.Encode2Hex(userId) //加密用户userid
 			if false && obj["winnertel"] == nil && isbid(obj["subtype"]) {

+ 15 - 6
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -2111,16 +2111,13 @@
       $("#baseInfo ul").html(outhtml);
       //中标信息
       if(isbid){
-          var rerwinner = {{.T.obj.winner}};
+          var rerwinner = {{.T.obj.winnerMap}};
           var rerwinnerEntId = {{.T.obj.entId}};
           var rerwinner_show = ""
           if(rerwinner==null){
               rerwinner=""
               rerwinner_show = "hide"
           }
-          if (rerwinner && rerwinner.indexOf(',') !== -1) {
-            rerwinner = rerwinner.split(',')[0]
-          }
           var rerbidamount = {{.T.obj.bidamount}};
           if(rerbidamount==null){
               rerbidamount=""
@@ -2138,8 +2135,20 @@
           }
 
           if(count>=5){
+            	var bidInfohtml='<li><p class="name">中标单位</p><div style="flex: 1;">'
+              var indexN =0;
+              var winnerArr =[];
+              for (let i in rerwinner){
+                winnerArr.push(i)
+              }
               $("#bidInfoTitle").show();
-              var bidInfohtml ='<li class="zhongbiaounit" data-eid="'+ rerwinnerEntId +'"><p class="name">中标单位</p><div class="unitcenter"><p class="textcontent">'+rerwinner+'</p><div class="unitbtn '+rerwinner_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></li>'
+              for (x in rerwinner){
+                  indexN++
+                	bidInfohtml +='<span  class="zhongbiaounit winners" data-eid="'+rerwinner[x]+'" style="text-decoration-line: underline;color: #2ABED1;">'+x+'</span>'
+                  if (winnerArr.length!=indexN){
+                    bidInfohtml += '<span class="winners" style="color: #2ABED1;">、</span>'
+                  }
+              }
               bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p></li>'
               if(winnertel!=""){
                   bidInfohtml +='<li class="bbm0 winnertel bigwinnertel" style="position: relative; margin-bottom: 10px;border-bottom: 0px !important"><p class="name">联系方式</p>'
@@ -2208,7 +2217,7 @@
         if (rerwinner!=""&&rerwinner!=null){
             sessionStorage.removeItem('$data-ent_portrait')
             if (rerwinnerEntId) {
-                location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent(rerwinnerEntId)
+                location.href = "/jyapp/big/page/ent_portrait?eId="+encodeURIComponent($(this).attr("data-eid"))
             } else {
                 EasyAlert.show("暂无数据");
             }