Merge branch 'hotfix/v4.8.23.2' into dev/v4.8.23.2_yf

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -190,11 +190,14 @@ func (this *FollowProject) FollowDetail() {
 		}
 		var followData, projectInfo map[string]interface{}
 		if fid != "" { //已关注 查询详情
+			followData["fid"] = util.EncodeId(fid)
 			followData, projectInfo, err = projectManager.GetDetailByFid(fid)
 			sid = qutil.ObjToString(followData["sid"])
 			if sid != "" { //关注项目的来源信息id
 				followData["sid"] = util.EncodeId(sid)
 			}
+		} else {
+			followData["fid"] = ""
 		}
 		//查询项目信息
 		if projectInfo == nil {

src/jfw/modules/publicapply/src/transfer/transfer.go

@@ -58,11 +58,11 @@ var PCWXArticle = "/article/content/%s"
 var APPArticle = "/jyapp/article/content/%s"
 
 // 项目
-var PCProject = "/swordfish/page_big_pc/pro_follow_detail?sid=%s&fid=%s"
-var APPProject = "/jyapp/big/page/pro_follow_detail?sid=%s&fid=%s"
-var WXProject = "/big/wx/page/pro_follow_detail?sid=%s&fid=%s"
-var APPEntProject = "/jyapp/big/page/client_follow_detail?sid=%s&fid=%s&from=client&"
-var WXEntProject = "/big/wx/page/client_follow_detail?sid=%s&fid=%s&from=client"
+var PCProject = "/swordfish/page_big_pc/pro_follow_detail?sid=%s"
+var APPProject = "/jyapp/big/page/pro_follow_detail?sid=%s"
+var WXProject = "/big/wx/page/pro_follow_detail?sid=%s"
+var APPEntProject = "/jyapp/big/page/client_follow_detail?sid=%s&from=client&"
+var WXEntProject = "/big/wx/page/client_follow_detail?sid=%s&from=client"
 
 // 拟在建项目
 var PCLandingPage = "/succbi/nzj/app/nzj.app/nzj_detail_0.spg?pid=%s"
@@ -111,21 +111,21 @@ func UrlHandle(urlStr string, repType string, u *httpsession.Session) string {
 	if strings.Contains(urlStr, "/pro_follow_detail") {
 		//移动端项目详情页
 		if repType == "app" {
-			newUrl = fmt.Sprintf(APPProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(APPProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		} else if repType == "wx" {
-			newUrl = fmt.Sprintf(WXProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(WXProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		} else {
-			newUrl = fmt.Sprintf(PCProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(PCProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		}
 	}
 	if strings.Contains(urlStr, "/client_follow_detail") {
 		//商机管理项目详情页
 		if repType == "app" {
-			newUrl = fmt.Sprintf(APPEntProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(APPEntProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		} else if repType == "wx" {
-			newUrl = fmt.Sprintf(WXEntProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(WXEntProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		} else {
-			newUrl = fmt.Sprintf(PCProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), url.QueryEscape(strings.Join(queryMap["fid"], "")))
+			newUrl = fmt.Sprintf(PCProject, url.QueryEscape(strings.Join(queryMap["sid"], "")), "")
 		}
 	}
 	if strings.Contains(urlStr, "/succbi/nzj/app/nzj.app") {