Merge branch 'feature/v4.8.56_ws' of qmx/jy into feature/v4.8.56

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

@@ -118,9 +118,14 @@ func (tg *Tags) TagsIndex(first, types, name string) error {
 	defer qu.Catch()
 	if userId, _ := tg.GetSession("userId").(string); userId != "" {
 		if c := jyutil.ChangeLoginCookie(20, tg.ResponseWriter, tg.Request, fmt.Sprintf("mobile_logined_%s", userId)); c < cookieNum {
-			return tg.Redirect("/jyapp/jylab/mainSearch")
+			return tg.Redirect("/jyapp/jylab/mainSearch?DisUrl=/jyapp/jylab/mainSearch")
 		}
 	}
+	aaaaa := jyutil.NameReg.MatchString(name)
+	log.Println(aaaaa)
+	if types == "stype" && (strings.Contains(name, "NJXM") || jyutil.NameReg.MatchString(name)) {
+		return tg.Redirect("/jyapp/free/login?flag=kicked&back=index")
+	}
 	var (
 		platform = "PC"
 	)

src/jfw/modules/app/src/app/jyutil/tags.go

@@ -15,6 +15,7 @@ import (
 	"log"
 	"math/rand"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -22,6 +23,7 @@ import (
 )
 
 var (
+	NameReg             = regexp.MustCompile("^1_\\d")
 	mobileHref          = "/list/%s/%s.html"
 	infoTypeRedisKey    = "mobile_seo_infoType_home"
 	biddingListKey      = "mobile_seo_list_%s_%s_%d"
@@ -307,11 +309,11 @@ var (
 			Name: "招标信用信息",
 			Url:  fmt.Sprintf(mobileHref, Label["infoType"], CodeToInfoType[5]),
 		},
-		{
-			Name:     "拟建项目",
-			Url:      fmt.Sprintf(mobileHref, Label["infoType"], CodeToInfoType[1]),
-			Nickname: "拟建",
-		},
+		//{
+		//	Name:     "拟建项目",
+		//	Url:      fmt.Sprintf(mobileHref, Label["infoType"], CodeToInfoType[1]),
+		//	Nickname: "拟建",
+		//},
 	}
 	AreaMap        = map[string]tkd{}
 	CityMap        = map[string]tkd{}