Merge branch 'dev4.6.2.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.4

src/jfw/modules/app/src/main.go

@@ -45,6 +45,7 @@ func main() {
 func initXweb() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	if redisSessionLockSize := util.IntAll(Sysconfig["redisSessionLockSize"]); redisSessionLockSize > 0 {
 		httpsession.RedisSessionLockSize = redisSessionLockSize
 	}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -121,7 +121,7 @@ var vNode = {
             pieChart: null,
             userInfo: {
               isFree: false,
-              vipStatus: false,
+              vipStatus: 0,
               viper: false,
               entniche: false
             },
@@ -131,7 +131,8 @@ var vNode = {
               provin: 0,
               visited: false,
               surplus: 0
-            } // 超级订阅用户画像浏览
+            }, // 超级订阅用户画像浏览
+            freeTrial: false // 免费用户是否访问过当前画像
         }
     },
     computed: {
@@ -172,8 +173,12 @@ var vNode = {
           var isFreeAuth = info.isFree && info.freeBuyerPort > 0
           var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
           var isMember = this.power.indexOf(5)  !== -1
+          // 超级订阅用户是否访问过该画像
+          var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus === 0 && this.usageInfo.visited
+          // 免费用户是否查看过该画像
+          var freeTrial = info.isFree && info.freeBuyerPort < 0 && this.freeTrial
           // 免费用户无体验次数的、超级订阅用户无剩余次数的、没有大会员浏览权限的 显示遮罩
-          return !isFreeAuth && !isVipAuth && !isMember // power == 5
+          return !isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial
         },
         // 展示免费用户体验
         getfreeBuyerPort:function(){
@@ -499,6 +504,10 @@ var vNode = {
                 if(res.error_code == 0) {
                   if(res.data && Object.keys(res.data).length > 0) {
                       that.chartLoading = false;
+                      // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
+                      if (res.data.onTrial) {
+                        that.freeTrial = res.data.onTrial
+                      }
                       that.initChartData('', res.data)
                   } else {
                     // that.getSectionChartData('a')

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -287,7 +287,7 @@
                 : '至今'}</span>
             </div>
           </div>
-          <div class="jy-empty" v-show="allNot">
+          <div class="jy-empty" v-show="allNot && !getStatus">
             <div class="jy-empty-img"></div>
             <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
           </div>

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -164,6 +164,10 @@
                 level_map.set(2, smart);
                 level_map.set(3, niche);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员子账号");
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))

src/jfw/modules/bigmember/src/a/init.go

@@ -1,14 +1,16 @@
 package a
 
 import (
+	"time"
+
 	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
-	"time"
 )
 
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	xweb.RootApp().BasePath = "/bigmember"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -53,9 +53,9 @@ func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, is
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
 				return &Portrait{userid}, 3, nil
 			}
-			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
-				return nil, -1, errors.New("非法请求")
-			}
+			//if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
+			//	return nil, -1, errors.New("非法请求")
+			//}
 			return nil, -1, nil
 		} else { //超级订阅升级版-校验超级订阅画像浏览次数
 			if err := bigMsg.SubVipPortraitTimesCheck(db.Mysql, searchValue, isWinner); err != nil {

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -4,6 +4,7 @@ import (
 	. "api"
 	"db"
 	"entity"
+	"errors"
 	"fmt"
 	"github.com/go-xweb/xweb"
 	"log"
@@ -18,12 +19,13 @@ import (
 //超级订阅升级版画像接口
 type SubVipPortrait struct {
 	*xweb.Action
+	portraitUsage  xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`  //超级订阅升级版画像浏览详情
+	portraitRecord xweb.Mapper `xweb:"/portrait/subVipPortrait/record"` //超级订阅升级版画像浏览记录
+
 	subVipEntDetail     xweb.Mapper `xweb:"/portrait/subVipPortrait/entDetail"`    //企业基本信息
 	subVipPortrait      xweb.Mapper `xweb:"/portrait/subVipPortrait/winner"`       //超级订阅升级版查看画像
 	subVipWinnerNewMsg  xweb.Mapper `xweb:"/portrait/subVipPortrait/winnerNewMsg"` //超级订阅升级版查看最新项目动态
 	subVipNewMsgSelects xweb.Mapper `xweb:"/portrait/subVipPortrait/selects"`      //最新招标信息可筛选项
-	portraitUsage       xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`        //超级订阅升级版画像浏览详情
-	portraitRecord      xweb.Mapper `xweb:"/portrait/subVipPortrait/record"`       //超级订阅升级版画像浏览记录
 
 	buyerContacts xweb.Mapper `xweb:"/subVipPortrait/buyer/contacts"`  //采购项目联系方式
 	buyerSelects  xweb.Mapper `xweb:"/subVipPortrait/buyer/selects"`   //采购单位画像可筛选项
@@ -43,7 +45,6 @@ func (this *SubVipPortrait) SubVipEntDetail() {
 		if err != nil {
 			return nil, err
 		}
-
 		entInfo, err := cepm.GetEntInfo(entId)
 		if err != nil {
 			return nil, err
@@ -64,10 +65,13 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
@@ -108,10 +112,13 @@ func (this *SubVipPortrait) SubVipNewMsgSelects() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		_, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		pwp := &entity.PortraitScreen{Ent: entId}
 		return pwp.GetProjectSelectItems(true)
 	}()
@@ -221,6 +228,8 @@ func (this *SubVipPortrait) PortraitRecord() {
 			for _, buyerName := range recordList {
 				if buyerDetail, ok := buyerDetailMap[buyerName]; ok && buyerDetail != nil {
 					infoList = append(infoList, buyerDetail)
+				} else {
+					infoList = append(infoList, map[string]interface{}{"name": buyerName})
 				}
 			}
 		}
@@ -247,7 +256,7 @@ func (this *SubVipPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_select", buyer, false)
+		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -270,7 +279,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_newMsg", buyer, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -311,10 +320,13 @@ func (this *SubVipPortrait) BuyerContacts() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		rData, err := cepm.GetBuyerContactsMsg(buyerName)
 		if err != nil {
 			return nil, err
@@ -337,7 +349,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortraitNotCheckPower", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}

src/jfw/modules/common/src/qfw/util/jy/subvipPortrait.go

@@ -10,7 +10,8 @@ import (
 
 //超级订阅画像使用次数
 const (
-	OneAreaTimes              = 50
+	OneAreaTimes_Winner       = 50
+	OneAreaTimes_Buyer        = 5
 	PortraitWinnerRecordTimes = "subVipPortraitRecordTimes_%s_%d"
 	PortraitBuyerRecordTimes  = "subVipBuyerPortraitRecordTimes_%s_%d"
 
@@ -45,10 +46,11 @@ func (this *BigVipBaseMsg) SubVipPortraitUsage(mysql *mysql.Mysql, searchValue s
 	if this.VipStatus <= 0 {
 		return
 	}
+	num := qutil.If(isWinnerPortrait, OneAreaTimes_Winner, OneAreaTimes_Buyer).(int)
 	if this.Vip_BuySet.AreaCount == -1 {
-		fullCount = 16 * OneAreaTimes //全国全国行业
+		fullCount = 16 * num //全国全国行业
 	} else {
-		fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
+		fullCount = this.Vip_BuySet.AreaCount * num
 	}
 	//当月查看次数
 	usage = this.GetUsageNum(mysql, isWinnerPortrait)

src/jfw/modules/publicapply/src/a/init.go

@@ -10,6 +10,7 @@ import (
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	xweb.RootApp().BasePath = "/publicapply"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

src/jfw/modules/subscribepay/src/a/init.go

@@ -13,6 +13,7 @@ import (
 func init() {
 	//开启redissession
 	httpsession.IsRedisSessionStore = true
+	httpsession.RedisNotLoginKey = "userId"
 	xweb.Config.Profiler = true
 	//xweb.RootApp().BasePath = "/subscribepay"
 	xweb.RootApp().AppConfig.StaticFileVersion = false

src/web/staticres/big-member/js/unit_portrayal.js

@@ -131,7 +131,8 @@ var vNode = {
               provin: 0,
               visited: false,
               surplus: 0
-            } // 超级订阅用户画像浏览
+            }, // 超级订阅用户画像浏览
+            freeTrial: false // 免费用户是否访问过当前画像
         }
     },
     computed: {
@@ -172,8 +173,12 @@ var vNode = {
           var isFreeAuth = info.isFree && info.freeBuyerPort > 0
           var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
           var isMember = this.power.indexOf(5)  !== -1
+          // 超级订阅用户是否访问过该画像
+          var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus === 0 && this.usageInfo.visited
+          // 免费用户是否查看过该画像
+          var freeTrial = info.isFree && info.freeBuyerPort < 0 && this.freeTrial
           // 免费用户无体验次数的、超级订阅用户无剩余次数的、没有大会员浏览权限的 显示遮罩
-          return !isFreeAuth && !isVipAuth && !isMember // power == 5
+          return !isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial
         },
         // 展示免费用户体验
         getfreeBuyerPort:function(){
@@ -492,6 +497,10 @@ var vNode = {
                   that.reqCount++;
                   if(res.data && Object.keys(res.data).length > 0) {
                       that.chartLoading = false;
+                      // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
+                      if (res.data.onTrial) {
+                        that.freeTrial = res.data.onTrial
+                      }
                       that.initChartData('', res.data)
                   } else {
                     // that.getSectionChartData('a')

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1965,7 +1965,9 @@ var vm = new Vue({
         2: '智慧版',
         3: '商机版',
         4: '试用版',
-        5: '自定义'
+        5: '自定义',
+        6: '商机版2.0',
+        7: '专家版2.0'
       }
 
       var levelInfo = {

src/web/templates/frontRouter/pc/seeBuyerHistory/sess/index.html

@@ -60,8 +60,12 @@
                 <div class="r-conts flex">
                     <h3 class="flex" @click="detailed(item.name)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>
                     <div class="line">
-                        <div class="cont-tips address"><i class="addr">所在地：</i><span>{item.province}</span><span>{item.city}</span></div>
-                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型：</i><span>{item.buyerclass}</span></div>
+                        <div class="cont-tips address"><i class="addr">所在地：</i>
+                            <span v-if="item.province">{item.province}</span>
+                            <span v-if="item.city">{item.city}</span>
+                            <span v-if="!(item.province && item.city)">--</span>
+                        </div>
+                        <div class="cont-tips buyerclass"><i class="buyer">采购单位类型：</i><span>{item.buyerclass || '--'}</span></div>
                     </div>
                 </div>
             </div>

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -275,7 +275,7 @@
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
                     </div>
                 </div>
-                <div class="jy-empty" v-show="allNot">
+                <div class="jy-empty" v-show="allNot && !getStatus">
                   <div class="jy-empty-img"></div>
                   <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
                 </div>

src/web/templates/pc/myOrder.html

@@ -636,7 +636,13 @@
                 },
                 '自定义': {
                   icon: '/order/image/zizhanghao1.png'
-                }
+                },
+                '专家版2.0': {
+                  icon: '/order/image/zizhanghao1.png'
+                },
+                '商机版2.0': {
+                  icon: '/order/image/zizhanghao2.png'
+                },
               }
             },
             '大会员-招标文件解读': {

src/web/templates/pc/subAccount_orderDetail.html

@@ -155,13 +155,15 @@
                     level_map.set(2, "智慧版");
                     level_map.set(3, "商机版");
                     level_map.set(5, "自定义");
+                    level_map.set(6, "商机版2.0");
+                    level_map.set(7, "专家版2.0");
 
                     if (r.data.create_time) {
                         $(".order_time").text(r.data.create_time.replace("-", ".").replace("-", "."));
                     }
 
                     $(".price").text("￥ " + formatMoney(r.data.order_money / 100) + "元");
-
+    
                     $(".level").text(level_map.get(r.data.level));
                     $(".cycle").text(r.data.cycle);
                     var member_endtime = "-";

src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -161,6 +161,8 @@
                 level_map.set(2, "智慧版");
                 level_map.set(3, "商机版");
                 level_map.set(5, "自定义");
+                level_map.set(6, "商机版2.0");
+                level_map.set(7, "专家版2.0");
                 $(".o-name").text("大会员补充包");
                 $(".order-img > img").attr("src", "/order/image/buchongbao.png")
                 var member_endtime = "-" ;

src/web/templates/weixin/member/subAccountDetail.html

@@ -168,6 +168,10 @@
                 level_map.set(2, smart);
                 level_map.set(3, niche);
                 level_map.set(5, custom);
+                niche.set("level","商机版2.0")
+                level_map.set(6, niche);
+                expert.set("level","专家版2.0")
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员子账号");
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))