Merge branch 'dev/v4.8.38_zxl' of qmx/jy into feature/v4.8.38

src/jfw/front/pcIndex.go

@@ -474,6 +474,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 	if userid := f.GetSession("userId"); userid != nil {
 		f.T["portraitpower"] = jylabutil.IsAuthorized(userid.(string), "i_portraitpower")
 	}
+	f.T["simpleTemplateData"] = map[string]interface{}{"simpleTemplateData": ""}
 	return f.Render("/pc/classifylist.html", &f.T)
 }
 

src/jfw/front/shorturl.go

@@ -21,11 +21,12 @@ import (
 	"app.yhyue.com/moapp/jybase/date"
 	mg "app.yhyue.com/moapp/jybase/mongodb"
 
-	elastic "app.yhyue.com/moapp/jybase/es"
 	"regexp"
 	"strings"
 	"time"
 
+	elastic "app.yhyue.com/moapp/jybase/es"
+
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -1127,6 +1128,41 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 			s.T["newBidInfoList"] = tg.GetNewBidInfo()
 			s.T["industryInfoList"] = tg.GetConsult()
 			s.T["hotLabelList"] = tg.GetHotLabel(30)
+			s.T["simpleTemplateData"] = map[string]interface{}{
+				"obj": map[string]interface{}{
+					"subtype":         obj["subtype"],
+					"purchasing":      obj["purchasing"],
+					"package":         obj["package"],
+					"fwtscode":        obj["fwtscode"],
+					"fwtsname":        obj["fwtsname"],
+					"s_winner":        obj["s_winner"],
+					"projectname":     obj["projectname"],
+					"title":           obj["title"],
+					"area":            obj["area"],
+					"city":            obj["city"],
+					"agency":          obj["agency"],
+					"buyer":           obj["buyer"],
+					"buyerperson":     obj["buyerperson"],
+					"buyertel":        obj["buyertel"],
+					"winnertel":       obj["winnertel"],
+					"winner_enttel":   obj["winner_enttel"],
+					"bidamount":       obj["bidamount"],
+					"winner":          obj["winner"],
+					"budget":          obj["budget"],
+					"_id":             obj["_id"],
+					"projectinfo":     obj["projectinfo"],
+					"href":            obj["href"],
+					"winnerMap":       obj["winnerMap"],
+					"entId":           obj["entId"],
+					"publishtime":     obj["publishtime"],
+					"industry":        obj["industry"],
+					"s_subscopeclass": obj["s_subscopeclass"],
+					"areaadd":         obj["areaadd"],
+					"stypeadd":        obj["stypeadd"],
+					"indadd":          obj["indadd"],
+					"type":            obj["type"],
+				},
+			}
 			content, _ := s.Render4Cache("/pc/tags/detail.html", &s.T)
 			redis.Put("newother", catchKey, string(content), 60*2)
 			return s.SetBody(content)

src/jfw/front/supsearch.go

@@ -550,6 +550,18 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 		p.T["portraitpower"] = jylabutil.IsAuthorized(userId, "i_portraitpower")
 	}
 	p.T["isLimit"] = isLimit
+	if module == "supsearch" {
+		p.T["simpleTemplateData"] = map[string]interface{}{
+			"isEntniche":      p.T["isEntniche"],
+			"isVip":           p.T["isVip"],
+			"isMember":        p.T["isMember"],
+			"vipBefore202209": p.T["vipBefore202209"],
+			"searchMode":      searchMode,
+			"searchvalue":     keywords,
+			"additionalWords": additionalWords,
+			"listLength":      util.If(list != nil, len(list), 0),
+		}
+	}
 	return p.Render("/pc/supsearch.html", &p.T)
 }
 

src/jfw/front/tags.go

@@ -253,6 +253,11 @@ func (this *Tags) Index(types, name string) {
 	this.T["url"] = this.Url()
 	this.T["filters"] = filters
 	this.T["nologin"] = qu.ObjToString(this.GetSession("userId")) == ""
+	this.T["simpleTemplateData"] = map[string]interface{}{
+		"filters":  filters,
+		"haveList": haveList,
+		"type":     types,
+	}
 	this.Render("/pc/tags/index.html", &this.T)
 }
 

src/web/templates/common/pnc.html

@@ -19,7 +19,7 @@
     // 全局模版变量
     window.goTemplateData = {
       inIframe: window.parent !== window,
-      params: {{.T}},
+      params: {{if .T.simpleTemplateData}} {{.T.simpleTemplateData}}  {{else}} {{.T}} {{end}},
       session: {
         s_avatar: {{session "s_avatar"}},
         s_headimageurl: {{session "s_headimageurl"}}

src/web/templates/pc/supsearch.html

@@ -1629,7 +1629,7 @@
         beforeSubmit('filter-mode')
       }
       if (mhModel && autoSwitchModel) {
-        if (goTemplateData.params.list) {
+        if (goTemplateData.params.listLength>0) {
           toastFn('精准搜索无结果，已为您自动切换到模糊搜索', 5000)
           autoSwitchModel = false
         } else {