fix:未登录用户访问采购意向 进行登录

src/jfw/front/shorturl.go

@@ -1178,7 +1178,7 @@ func (s *Short) NologinCommon(userId, stype, id, sid string) error {
 		po, bo, wo, obj := pcVRT(sid, industry, stype, false)
 		if obj != nil && len(obj) > 0 {
 			if obj["subtype"] == "采购意向" { //未登录不能访问采购意向
-				return s.Redirect("/notin/page")
+				return s.Redirect("/notin/page", 302)
 			}
 			if len(po) > 0 {
 				s.T["projectOther"] = po

src/jfw/front/supsearch.go

@@ -348,10 +348,6 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	noLoginBl := false
 	if userId == "" {
 		//未登录用户访问全部信息类型 需要过滤掉 拟建
-		if subtype == "" {
-			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
-			noLoginBl = true
-		}
 		if strings.Contains(subtype, "采购意向") {
 			var ss []string
 			for _, v := range strings.Split(subtype, ",") {
@@ -361,6 +357,10 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 			}
 			subtype = strings.Join(ss, ",")
 		}
+		if subtype == "" {
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+			noLoginBl = true
+		}
 	}
 	//高级筛选 仅vip用户可查询
 	var (

src/jfw/front/swordfish.go

@@ -115,9 +115,6 @@ func (m *Front) PcAjaxReq() {
 	}
 	if userId == "" {
 		//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-		if subtype == "" {
-			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
-		}
 		if strings.Contains(subtype, "采购意向") {
 			var ss []string
 			for _, v := range strings.Split(subtype, ",") {
@@ -127,6 +124,10 @@ func (m *Front) PcAjaxReq() {
 			}
 			subtype = strings.Join(ss, ",")
 		}
+		if subtype == "" {
+			subtype = "拟建,招标预告,招标公告,招标结果,招标信用信息"
+		}
+
 	}
 	industry := strings.TrimSpace(m.GetString("industry"))
 	minprice := m.GetString("minprice")               //最低价格

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

@@ -128,6 +128,9 @@ func (s *Short) Article(stype, id string) error {
 	var canRead bool
 	obj = wxvisitD(sid, userId, (isVip && isOldVip) || isEntniche || isMember)
 	if len(obj) > 0 {
+		if userId == "" && util.ObjToString(obj["subtype"]) == "采购意向" {
+			return s.Redirect("/jyapp/free/login")
+		}
 		if userId != "" {
 			if ((isVip && isOldVip) || isMember || isEntniche) || //老版本vip、大会员、商机管理
 				((isVip && !isOldVip) && (!(util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向"))) { //新超级订阅非采购意向”和“拟建项目”