Ver código fonte

Merge remote-tracking branch 'origin/feature/v4.8.39' into feature/v4.8.39

zhangsiya 2 anos atrás
pai
commit
be8510f6e8

+ 8 - 3
src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -454,9 +454,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		if userId == "" {
-			return nil, fmt.Errorf("未登录")
-		}
+
 		cepm, power, err, isFree := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerPortrait", buyerName, false, this.Session())
 		cepm.Session = this.Session()
 		if err != nil {
@@ -484,6 +482,13 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if power == 3 {
 			rData["onTrial"] = true
 		}
+		if userId == "" { //未登录用户限制字段
+			rData = map[string]interface{}{
+				"city":       rData["city"],
+				"buyerclass": rData["buyerclass"],
+				"province":   rData["province"],
+			}
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {

+ 5 - 5
src/web/templates/pc/index.html

@@ -93,11 +93,11 @@
                 {{else}}
                 <a href="/list/stype/NJXM.html">拟建项目</a>
                 {{end}}
-                {{if .T.hasLogin}}
-                <a href="/page_workDesktop/work-bench/page?link=/jylab/supsearch/index.html?subtype=采购意向">采购意向</a>
-                {{else}}
-                <a href="/list/stype/ZBCGYX.html">采购意向</a>
-                {{end}}
+<!--                {{if .T.hasLogin}}-->
+<!--                <a href="/page_workDesktop/work-bench/page?link=/jylab/supsearch/index.html?subtype=采购意向">采购意向</a>-->
+<!--                {{else}}-->
+<!--                <a href="/list/stype/ZBCGYX.html">采购意向</a>-->
+<!--                {{end}}-->
                 <a data-href="/succbi/nzj/app/nzj.app/nzj_search_1.spg" data-type="work-bench">拟在建项目</a>
                 <a href="/swordfish/page_big_pc/forecast_list">潜在项目预测</a>
               </div>