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

src/config.json

@@ -399,7 +399,7 @@
     "agencytel":true,
     "budget":false,
     "bidamount":false,
-    "buyer": true,
+    "buyerclass": true,
     "winner": true,
     "s_winner": true,
     "winnerMap": true

src/jfw/front/shorturl.go

@@ -19,8 +19,7 @@ import (
 
 	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
-
-	. "app.yhyue.com/moapp/jybase/mongodb"
+	mg "app.yhyue.com/moapp/jybase/mongodb"
 
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"regexp"
@@ -277,7 +276,7 @@ func (s *Short) LoginCommon(userId, stype, id string) error {
 	if userId == "" && ssOpenid != nil {
 		res, ok = mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid, "s_unionid": bson.M{"$ne": ssOpenid}}, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1,"l_vip_starttime":1}`)
 		if ok {
-			userId = BsonIdToSId((*res)["_id"])
+			userId = mg.BsonIdToSId((*res)["_id"])
 		}
 	} else if userId != "" {
 		//判断用户是否是vip
@@ -704,7 +703,7 @@ func UserPermission(userId string, ssOpenid interface{}) (bool, bool, bool) {
 	)
 	if userId == "" && ssOpenid != nil {
 		res, _ = mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid, "s_unionid": bson.M{"$ne": ssOpenid}}, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
-		userId = BsonIdToSId((*res)["_id"])
+		userId = mg.BsonIdToSId((*res)["_id"])
 	} else {
 		//判断用户是否是vip
 		res = jyutil.Compatible.Select(userId, `{"i_vip_status":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
@@ -912,7 +911,7 @@ func getwinnertel(company interface{}) string {
 func GetUserId(openid string) string {
 	data, ok := public.MQFW.FindOne("user", map[string]interface{}{"s_m_openid": openid})
 	if data != nil && len(*data) > 0 && ok {
-		userid := BsonIdToSId((*data)["_id"])
+		userid := mg.BsonIdToSId((*data)["_id"])
 		return userid
 	}
 	return ""
@@ -955,7 +954,7 @@ func ReplaceStringByRegex(str, rule, replace string) (string, error) {
 // 未登录用户进行数据过滤 name 配置文件
 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: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	mosaicText := fmt.Sprintf(`<span 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 {
@@ -984,11 +983,13 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
 		}
 		//中标企业信息
-		if dk == "winnerMap" && obj[dk] != nil {
+		if dk == "winnerMap" {
 			winnerNewMap := map[string]interface{}{}
-			winnerMap := util.ObjToMap(obj[dk])
-			for _, wv := range *winnerMap {
-				winnerNewMap[mosaicText] = wv
+			if obj[dk] != nil {
+				winnerMap := util.ObjToMap(obj[dk])
+				for _, wv := range *winnerMap {
+					winnerNewMap[mosaicText] = wv
+				}
 			}
 			obj[dk] = winnerNewMap
 		} else {
@@ -1002,31 +1003,53 @@ 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 := ""
-	for k, _ := range obj {
-		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)
-			//	//敏感词过滤
-			//}
-			if k == "winnerMap" {
-				winnerMap, _ := obj[k].(map[string]interface{})
-				mosaicMap := map[string]interface{}{}
-				for i := 0; i < len(winnerMap); i++ {
-					mosaicMap[mosaicText] = mosaicText
-				}
-				obj["winnerMap"] = mosaicMap
-			} else {
-				obj[k] = mosaicText
-			}
-
-		}
-	}
+	//mosaicText := fmt.Sprintf(`<span style="cursor:pointer;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	//for k, _ := range obj {
+	//	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)
+	//		//	//敏感词过滤
+	//		//}
+	//		if k == "winnerMap" {
+	//			winnerMap, _ := obj[k].(map[string]interface{})
+	//			mosaicMap := map[string]interface{}{}
+	//			for i := 0; i < len(winnerMap); i++ {
+	//				mosaicMap[mosaicText] = mosaicText
+	//			}
+	//			obj["winnerMap"] = mosaicMap
+	//		} else {
+	//			obj[k] = mosaicText
+	//		}
+	//
+	//	}
+	//}
 	//数字打码
 	//detail = RegDetail(detail)
 	//detail = fsw.Repl(detail)
 	//obj["detail"] = detail
+
+	if detailNeedMosaic == nil {
+		detailNeedMosaic, _ = config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
+	}
+	for dk, dv := range detailNeedMosaic {
+		if !dv.(bool) {
+			continue
+		}
+		//中标企业信息
+		if dk == "winnerMap" {
+			winnerNewMap := map[string]interface{}{}
+			if obj[dk] != nil {
+				winnerMap := util.ObjToMap(obj[dk])
+				for _, wv := range *winnerMap {
+					winnerNewMap[util.ObjToString(config.Sysconfig["detailMosaic"])] = wv
+				}
+			}
+			obj[dk] = winnerNewMap
+		} else {
+			obj[dk] = util.ObjToString(config.Sysconfig["detailMosaic"])
+		}
+	}
 	return obj
 }
 

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

@@ -371,7 +371,7 @@ func NoLoginArticle(stype, sid string) map[string]interface{} {
 func Filter(obj map[string]interface{}) map[string]interface{} {
 	detail := fmt.Sprint(obj["detail"])
 	//mosaicText := fmt.Sprintf(`<span class="noLoginMosaic">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
-	mosaicText := fmt.Sprintf(`<span onclick="appAutoLogin()" style="cursor:pointer;color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	mosaicText := fmt.Sprintf(`<span 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"]))
 	detailNeedMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
 	//for k, _ := range obj {
@@ -400,11 +400,13 @@ func Filter(obj map[string]interface{}) map[string]interface{} {
 			detail = strings.ReplaceAll(detail, util.ObjToString(obj[dk]), detailText)
 		}
 		//中标企业信息
-		if dk == "winnerMap" && obj[dk] != nil {
+		if dk == "winnerMap" {
 			winnerNewMap := map[string]interface{}{}
-			winnerMap := util.ObjToMap(obj[dk])
-			for _, wv := range *winnerMap {
-				winnerNewMap[mosaicText] = wv
+			if obj[dk] != nil {
+				winnerMap := util.ObjToMap(obj[dk])
+				for _, wv := range *winnerMap {
+					winnerNewMap[mosaicText] = wv
+				}
 			}
 			obj[dk] = winnerNewMap
 		} else {

src/web/staticres/js/superSearch.js

@@ -336,12 +336,12 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
                 if (datas[i].site == '剑鱼信息发布平台') {
                   listHtml += '<span class="tags-item tags-publish">用户发布</span>'
                 }
-                if ($.trim(datas[i].area) != "" && datas[i].area != "A") {
+                if ($.trim(datas[i].area) != "" && datas[i].area != "A"&&datas[i].area.indexOf("免费注册")<0) {
                   listHtml += '<a class="tags-item" href="javascript:;"'+'onclick="gologin('+"'/list/area/"+datas[i].areaadd+".html')"+'">'+datas[i].area+'</a>';
                 } else {
                   listHtml += '<a href="#" style="display:none;"></a>';
                 }
-                if (typeof(type) != "undefined" && type != null && type != "") {
+                if (typeof(type) != "undefined" && type != null && type != ""&&type.indexOf("免费注册")<0) {
                   listHtml += '<a class="tags-item" href="javascript:;"'+'onclick="gologin('+"'/list/stype/"+datas[i].stypeadd+".html')"+'">'+type+'</a>';
                 } else {
                   listHtml += '<a href="#" style="display:none;"></a>';
@@ -351,7 +351,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
                 // } else {
                 //   listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
                 // }
-                if (typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != ""&&!is_field && datas[i].buyerclass !== '其它') {
+                if (typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != ""&&!is_field && datas[i].buyerclass !== '其它'&&datas[i].buyerclass.indexOf("免费注册")<0) {
                   listHtml += '<a class="tags-item" href="javascript:volid(0);"'+'>'+datas[i].buyerclass+'</a>';
                 } else {
                   listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
@@ -649,10 +649,10 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 }
 
 function getacount(bidamount,budget){
-	if(typeof(bidamount) != "undefined" && bidamount != null && bidamount != ""){
+	if(typeof(bidamount) != "undefined" && bidamount != null && bidamount != ""&&bidamount!=="免费注册即可查看"){
 		return bidamount
 	}
-	if(typeof(budget) != "undefined" && budget != null && budget != ""){
+	if(typeof(budget) != "undefined" && budget != null && budget != ""&&budget!=="免费注册即可查看"){
 		return budget
 	}
 	return ""