|
@@ -3,13 +3,12 @@ package front
|
|
|
import (
|
|
|
"fmt"
|
|
|
"jy/src/jfw/config"
|
|
|
+ "jy/src/jfw/jyutil"
|
|
|
"jy/src/jfw/wx"
|
|
|
"net/url"
|
|
|
"regexp"
|
|
|
"strings"
|
|
|
|
|
|
- "jy/src/jfw/jyutil"
|
|
|
-
|
|
|
"app.yhyue.com/moapp/jypkg/public"
|
|
|
|
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
@@ -185,16 +184,16 @@ func (this *CommonRouter) doXspcPage() error {
|
|
|
|
|
|
// 商机管理
|
|
|
func (this *CommonRouter) EntpcIndex() error {
|
|
|
- return this.doEntpcPage("")
|
|
|
+ return this.doEntpcPage()
|
|
|
}
|
|
|
func (this *CommonRouter) EntpcPage(htmlPage string) error {
|
|
|
- return this.doEntpcPage(htmlPage)
|
|
|
+ return this.doEntpcPage()
|
|
|
}
|
|
|
-func (this *CommonRouter) doEntpcPage(htmlPage string) error {
|
|
|
+func (this *CommonRouter) doEntpcPage() error {
|
|
|
//P325 采购单位搜索调整,未登录用户也能访问采购单位画像
|
|
|
///entpc/unit_portrayal/天津银行股份有限公司
|
|
|
userid, _ := this.GetSession("userId").(string)
|
|
|
- if !strings.Contains(htmlPage, "unit_portrayal") && userid == "" {
|
|
|
+ if userid == "" {
|
|
|
return this.Redirect("/notin/page")
|
|
|
}
|
|
|
return this.Render(fmt.Sprintf("/frontRouter/pc/entpc/sess/index.html"))
|
|
@@ -215,34 +214,10 @@ var bigVipFreePageReg = regexp.MustCompile(`set_.*|free|unit_portrayal|analysis_
|
|
|
func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
|
|
|
//page := pageSign
|
|
|
userid, _ := this.GetSession("userId").(string)
|
|
|
- //没有登录跳转登录页面
|
|
|
- if userid == "" {
|
|
|
+ //没有登录跳转登录页面(采购单位画像除外)
|
|
|
+ if !strings.Contains(pageSign, "unit_portrayal") && userid == "" {
|
|
|
return this.Redirect("/notin/page")
|
|
|
}
|
|
|
- //没有购买大会员跳转大会员介绍页(PC端订阅列表 所有用户都能进去)
|
|
|
- //if !strings.HasPrefix(pageSign, "svip/ent_ser_portrait") && pageSign != "big_subscribe" {
|
|
|
- // for _, v := range strings.Split(pageSign, "/") {
|
|
|
- // if v == "" || v == "desktop" {
|
|
|
- // continue
|
|
|
- // }
|
|
|
- // pageSign = v
|
|
|
- // break
|
|
|
- // }
|
|
|
- //bigBaseMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
|
|
|
- // if !bigVipFreePageReg.MatchString(pageSign) && pageSign != "index" {
|
|
|
- // if bigBaseMsg.Status <= 0 && bigBaseMsg.Vip_BuySet.Upgrade != 1 {
|
|
|
- // return this.Redirect("/big/page/index")
|
|
|
- // }
|
|
|
- // //大会员页面权限判断
|
|
|
- // if pageSign != "" && !bigBaseMsg.CheckBigVipFrontPower(pageSign) {
|
|
|
- // return this.Redirect("/big/page/index")
|
|
|
- // }
|
|
|
- // }
|
|
|
- //限制超级订阅用户不能进入购买页
|
|
|
- //if page == "free/svip/buy" && bigBaseMsg.VipStatus > 0 && types != "upgrade" {
|
|
|
- // return this.Redirect("/front/subscribe.html")
|
|
|
- //}
|
|
|
- //}
|
|
|
return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))
|
|
|
}
|
|
|
|
|
@@ -295,7 +270,7 @@ func (this *CommonRouter) ActivityLeads(sign string) error {
|
|
|
|
|
|
// 组织架构
|
|
|
func (this *CommonRouter) OrgpcIndex() error {
|
|
|
- return this.doEntpcPage("")
|
|
|
+ return this.doEntpcPage()
|
|
|
}
|
|
|
func (this *CommonRouter) OrgpcPage(htmlPage string) error {
|
|
|
return this.doOrgpcPage()
|