Merge branch 'dev/v4.8.34_dx' of qmx/jy into feature/v4.8.34

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

@@ -22,12 +22,11 @@ import (
 
 	. "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"
@@ -212,6 +211,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 			ssOpenid := s.Session().Get("s_m_openid")
 			po, bo, wo, obj := pcVRT(sid, industry, stype, true)
 			if obj != nil && len(obj) > 0 {
+
 				if len(po) > 0 {
 					s.T["projectOther"] = po
 				}
@@ -957,22 +957,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
@@ -982,9 +1002,9 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 // 未登录用户进行数据过滤 name 配置文件
 func SearchFilter(obj map[string]interface{}) map[string]interface{} {
 	//detail := fmt.Sprint(obj["detail"])
-	mosaicText := util.ObjToString(config.Sysconfig["detailMosaicTxt"])
+	mosaicText := ""
 	for k, _ := range obj {
-		needMosaic, _ := config.Sysconfig["searchMosaic"].(map[string]interface{})
+		needMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
 		if ok, _ := needMosaic[k].(bool); ok {
 			//if util.ObjToString(obj[k]) != "" {
 			//	detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), mosaicText)

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

@@ -373,23 +373,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.InterfaceToStr(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>');