|
|
@@ -161,12 +161,9 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
|
|
|
s.T["newBidInfoList"] = tg.GetNewBidInfo()
|
|
|
s.T["industryInfoList"] = tg.GetConsult()
|
|
|
s.T["hotLabelList"] = tg.GetHotLabel(30)
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
}
|
|
|
if inWorkDesktop, _ := s.GetInt("inWorkDesktop"); inWorkDesktop == 1 && !strings.Contains(s.Request.URL.String(), "page_workDesktop") {
|
|
|
return s.Redirect(fmt.Sprintf("%s%s%s", config.Sysconfig["workDesktopUrl"].(string), config.Sysconfig["webdomain"].(string), url.QueryEscape(strings.Replace(s.Request.URL.String(), "inWorkDesktop=1", "inWorkDesktop=0", 1))))
|
|
|
->>>>>>> feature/v4.9.5
|
|
|
}
|
|
|
//P406登录用户标讯详情页改版
|
|
|
if userId != "" || PageTypeCheck[stype] {
|
|
|
@@ -176,15 +173,14 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
|
|
|
} else if userId != "" && strings.Contains(s.Request.RequestURI, "article") {
|
|
|
var loginPageInfo = func() (body []byte) {
|
|
|
// 获取页面内容
|
|
|
- url := fmt.Sprintf("%s%s", config.Sysconfig["webdomain"].(string), "/jy_mobile/index.html")
|
|
|
- resp, err := http.Get(url)
|
|
|
- log.Println("article --- url :", url)
|
|
|
+ mobileUrl := fmt.Sprintf("%s%s", config.Sysconfig["webdomain"].(string), "/jy_mobile/index.html")
|
|
|
+ resp, err := http.Get(mobileUrl)
|
|
|
+ log.Println("article --- mobileUrl :", mobileUrl)
|
|
|
if err != nil {
|
|
|
http.Error(s.ResponseWriter, "Failed to fetch page", http.StatusInternalServerError)
|
|
|
return
|
|
|
}
|
|
|
defer resp.Body.Close()
|
|
|
-
|
|
|
body, err = ioutil.ReadAll(resp.Body)
|
|
|
if err != nil {
|
|
|
http.Error(s.ResponseWriter, "Failed to read response body", http.StatusInternalServerError)
|
