feat:调整

src/config.json

@@ -397,8 +397,8 @@
     "winnertel":true,
     "agencyperson":true,
     "agencytel":true,
-    "budget":true,
-    "bidamount":true,
+    "budget":false,
+    "bidamount":false,
     "buyer": true,
     "winner": true,
     "s_winner": true,

src/jfw/front/shorturl.go

@@ -927,22 +927,42 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 	detail := fmt.Sprint(obj["detail"])
 	mosaicText := fmt.Sprintf(`<span onclick="openLoginDig(true)" style="cursor:pointer;color: #1D1D1D;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
 	detailText := fmt.Sprintf(`<span class="noLoginMosaic" style="color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
-	for k, _ := range obj {
-		if ok, _ := detailNeedMosaic[k].(bool); ok {
-			if util.ObjToString(obj[k]) != "" {
-				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-			}
-			//中标企业信息
-			if k == "winnerMap" && obj[k] != nil {
-				winnerNewMap := map[string]interface{}{}
-				winnerMap := util.ObjToMap(obj[k])
-				for _, wv := range *winnerMap {
-					winnerNewMap[mosaicText] = wv
-				}
-				obj[k] = winnerNewMap
-			} else {
-				obj[k] = mosaicText
+	//for k, _ := range obj {
+	//	if ok, _ := detailNeedMosaic[k].(bool); ok {
+	//		if util.ObjToString(obj[k]) != "" {
+	//			detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+	//		}
+	//		//中标企业信息
+	//		if k == "winnerMap" && obj[k] != nil {
+	//			winnerNewMap := map[string]interface{}{}
+	//			winnerMap := util.ObjToMap(obj[k])
+	//			for _, wv := range *winnerMap {
+	//				winnerNewMap[mosaicText] = wv
+	//			}
+	//			obj[k] = winnerNewMap
+	//		} else {
+	//			obj[k] = mosaicText
+	//		}
+	//	}
+	//}
+	//
+	for dk, dv := range detailNeedMosaic {
+		if !dv.(bool) {
+			continue
+		}
+		if util.ObjToString(obj[dk]) != "" {
+			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		}
+		//中标企业信息
+		if dk == "winnerMap" && obj[dk] != nil {
+			winnerNewMap := map[string]interface{}{}
+			winnerMap := util.ObjToMap(obj[dk])
+			for _, wv := range *winnerMap {
+				winnerNewMap[mosaicText] = wv
 			}
+			obj[dk] = winnerNewMap
+		} else {
+			obj[dk] = mosaicText
 		}
 	}
 	obj["detail"] = detail
@@ -1032,7 +1052,6 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 				obj = Filter(obj)
 				obj["description"] = fmt.Sprintf("%s，%s。", obj["title"], baseInfo(obj))
 			}
-			obj["agency"] = ""
 			if obj["publishtime"] != nil {
 				obj["publishtimeShorDate"] = time.Unix(util.Int64All(obj["publishtime"]), 0).Format(date.Date_Short_Layout)
 			}
@@ -1042,8 +1061,8 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 			s.T["industryInfoList"] = tg.GetConsult()
 			s.T["hotLabelList"] = tg.GetHotLabel(30)
 			content, _ := s.Render4Cache("/pc/tags/detail.html", &s.T)
-			timeout := 60 * 60 * 24
-			redis.Put("newother", catchKey, string(content), timeout)
+			//timeout := 60 * 60 * 24
+			//redis.Put("newother", catchKey, string(content), timeout)
 			return s.SetBody(content)
 		}
 	} else {

src/jfw/modules/app/src/app/front/shorturl.go

@@ -285,23 +285,42 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 	//mosaicText := fmt.Sprintf(`<span class="noLoginMosaic">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
 	mosaicText := fmt.Sprintf(`<span onclick="appAutoLogin()" style="cursor:pointer;color: #1D1D1D;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
 	detailText := fmt.Sprintf(`<span class="noLoginMosaic" style="color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
-	for k, _ := range obj {
-		detailNeedMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
-		if ok, _ := detailNeedMosaic[k].(bool); ok {
-			if util.ObjToString(obj[k]) != "" {
-				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
-			}
-			//中标企业信息
-			if k == "winnerMap" && obj[k] != nil {
-				winnerNewMap := map[string]interface{}{}
-				winnerMap := util.ObjToMap(obj[k])
-				for _, wv := range *winnerMap {
-					winnerNewMap[mosaicText] = wv
-				}
-				obj[k] = winnerNewMap
-			} else {
-				obj[k] = mosaicText
+	detailNeedMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
+	//for k, _ := range obj {
+	//	if ok, _ := detailNeedMosaic[k].(bool); ok {
+	//		if util.ObjToString(obj[k]) != "" {
+	//			detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+	//		}
+	//		//中标企业信息
+	//		if k == "winnerMap" && obj[k] != nil {
+	//			winnerNewMap := map[string]interface{}{}
+	//			winnerMap := util.ObjToMap(obj[k])
+	//			for _, wv := range *winnerMap {
+	//				winnerNewMap[mosaicText] = wv
+	//			}
+	//			obj[k] = winnerNewMap
+	//		} else {
+	//			obj[k] = mosaicText
+	//		}
+	//	}
+	//}
+	for dk, dv := range detailNeedMosaic {
+		if !dv.(bool) {
+			continue
+		}
+		if util.ObjToString(obj[dk]) != "" {
+			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
+		}
+		//中标企业信息
+		if dk == "winnerMap" && obj[dk] != nil {
+			winnerNewMap := map[string]interface{}{}
+			winnerMap := util.ObjToMap(obj[dk])
+			for _, wv := range *winnerMap {
+				winnerNewMap[mosaicText] = wv
 			}
+			obj[dk] = winnerNewMap
+		} else {
+			obj[dk] = mosaicText
 		}
 	}
 	obj["detail"] = detail

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

@@ -1463,11 +1463,11 @@ if (goTemplateData.params.isVip || goTemplateData.params.isMember || goTemplateD
 var bidamount_class=goTemplateData.params.obj.bidamount
 var budget_class=goTemplateData.params.obj.budget
 var amount=getacount(bidamount_class,budget_class)
-if (amount && amount!="" && amount !== '略'){
+if (amount && amount!=="" && amount !== '略'&& amount.indexOf("免费注册")===-1){
   $(".com-statusbar").append('<span class="com-amount"><a>'+conversionMoeny(amount)+'</a></span>');
 }
 //
-if(publishtime != ""){
+if(publishtime !== ""){
   var diff =goTemplateData.params.obj.publishtimeShorDate
   if(diff != null){
     $(".com-statusbar").append('<span class="com-time"><i class="glyphicon bofangjilu"></i>'+diff+'</span>');