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

src/jfw/front/front.go

@@ -1056,20 +1056,24 @@ func (f *Front) TSGuide() error {
 						break
 					}
 				}
+				areas := map[string]interface{}{
+					area: []string{},
+				}
 				saveData := bson.M{
-					"o_jy.o_area":       []string{area},
+					"o_jy.o_area":       areas,
 					"o_jy.a_key":        keyMaps,
 					"o_jy.l_modifydate": time.Now().Unix(),
 					"i_ts_guide":        2,
 				}
-				flag := mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
-				if flag {
-					jy.ClearBigVipUserPower(userid)
-				}
-				result["flag"] = flag
+				result["flag"] = mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
 			}
 		} else if reqType == "over" {
-			mongodb.UpdateById("user", userid, bson.M{"$set": bson.M{"i_ts_guide": 1}})
+			saveData := bson.M{
+				"o_jy.o_area":       map[string]interface{}{},
+				"o_jy.l_modifydate": time.Now().Unix(),
+				"i_ts_guide":        1,
+			}
+			result["flag"] = mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
 		} else if reqType == "preview" {
 			rlt := elastic.GetByNgram(INDEX, TYPE, strings.Split(f.GetString("key"), " "), "", FINDF, `{"publishtime":-1}`, `"_id","title","publishtime","toptype","subtype","type","area","href","areaval"`, 0, 10)
 			if *rlt != nil && len(*rlt) > 0 {
@@ -1079,6 +1083,9 @@ func (f *Front) TSGuide() error {
 			}
 			result["data"] = rlt
 		}
+		if result["flag"] != nil && result["flag"].(bool) {
+			jy.ClearBigVipUserPower(userid)
+		}
 		f.ServeJson(result)
 	}
 	return nil

src/jfw/front/wxkeyset.go

@@ -33,9 +33,13 @@ func (m *Front) WxKeyset(tpl string) error {
 		})
 	}
 	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
-	if tpl == "index" && vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
+	if (tpl == "index" || tpl == "filterset") && vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
 		return m.Redirect("/front/tenderSubscribe/guide")
 	}
+	//到新订阅设置
+	if vipMsg.IsUpgrade {
+		return m.Redirect("/front/vipsubscribe/toSubVipSetPage")
+	}
 	if tpl == "seniorset" {
 		data, ok := mongodb.FindById("user", userid, `{"o_jy":1}`)
 		if ok && data != nil && len(*data) > 0 {

src/jfw/modules/app/src/app/front/front.go

@@ -314,20 +314,24 @@ func (f *Front) TSGuide() error {
 						break
 					}
 				}
+				areas := map[string]interface{}{
+					area: []string{},
+				}
 				saveData := bson.M{
-					"o_jy.o_area":       []string{area},
+					"o_jy.o_area":       areas,
 					"o_jy.a_key":        keyMaps,
 					"o_jy.l_modifydate": time.Now().Unix(),
 					"i_ts_guide":        2,
 				}
-				flag := mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
-				if flag {
-					jy.ClearBigVipUserPower(userid)
-				}
-				result["flag"] = flag
+				result["flag"] = mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
 			}
 		} else if reqType == "over" {
-			mongodb.UpdateById("user", userid, bson.M{"$set": bson.M{"i_ts_guide": 1}})
+			saveData := bson.M{
+				"o_jy.o_area":       map[string]interface{}{},
+				"o_jy.l_modifydate": time.Now().Unix(),
+				"i_ts_guide":        1,
+			}
+			result["flag"] = mongodb.UpdateById("user", userid, bson.M{"$set": saveData})
 		} else if reqType == "preview" {
 			rlt := elastic.GetByNgram(INDEX, TYPE, strings.Split(f.GetString("key"), " "), "", FINDF, `{"publishtime":-1}`, `"_id","title","publishtime","toptype","subtype","type","area","href","areaval"`, 0, 10)
 			if *rlt != nil && len(*rlt) > 0 {
@@ -337,6 +341,9 @@ func (f *Front) TSGuide() error {
 			}
 			result["data"] = rlt
 		}
+		if result["flag"] != nil && result["flag"].(bool) {
+			jy.ClearBigVipUserPower(userid)
+		}
 		f.ServeJson(result)
 	}
 	return nil

src/jfw/modules/app/src/app/front/wxkeyset.go

@@ -5,7 +5,9 @@ import (
 	. "app/jyutil"
 	"fmt"
 	"jfw/config"
+	"jfw/public"
 	"qfw/util"
+	"qfw/util/jy"
 	"regexp"
 	"strconv"
 	"strings"
@@ -22,6 +24,11 @@ func (m *Front) WxKeyset(tpl string) error {
 	if tpl == "index" && isInTSguide(userid) { //仅免费用户跳转向导页面
 		return m.Redirect("/jyapp/tenderSubscribe/guide")
 	}
+	//到新订阅设置
+	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
+	if vipMsg.IsUpgrade {
+		return m.Redirect("/front/vipsubscribe/toSubVipSetPage")
+	}
 	if tpl == "seniorset" {
 		data, ok := mongodb.FindById("user", userid, `{"o_jy":1}`)
 		if ok && data != nil && len(*data) > 0 {

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

@@ -427,13 +427,9 @@ var vNode = {
         },
         onChange: function () {
             var pState = this.checkAllProvinceState()
-            if (this.config.onlyProvince) {
-
-            } else {
-                // 如果所有省份被全选，则取消所有选中，让全国选中
-                if (pState.allSelected || pState.noSelected) {
-                    this.setCitySelected()
-                }
+            // 如果所有省份被全选，则取消所有选中，让全国选中
+            if (pState.allSelected || pState.noSelected) {
+                this.setCitySelected()
             }
             
             // 获取当前状态

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -23,7 +23,7 @@ var subNode = new Vue({
             userType: false, // 用户是否为付费用户
             userAreaAllNum: 1, // 用户可修改地区总次数
             subscribeTime: '', // 用户订阅的时间
-            vSwitch: 'f' // 用户权限
+            vSwitch: '' // 用户权限
         }
     },
     created () {
@@ -81,8 +81,6 @@ var subNode = new Vue({
                         } else if(num == 3) {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_sj"></em>订阅管理-大会员</span>')
 
-                        } else if(num <= 0) {
-                            $('.custom-header-title').html('<span class="title-text"></em>订阅管理-免费订阅</span>')
                         } else {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_zj"></em>订阅管理-大会员</span>')
                         }
@@ -96,17 +94,23 @@ var subNode = new Vue({
                             pushsetting: '/jyapp/big/page/push_setting_detail?header=大会员推送设置&type=member_subscribe'
                         }
                         this.subInfoAjax = '/bigmember/use/info?t=' + new Date().getTime()
+                    } else if(num <= 0) {
+                        $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                        this.subInfoAjax = '/publicapply/free/subscribe'
                     } else {
                         $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
                         this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
                     }
-                } else {
+                } else if(swipro == 'supervip') {
                     $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
                     this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
+                } else {
+                    $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                    this.subInfoAjax = '/publicapply/free/subscribe'
                 }
             } else {
-                $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
-                this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
+                $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                this.subInfoAjax = '/publicapply/free/subscribe'
             }
         },
         // 是否显示切换图标
@@ -156,6 +160,7 @@ var subNode = new Vue({
                             _this.vipLink = 'javascript:;'
                             _this.arrowShow = false
                             _this.subInfoAjax = '/publicapply/free/subscribe'
+                            sessionStorage.setItem('switch-product', 'free')
                         }
                         let bms = sessionStorage.getItem('big_member_status')
                         _this.initPage(bms)
@@ -325,7 +330,9 @@ $(function () {
                     res.data.startTime = r.data.member_starttime
                     res.data.endTime = r.data.member_endtime
                   }
-              }else {
+              } else if (switchProduct == 'free') {
+                subNode.initData = r.data
+              } else {
                 res = r
               }
           }
@@ -351,12 +358,18 @@ $(function () {
   var resObj = {}
   // 每次请求接口
   console.log(document.referrer)
-  let subUrl = '/subscribepay/vipsubscribe/getSubBuyMsg'
+  let subUrl
+  if (subNode.vSwitch === 'v') {
+    subUrl = '/subscribepay/vipsubscribe/getSubBuyMsg'
+  } else if (subNode.vSwitch === 'm') {
+    subUrl = '/bigmember/use/info?t=' + new Date().getTime()
+  } else {
+    subUrl = '/publicapply/free/subscribe'
+  }
     $DoPost(subUrl, {}, function(sum) {
-        if(sum.success) {
-            resObj = sum
-            getDataWitXHR()
-        }
+        console.info('sum',sum)
+        resObj = sum
+        getDataWitXHR()
     })
 
   // 设置已选择的区域和行业

src/jfw/modules/app/src/web/staticres/jyapp/wxtsguide/main.js

@@ -57,23 +57,30 @@ var Guide = {
 	},
 	//跳过向导
 	skip: function(){
-		$.post("/jyapp/tenderSubscribe/guide",{reqType: "over"},function(){
-      var guideKey = localStorage.tsGuide_keywords
-      if(localStorage){
-        localStorage.tsGuide_status = "1";
-        localStorage.removeItem("tsGuide_selectIndustrys");
-        localStorage.removeItem("tsGuide_keywords");
-        localStorage.removeItem("tsGuide_preview");
-        localStorage.removeItem("tsGuide_step");
-      }
-			if (!mySysIsIos()){
-				JyObj.finishGuide();
-      }
-      if (guideKey) {
-        window.location.replace('/jyapp/wxkeyset/keyset/index')
-      } else {
-        window.location.replace('/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=guide')
-      }
+		$.post("/jyapp/tenderSubscribe/guide",{reqType: "over"},function(r){
+		    var guideKey = localStorage.tsGuide_keywords
+		      if(localStorage){
+		        localStorage.tsGuide_status = "1";
+		        localStorage.removeItem("tsGuide_selectIndustrys");
+		        localStorage.removeItem("tsGuide_keywords");
+		        localStorage.removeItem("tsGuide_preview");
+		        localStorage.removeItem("tsGuide_step");
+		    }
+			//Android客户端没有使用
+//			if (!mySysIsIos()){
+//				JyObj.finishGuide();
+//		    }
+			
+			if (guideKey) {
+		        window.location.replace('/jyapp/vipsubscribe/toSubVipSetPage')
+		    } else {
+		        window.location.replace('/jyapp/vipsubscribe/toSetKeyWordPage?type=add&index=0&from=guide')
+		    }
+//		    if (guideKey) {
+//		        window.location.replace('/jyapp/wxkeyset/keyset/index')
+//		    } else {
+//		        window.location.replace('/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=guide')
+//		    }
 		});
 	},
 	//下一步

src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html

@@ -219,7 +219,7 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.areanum !== -1 ? res.data.provincenum : res.data.areanum
+                    maxSelect = res.data.areanum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -266,8 +266,8 @@
                 <i class="iconfont icon-arrow"></i>
               </div>
             </a>
-            <ul class="sub-info" :class="vSwitch !== 'm' && vSwitch !== 'v' ? 'go_to_levelup' : ''" @click="toPaySupSub">
-              <li class="cycle">
+            <ul class="sub-info" :class="vSwitch !== 'm' && vSwitch !== 'v' ? 'go_to_levelup' : ''" @click="toPaySupSub" style="min-height: 1.48rem">
+              <li class="cycle" v-show="vSwitch !== 'f'">
                 <a class="item-container" :href="vipLink">
                   <div class="item">
                     <span class="item-l">

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -230,7 +230,7 @@
 		<div class="updateTips-btnWrap">
 			<div class="updateTips-btn" id="cancel2" onclick="hiddenTips2()">取消</div>
 			<div class="updateTips-line"></div>
-			<div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即升级</div>
+			<div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即更新</div>
 		</div>
 	</div>
 </div>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -134,6 +134,7 @@
         bottom: 0;
         z-index: 99999;
         background-color:rgba(0, 0, 0, 0.7);
+        display: none;
     }
     .updateTips-wrap{
         width: 6.06rem;
@@ -192,7 +193,7 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
-<div class="oldUserTips" id="UserTips">
+<!-- <div class="oldUserTips" id="UserTips">
     <div class="updateTips-wrap">
         <div class="updateTips-title">开通超级订阅</div>
         <div class="updateTips-text">免费用户最多可查看500条招标搜索结果，可前往购买超级订阅解锁查看更多信息</div>
@@ -202,8 +203,8 @@
             <div class="updateTips-btn levelUp" id="gotoPay"  onclick="gotoPay()">去开通</div>
         </div>
     </div>
-</div>
-<div class="oldUserTips" id="tipsType">
+</div> -->
+<div class="oldUserTips" id="tipsType" >
 	<div class="updateTips-wrap" style="height: 3.3rem;">
 		<div class="updateTips-title">版本更新</div>
 		<div class="updateTips-text" style="text-align: center;">免费订阅新版来了，请前往订阅设置更新功能后使用。</div>

src/jfw/modules/publicapply/src/subscribe/entity/entity.go

@@ -161,7 +161,7 @@ func (pi *ParamInfo) GetSubMsg() UserSubMsg {
 		pnum := redis.GetInt(jy.PowerCacheDb, fmt.Sprintf(jy.UserUpdateAreaKey, pi.UserId))
 		res.Areanum = qutil.If(pnum > 0, jy.BaseAreaNum-pnum, jy.BaseAreaNum).(int)
 		//购买省份订阅包
-		if o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > -1 {
+		if o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > 0 {
 			o_buyset_p, _ := o_jy["o_buyset_p"].(map[string]interface{})
 			res.Provincenum = qutil.IntAll(o_buyset_p["areacount"]) //-1 全国无限制
 			res.Areanum = res.Provincenum

src/jfw/modules/publicapply/src/subscribePush/entity/keyWords.go

@@ -184,6 +184,7 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 		a_items := make([]interface{}, 0)
 		ojy, _ := (*data)[types].(map[string]interface{})
 		a_key, errs := ojy["a_key"].([]interface{})
+		log.Println(a_key, errs)
 		if !errs {
 			db.Mgo.UpdateById("user", userId, map[string]interface{}{
 				"$set": map[string]interface{}{
@@ -193,6 +194,8 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 		}
 		if ki, _ := strconv.Atoi(keywordsIndex); ki > len(a_key) {
 			keywordsIndex = strconv.Itoa(len(a_key))
+		} else if ki == 0 {
+			keywordsIndex = strconv.Itoa(ki)
 		}
 		a_items = append(a_items, ojy)
 		//排除词处理 词过长或者为空的情况

src/jfw/modules/publicapply/src/subscribePush/entity/setting.go

@@ -95,12 +95,12 @@ func IsCanSet(userId string) (bool, bool, int) {
 	}
 	o_jy, _ := (*mData)["o_jy"].(map[string]interface{})
 	//是否购买省份订阅包
-	if o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > -1 {
+	if o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > 0 {
 		o_buyset_p, _ := o_jy["o_buyset_p"].(map[string]interface{})
 		areacount = qutil.IntAll(o_buyset_p["areacount"]) //-1 全国无限制
 	}
 	log.Println(jy.BaseAreaNum, "---areacount:", areacount)
-	return o_jy["o_area"] == nil, o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > -1, areacount
+	return o_jy["o_area"] == nil, o_jy["i_ppstatus"] != nil && qutil.IntAll(o_jy["i_ppstatus"]) > 0, areacount
 }
 
 //

src/jfw/modules/subscribepay/src/entity/areaPack.go

@@ -179,12 +179,10 @@ func (this *areaPackPrice) PayCallBack(param *CallBackParam) bool {
 
 //修改用户权益
 func (this *AreaPackFilter) Power(userid string, startime, endtime time.Time) bool {
-	log.Println("--->", startime)
-	log.Println("--->", endtime)
 	setMap := map[string]interface{}{
 		"o_jy.o_buyset_p":  map[string]interface{}{"areacount": this.Num},
 		"o_jy.l_areaEnd_p": endtime.Unix(),
-		"o_jy.i_ppstatus":  0,
+		"o_jy.i_ppstatus":  1,
 	}
 	if this.OrderType == 1 || this.OrderType == 2 {
 		setMap["o_jy.l_areaStart_p"] = startime.Unix()

src/jfw/modules/subscribepay/src/pay/util.go

@@ -115,6 +115,14 @@ var (
 		"ali_app": ALI_DATAPACK_APP,
 		"ali_pc":  ALI_DATAPACK_NATIVE,
 	}
+	//省份订阅包
+	areaPackMap = map[string]string{
+		"wx_js":   WX_AREAPACK_JSAPI,
+		"wx_app":  WX_AREAPACK_APP,
+		"wx_pc":   WX_AREAPACK_NATIVE,
+		"ali_app": ALI_AREAPACK_APP,
+		"ali_pc":  ALI_AREAPACK_NATIVE,
+	}
 
 	PayWayAndSign = map[string]map[string]string{
 		"subvip":         vipMap,
@@ -127,6 +135,7 @@ var (
 		"aiForecastPack": aiForecastPackMap,
 		"bidfile":        bifileMap,
 		"integral":       integralMap,
+		"areaPack":       areaPackMap,
 		"VIP订阅":          vipMap,
 		"企业商机管理":         entnicheMap,
 		"历史数据":           dataexportMap,
@@ -139,6 +148,7 @@ var (
 		"大会员-招标文件解读":     bifileMap,
 		"剑鱼币":            integralMap,
 		"数据流量包":          dataPackMap,
+		"省份订阅包":          areaPackMap,
 	}
 	varOrderCode *orderCode
 )

src/jfw/modules/subscribepay/src/service/areaPack.go

@@ -118,7 +118,7 @@ func (this *AreaPack) CreateOrder() {
 		if ok && rdata != nil && len(*rdata) > 0 {
 			ojy := qutil.ObjToMap((*rdata)["o_jy"])
 			area_status := qutil.IntAllDef((*ojy)["i_ppstatus"], -1)
-			if area_status == 0 && filter.OrderType == 1 { //1为非省份订阅用户可购买
+			if area_status == 1 && filter.OrderType == 1 { //1为非省份订阅用户可购买
 				return nil, fmt.Errorf("非法请求")
 			}
 			if area_status < 0 && filter.OrderType > 1 { //非省份订阅用户不可升级续费

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

@@ -427,13 +427,9 @@ var vNode = {
         },
         onChange: function () {
             var pState = this.checkAllProvinceState()
-            if (this.config.onlyProvince) {
-
-            } else {
-                // 如果所有省份被全选，则取消所有选中，让全国选中
-                if (pState.allSelected || pState.noSelected) {
-                    this.setCitySelected()
-                }
+            // 如果所有省份被全选，则取消所有选中，让全国选中
+            if (pState.allSelected || pState.noSelected) {
+                this.setCitySelected()
             }
             
             // 获取当前状态

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

@@ -448,8 +448,8 @@ var vm = new Vue({
     getAreaPackInfo: function (order) {
       var filterInfo = JSON.parse(order.filter)
 
-      function formatAreaText (value) {
-        return value === -1  ? '全国' : (value + '个省')
+      function formatAreaText (value, old) {
+        return value === -1  ? '全国' : ((old ? (value - old) : value)  + '个省')
       }
 
       function formatTimeText (type) {
@@ -479,7 +479,7 @@ var vm = new Vue({
       var prodType = {
         label: tempMap[filterInfo.ordertype].before + '区域',
         split: '：',
-        text:  formatAreaText(filterInfo.OldNum ? (filterInfo.num - filterInfo.OldNum) : filterInfo.num)
+        text:  formatAreaText(filterInfo.num, filterInfo.OldNum)
       }
       var buyCount = {
         label: '订阅周期',

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

@@ -2036,8 +2036,8 @@ var vm = new Vue({
     getAreaPackInfo: function (order) {
       var filterInfo = JSON.parse(order.filter)
 
-      function formatAreaText (value) {
-        return value === -1  ? '全国' : (value + '个省')
+      function formatAreaText (value, old) {
+        return value === -1  ? '全国' : ((old ? (value - old) : value)  + '个省')
       }
 
       function formatTimeText (type) {
@@ -2067,7 +2067,7 @@ var vm = new Vue({
       var prodType = {
         label: tempMap[filterInfo.ordertype].before + '区域',
         split: '：',
-        text: formatAreaText(filterInfo.OldNum ? (filterInfo.num - filterInfo.OldNum) : filterInfo.num)
+        text: formatAreaText(filterInfo.num, filterInfo.OldNum)
       }
       var buyCount = {
         label: '订阅周期',

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -766,6 +766,7 @@ var subComponent = {
           url: '/publicapply/free/subscribe',
           type: 'POST',
           success: function (res) {
+            console.info(res)
               _this.UserSubscribe = res
               _this.info.area = res.data.area
               _this.userAreaNum = res.data.areanum
@@ -939,7 +940,7 @@ var custom = {
             sessionStorage.removeItem('infoTypeVswitch')
               if(res.flag) {
                   sessionStorage.removeItem('big-setInfoType')
-                  // location.reload()
+                  location.reload()
               } else {
                   vueComponent.$toast(res.data.error_msg)
               }

src/web/staticres/js/superSearch.js

@@ -247,7 +247,7 @@ function getNewBids(pnum){
       // 隐藏页码
       searchInnerVue.showPage = false
     }
-    getBidIsColl()
+    // getBidIsColl()
 	})
 }
 
@@ -307,14 +307,13 @@ function getNewBiddings(){
       // 隐藏页码
       searchInnerVue.showPage = false
     }
-    getBidIsColl()
 	})
 }
 //
 
 function appendDatas(datas,flag,isNew,onlyUpdateTable){
   // flag // 是否有输入
-  console.log('selectType: ' + selectType,',flag: ',flag)
+  // console.log('selectType: ' + selectType,',flag: ',flag)
 	var listHtml = '';
 	var tableHtml = '';
 	$(".working").hide();
@@ -560,7 +559,9 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 	}
 	$(".tabContainer").css("min-height","");
 	submitflag=true;
-	// backTopAdjust();
+  // backTopAdjust();
+  // 生成dom之后再查标讯有无收藏
+  getBidIsColl()
 }
 
 function getacount(bidamount,budget){
@@ -747,7 +748,6 @@ function getVIPData(clickpaging){
         searchInnerVue.showPage = false
 			}
       tabflag = true;
-      getBidIsColl()
 		}
 	})
 	return tabflag
@@ -983,7 +983,7 @@ function searchOnsubmit(clickpaging){
       LimitClass.limitFlag = false;
       pcAjaxReqCallBack(r);
     }
-    getBidIsColl()
+    // getBidIsColl()
 	});
 }
 function showSearchTipForTimeRange (type) {
@@ -1108,7 +1108,9 @@ function getBidIsColl () {
   var bids = ""
   var dataId = ""
   // 区分标题搜索和全文搜索收藏
-  var $dom = selectType.indexOf('content') == -1 ? $('.title-text-checkbox[name="bid-list"]') : $('.all-text-checkbox[name="bid-list"]')
+  var allSearch = selectType.indexOf('content') > -1 && $("#zbSeatchT [name='keywords']").val() !==""
+  console.log('当前是否显示的是全文',allSearch)
+  var $dom = allSearch ? $('.all-text-checkbox[name="bid-list"]') : $('.title-text-checkbox[name="bid-list"]')
   $dom.each(function() {
     if ($(this).attr('dataid')) {
       dataId = $(this).attr("dataid");
@@ -1145,7 +1147,7 @@ function getBidIsColl () {
 function collectClick() {
   // console.log(vipState, '是否是超级订阅用户')
   // 单个收藏点击事件
-  $('.icon-collect').on('click',function(e) {
+  $('.icon-collect').unbind('click').on('click',function(e) {
     // 登录判断
     if (!loginflag) {
       openLoginDig()
@@ -1258,7 +1260,7 @@ function collectClick() {
           }
         }
         // 如果没有不同的值 即为选中的标讯都已收藏过 有不同的值即为有未收藏的标讯
-        console.log(notSameArr, 'notSameArr')
+        // console.log(notSameArr, 'notSameArr')
         if(notSameArr.length == 0) {
           toastFn('已收藏', 800)
           return
@@ -1323,7 +1325,7 @@ function  updateVipDialog(str) {
 }
 // 列表页收藏点击事件 百度统计
 function baiduEvent(name) {
-  console.log(name, 'name')
+  // console.log(name, 'name')
   try {
     _hmt.push(['_trackEvent', '超级订阅-pc', 'click', name]);
   } catch (e) {
@@ -1357,14 +1359,11 @@ function isPower () {
         var member = r.data.member
         var vip = r.data.vip
         if (entniche || member || vip > 0) {
-          console.log('true')
           return 'true'
         } else {
-          console.log('false')
           return 'false'
         }
       } else {
-        console.log('false')
         return 'false'
       }
     }

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -72,9 +72,12 @@ var subNode = new Vue({
                     if (res.data.vt !== 'v' ) {
                         _this.vSwitch = 'f'
                         $('.update_renew').hide()
+                        $('.super-title').text('订阅管理-免费订阅');
+                        $('.super-title').css('background', 'none')
                     } else {
                         _this.vSwitch = 'v'
                         $('.update_renew').show()
+                        $('.super-title').show();
                     }
                 }
             })

src/web/staticres/wxtsguide/main.js

@@ -57,23 +57,26 @@ var Guide = {
 	},
 	//跳过向导
 	skip: function(){
-		
-		$.post("/front/tenderSubscribe/guide",{reqType: "over"},function(){
-      var guideKey = localStorage.tsGuide_keywords
-
-      if(localStorage){
-        localStorage.tsGuide_status = "1";
-        localStorage.removeItem("tsGuide_selectIndustrys");
-        localStorage.removeItem("tsGuide_keywords");
-        localStorage.removeItem("tsGuide_preview");
-        localStorage.removeItem("tsGuide_step");
-      }
-
-      if (guideKey) {
-        window.location.replace('/wxkeyset/keyset/index')
-      } else {
-        window.location.replace('/wxkeyset/keyset/filterset?type=add&index=0&from=guide')
-      }
+		$.post("/front/tenderSubscribe/guide",{reqType: "over"},function(r){
+	      	var guideKey = localStorage.tsGuide_keywords
+	      	if(localStorage){
+	       		localStorage.tsGuide_status = "1";
+	        	localStorage.removeItem("tsGuide_selectIndustrys");
+	        	localStorage.removeItem("tsGuide_keywords");
+	        	localStorage.removeItem("tsGuide_preview");
+	        	localStorage.removeItem("tsGuide_step");
+	      	}
+	
+	      	if (guideKey) {
+	        	window.location.replace('/front/vipsubscribe/toSubVipSetPage')
+	      	} else {
+	        	window.location.replace('/front/vipsubscribe/toSetKeyWordPage?type=add&index=0&from=guide')
+	      	}
+//	      	if (guideKey) {
+//	        	window.location.replace('/wxkeyset/keyset/index')
+//	      	} else {
+//	        	window.location.replace('/wxkeyset/keyset/filterset?type=add&index=0&from=guide')
+//	      	}
 		});
 	},
 	//下一步

src/web/templates/areaPack/pc/page_order.html

@@ -222,8 +222,8 @@
                     }
                     // 展示字段
 
-                    function formatAreaText (value) {
-                        return value === -1  ? '全国' : (value + '个省')
+                    function formatAreaText (value, old) {
+                        return value === -1  ? '全国' : ((old ? (value - old) : value)  + '个省')
                     }
                     function formatAreaTextBefore (type) {
                         var typeMap = {
@@ -251,7 +251,7 @@
                     }
 
                     $('.filter_data .replace_text[name="type"]').text(formatAreaTextBefore(filterObj.ordertype))
-                    $('.filter_data .replace_text[name="area"]').text(formatAreaText(filterObj.OldNum ? (filterObj.num - filterObj.OldNum) : filterObj.num))
+                    $('.filter_data .replace_text[name="area"]').text(formatAreaText(filterObj.num, filterObj.OldNum))
                     $('.filter_data .replace_text[name="cycle"]').text(filterObj.ordertype === 2 ? '不延期' : formatCycleText(filterObj.cycleunit))
                     $('.filter_data .replace_text[name="time"]').text(formatTimeText(r.data.order.vip_endtime) + '到期')
 

src/web/templates/areaPack/wx/page_set_area.html

@@ -213,7 +213,7 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.areanum !== -1 ? res.data.provincenum : res.data.areanum
+                    maxSelect = res.data.provincenum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)

src/web/templates/common/pcbottom.html

@@ -188,7 +188,7 @@ if (location.href.indexOf('jyblog') === -1) {
                 return -1;//不是ie浏览器
             }
         }
-        console.info(IEVersion());
+        // console.info(IEVersion());
         IEVersion();
         if (IEVersion() != '-1' && IEVersion() != 'edge') {
             var IEtips = document.getElementById('tips');
@@ -794,7 +794,7 @@ if (location.href.indexOf('jyblog') === -1) {
             manual: false
         })
         zc("offline_message_count",function(res){
-            console.log(res, 'offline_message_count')
+            // console.log(res, 'offline_message_count')
             if (res && res.size && res.size > 0) {
                 var omc = res.size > 99 ? '99+' : res.size
                 $(".icon-badge-number").attr('data-badge-number', omc)

src/web/templates/pc/myOrder.html

@@ -281,7 +281,7 @@
                                     <p>有效时间：@#item.vip_starttime#@</p>
                                 </div>
                                 <div class="fl shop_main" v-if="item.product_type === '省份订阅包'">
-                                    <p><span v-if="item.order_status !== -2">@#item.filter.ordertype|formatAreaTextBefore#@</span>区域：@#(item.filter.OldNum ? (item.filter.num - item.filter.OldNum) : item.filter.num)|formatAreaText#@</p>
+                                    <p><span v-if="item.order_status !== -2">@#item.filter.ordertype|formatAreaTextBefore#@</span>区域：@#item.filter.num|formatAreaText(item.filter.OldNum)#@</p>
                                     <p>
                                         订阅周期：<span v-if="item.filter.ordertype !== 2">@#item.filter.cycleunit|formatCycleText#@</span><span v-else>不延期</span>
                                         <!--赠送30天-->
@@ -671,8 +671,8 @@
         FormatDateFn (value) {
           return new Date(value * 1000).Format('yyyy/MM/dd')
         },
-        formatAreaText (value) {
-            return value === -1  ? '全国' : (value + '个省')
+        formatAreaText (value, old) {
+            return value === -1  ? '全国' : ((old ? (value - old) : value)  + '个省')
         },
         formatAreaTextBefore (type) {
           var typeMap = {

src/web/templates/pc/supsearch.html

@@ -305,7 +305,7 @@ function getDefaultRangeForLocal () {
 	}
 	if (!tempList.length) {
 		if (changeDefaultForSearchRange('get', 'Title') == 'false' || changeDefaultForSearchRange('get', 'Content') == 'false') {
-			console.log('存在未勾选')
+			// console.log('存在未勾选')
 		} else {
 			tempList = ['title', 'content']
 		}
@@ -328,7 +328,7 @@ formarForSelectType()
 if (beforeOfSelectType != selectType) {
 	$(function () {
 		$("#zbSeatchT [name='selectType']").val(selectType);
-		console.log(selectType, '当前', beforeOfSelectType, searchvalue, $("#zbSeatchT [name='keywords']").val())
+		// console.log(selectType, '当前', beforeOfSelectType, searchvalue, $("#zbSeatchT [name='keywords']").val())
 		if (searchvalue != '' || $("#zbSeatchT [name='keywords']").val() != '') {
 			searchOnsubmit()
 		}
@@ -355,7 +355,7 @@ if(secondList.length>0){
 var dataId = "";
 $(function(){
 
-	console.log("是否有会员筛选权限 showVipScreen", {{.T.showVipScreen}})
+	// console.log("是否有会员筛选权限 showVipScreen", {{.T.showVipScreen}})
 
 	var oInput=document.getElementById("searchinput");
 	moveEnd(oInput)
@@ -381,7 +381,7 @@ $(function(){
   //  回显搜索范围
   if(selectType) {
     var space = selectType.split(',')
-    console.log(space, '回显的搜索范围',vipState)
+    // console.log(space, '回显的搜索范围',vipState)
     space.forEach(function(item){
     	if (item) {
 			$('.searchSpace .search-list .search-list-checkbox[data-name=' + item + ']').addClass('checkbox-checked')
@@ -759,7 +759,7 @@ $.ajax({
               async: true
           });
           var frames = document.getElementById("iframeu6603895_0");
-          console.log(frames, 'frames')
+          // console.log(frames, 'frames')
 
           IframeOnClick.track(frames, function() {
                   jQuery(document).click();
@@ -780,7 +780,7 @@ function getAjaxAdv () {
       position: '搜索列表页'
     },
     success: function(res) {
-      console.log(res)
+      // console.log(res)
     }
   })
 }
@@ -815,7 +815,7 @@ var IframeOnClick = {
                             position: '搜索列表页'
                           },
                           success: function(res) {
-                              console.log(res)
+                              // console.log(res)
                           }
                       })
                   }
@@ -1667,8 +1667,8 @@ $(function(){
       var listLen = $('.buyclass-content .buy-list:not(.buy-list-parent)').length;
       var curListLen = $(this).parent('.clearfix').find('.buy-list:not(.buy-list-parent)').length;
       var curActiveLen = $(this).parent('.clearfix').find(".active").length;
-      console.log(curListLen,curActiveLen)
-      console.log(listLen, activeLen)
+      // console.log(curListLen,curActiveLen)
+      // console.log(listLen, activeLen)
       if (activeLen === listLen || activeLen === 0) {
         $('.buyclass-content .buy-list').removeClass('active')
         $('.buyclass-all').addClass('active')
@@ -1689,7 +1689,7 @@ $(function(){
       }
       var activeLen = $('.buyclass-content .buy-list-parent').filter(".active").length;
       var listLen = $('.buyclass-content .buy-list-parent').length;
-      console.log(activeLen,listLen)
+      // console.log(activeLen,listLen)
       if (activeLen === listLen || activeLen === 0) {
         $('.buyclass-content .buy-list').removeClass('active')
         $('.buyclass-all').addClass('active')
@@ -1830,8 +1830,6 @@ $(function(){
       $('.tag-placeholder').show()
     })
   })
-  // 查询标讯是否收藏
-  getBidIsColl()
   // 搜索范围点击事件
   $('.search-content .search-list .search-list-checkbox').on('click',function(){
     var hasVipIcon = $(this).siblings().hasClass('icon-vip'); // 有无点击付费的搜索范围
@@ -1937,7 +1935,7 @@ function renderTagsList (data) {
           return item.lid != id
         })
         activeTags = newArr
-        console.log(activeTags,newArr, 'quxiao')
+        // console.log(activeTags,newArr, 'quxiao')
         inputTagList ()
       }
 
@@ -2147,7 +2145,7 @@ document.querySelector(".searchControl").oncopy = function(){
         // console.log(newVal, '分页')
       },
       'listState.total' (newVal) {
-        console.log(newVal, '总页码')
+        // console.log(newVal, '总页码')
       }
     },
     mounted () {

src/web/templates/weixin/historypush.html

@@ -665,7 +665,7 @@
                 <div class="updateTips-btnWrap">
                     <div class="updateTips-btn" id="cancel2" onclick="hiddenTips2()">取消</div>
                     <div class="updateTips-line"></div>
-                    <div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即升级</div>
+                    <div class="updateTips-btn levelUp" id="newLevelUp"  onclick="updateJump2()">立即更新</div>
                 </div>
             </div>
         </div>
@@ -1058,7 +1058,7 @@
                 sessionStorage.setItem(vm.sessStorageKey, JSON.stringify(vm.$data))
                 let thisType = sessionStorage.getItem('userIsNew')
                 if (userNewType || thisType) {
-                    location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+                    location.href = '/front/vipsubscribe/toSubVipSetPage'
                 } else {
                     tokeysetForFree()
                 }

src/web/templates/weixin/search/mainSearch.html

@@ -509,7 +509,7 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
-<div class="oldUserTips" id="UserTips">
+<!-- <div class="oldUserTips" id="UserTips">
     <div class="updateTips-wrap">
         <div class="updateTips-title">开通超级订阅</div>
         <div class="updateTips-text">免费用户最多可查看500条招标搜索结果，可前往购买超级订阅解锁查看更多信息</div>
@@ -519,7 +519,7 @@
             <div class="updateTips-btn levelUp" id="gotoPay"  onclick="gotoPay()">去开通</div>
         </div>
     </div>
-</div>
+</div> -->
 <div class="oldUserTips" id="tipsType">
 	<div class="updateTips-wrap" style="height: 3.3rem;">
 		<div class="updateTips-title">版本更新</div>

src/web/templates/weixin/wxtsguide.html

@@ -14,7 +14,7 @@ var isBodyShow = true;
 <script src="/js/jquery.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
 <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
-<script src="/wxtsguide/main.js?v={{Msg "seo" "version"}}1"></script>
+<script src="/wxtsguide/main.js?v={{Msg "seo" "version"}}"></script>
 <script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
 <link href='{{Msg "seo" "cdn"}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' rel="stylesheet"/>