订阅列表 地区 选择

src/jfw/front/swordfish.go

@@ -1547,15 +1547,11 @@ func (m *Front) Share(openids string) error {
 }
 func (m *Front) WxpushAjaxReq() error {
 	defer util.Catch()
-	index, _ := m.GetInteger("index")
-	date, _ := m.GetInt("_id")
-	userid := util.ObjToString(m.GetSession("userId"))
-	vsid := m.GetString("vsid")
-	times := m.GetString("times")
-	if times != "" {
-		jy.HistoryPush.ClearPushCache(userid)
+	userId := util.ObjToString(m.GetSession("userId"))
+	if userId != "" {
+		vsid := m.GetString("vsid")
+		public.HistoryPush.Visit_Mysql(userId, vsid)
 	}
-	public.HistoryPush.Visit(userid, vsid, date, index)
 	return nil
 }
 
@@ -2354,30 +2350,28 @@ func (f *Front) HasPushHistory() {
 	//获取时间
 	var formatTime string
 	selectTime := f.GetString("selectTime")
-	log.Println("selecttime:", selectTime)
 	lenStr := len([]rune(selectTime))
 	if selectTime != "" {
 		if selectTime != "undefined" && lenStr >= 10 {
 			selectTime = selectTime[0:10]
 			select_time, _ := strconv.ParseInt(selectTime, 10, 64)
 			//转化
-			formatTime = time.Unix(select_time, 0).Format("20060102")
+			formatTime = time.Unix(select_time, 0).Format("2006-01-02")
 		} else if lenStr < 10 {
-			formatTime = "1111111111"
+			formatTime = ""
 		}
 	}
 	userId := util.ObjToString(f.GetSession("userId"))
 	if userId == "" {
 		return
 	}
-	user, firstPushTime := public.HistoryPush.UserInfo(userId)
+	user, _ := public.HistoryPush.UserInfo(userId)
 	hasKeyFlag := false
 	isVipFlag := false
 	isPassCount := false
 	isExpire := 0
 	tedayNum := time.Unix(time.Now().Unix(), 1).Format("20060102")
 	isOnTail := 0
-	log.Println(tedayNum)
 	if util.IntAll((*user)["i_vip_status"]) == 1 || util.IntAll((*user)["i_vip_status"]) == 2 {
 		//
 		var threeRemind = int64(3 * 24 * 60 * 60)
@@ -2411,13 +2405,19 @@ func (f *Front) HasPushHistory() {
 		}
 		isPassCount = redis.GetInt("pushcache_2_a", "oncecount_"+tedayNum+"_"+userId) > 50
 	}
-	hasNextPage, list, err := public.HistoryPush.Datas(userId, 1, firstPushTime, formatTime)
-	if err == nil && hasKeyFlag && len(list) == 0 && formatTime == "" && !isVipFlag {
-		flag, data := public.HistoryPush.MakeHistoryDatas(userId, bidSearch_field_1)
-		if flag && data != nil {
-			list = data
-		}
+	//	hasNextPage, list, err := public.HistoryPush.Datas(userId, 1, firstPushTime, formatTime)
+	//	if err == nil && hasKeyFlag && len(list) == 0 && formatTime == "" && !isVipFlag {
+	//		flag, data := public.HistoryPush.MakeHistoryDatas(userId, bidSearch_field_1)
+	//		if flag && data != nil {
+	//			list = data
+	//		}
+	//	}
+	pageNum, _ := f.GetInteger("pageNum")
+	if pageNum == 0 {
+		pageNum = 1
 	}
+	area := f.GetString("area")
+	hasNextPage, list := public.HistoryPush.Datas_Mysql(userId, pageNum, formatTime, area)
 	//
 	f.ServeJson(map[string]interface{}{
 		"haskey":      hasKeyFlag,
@@ -2475,17 +2475,19 @@ func (f *Front) HistorypushPaging() error {
 		selectTime = selectTime[0:10]
 		select_time, _ := strconv.ParseInt(selectTime, 10, 64)
 		//转化
-		formatTime = time.Unix(select_time, 0).Format("20060102")
+		formatTime = time.Unix(select_time, 0).Format("2006-01-02")
 	}
-	log.Println("~~~~~:", formatTime, "~~~~", selectTime, "~~~", pageNum)
+	area := f.GetString("area")
+	log.Println("~~~~~:", formatTime, "~~~~", selectTime, "~~~", pageNum, "~~~", area)
 	//
 	userId := util.ObjToString(f.GetSession("userId"))
 	if userId != "" {
-		user, firstPushTime := public.HistoryPush.UserInfo(userId)
-		if user == nil {
-			return nil
-		}
-		hasNextPage, list, _ := public.HistoryPush.Datas(userId, pageNum, firstPushTime, formatTime)
+		//		user, firstPushTime := public.HistoryPush.UserInfo(userId)
+		//		if user == nil {
+		//			return nil
+		//		}
+		hasNextPage, list := public.HistoryPush.Datas_Mysql(userId, pageNum, formatTime, area)
+		//		hasNextPage, list, _ := public.HistoryPush.Datas(userId, pageNum, firstPushTime, formatTime)
 		f.ServeJson(map[string]interface{}{
 			"hasNextPage": hasNextPage,
 			"data":        list,

src/jfw/modules/subscribepay/src/config.json

@@ -1,9 +1,9 @@
 {
-	"mongodbServers": "192.168.3.11:27080",
+	"mongodbServers": "192.168.3.128:27080",
     "mongodbPoolSize": 25,
     "mongodbName": "qfw",
     "redisaddrs": "other=192.168.3.128:1712,session=192.168.3.128:1712,push=192.168.3.128:1712",
-    "elasticsearch": "http://192.168.3.11:9800",
+    "elasticsearch": "http://192.168.3.128:9800",
     "elasticPoolSize": 30,
     "webport": "86",
     "webrpcport": "8600",

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

@@ -31,14 +31,11 @@ func (a *AfterPay) UpdateUserTips() error {
 	if userId != "" {
 		classify_index := a.GetString("classify_index")
 		kws_tips, _ := a.GetInteger("kws_tips")
-		log.Println(kws_tips, "---", classify_index)
 		saveData := make(map[string]interface{})
 		saveData["o_vipjy.a_items."+classify_index+".i_tips"] = kws_tips
-		log.Println("------", userId)
 		flag = util.MQFW.UpdateById("user", userId, map[string]interface{}{
 			"$set": saveData,
 		})
-		log.Println(flag)
 	}
 	a.ServeJson(map[string]interface{}{
 		"flag": flag,
@@ -182,7 +179,11 @@ func (a *AfterPay) GetUserInfo() error {
 			for _, v := range _buyClass {
 				buyClass += v.(string) + "、"
 			}
-			(*data)["a_buyerclass"] = strings.TrimRight(buyClass, "、")
+			if buyClass == "" {
+				(*data)["a_buyerclass"] = "全部"
+			} else {
+				(*data)["a_buyerclass"] = strings.TrimRight(buyClass, "、")
+			}
 			//有效日期
 			var _starttime = (*userData)["l_vip_starttime"]
 			(*userData)["l_vip_starttime"] = strings.Replace(qutil.FormatDateWithObj(&_starttime, qutil.Date_Short_Layout), "-", ".", -1)
@@ -206,8 +207,6 @@ func (a *AfterPay) GetUserInfo() error {
 			} else if qutil.Int64All(_endtime)-time.Now().Unix() < 0 {
 				(*data)["expRemind"] = "0" //已经到期
 			}
-			//每月修改次数
-			(*data)["modTimes"] = redis.GetInt("other", "vipSubscribe_"+userId+"_"+time.Now().Month().String()) //每个月修改次数
 			//信息类型
 			if (*data)["a_infotype"] != nil {
 				_infotype := (*data)["a_infotype"].([]interface{})

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

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"log"
 	qutil "qfw/util"
-	"qfw/util/jy"
 	"regexp"
 	"strconv"
 	"strings"

src/jfw/public/historypush.go

@@ -23,6 +23,53 @@ var HistoryPush = &historyPush{}
 
 type historyPush struct{}
 
+var Mysql_table = "pushsubscribe"
+
+//
+func (h *historyPush) Datas_Mysql(userId string, pageNum int, selectTime, area string) (hasNextPage bool, result []map[string]interface{}) {
+	if userId == "" {
+		return
+	}
+	findSQL := "select * from pushsubscribe where userid = '" + userId + "'"
+	countSQL := "select count(1) as count from pushsubscribe where userid = '" + userId + "'"
+	findStr := ""
+	if selectTime != "" {
+		startTime := selectTime + " 00:00:00"
+		endTime := selectTime + " 23:59:59"
+		st, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
+		et, _ := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
+		fmt.Println(st.Unix())
+		_startTime := st.Unix()
+		_endTime := et.Unix()
+		log.Println(_startTime, "--", _endTime)
+		findStr += " and date < " + fmt.Sprint(_endTime) + " and date >= " + fmt.Sprint(_startTime)
+	}
+	if area != "" {
+		findStr += " and city in ("
+		for k, v := range strings.Split(area, ",") {
+			if k > 0 {
+				findStr += ","
+			}
+			findStr += "'" + v + "'"
+		}
+		findStr += ")"
+	}
+	countSQL = countSQL + findStr
+	count := Mysql.CountBySql(countSQL)
+	start := (pageNum - 1) * pageSize
+	findStr += " order by date desc limit " + fmt.Sprint(start) + "," + fmt.Sprint(pageSize)
+	findSQL = findSQL + findStr
+	list := Mysql.SelectBySql(findSQL)
+	if len(*list) > 0 {
+		pushCas := h.getJyPushs(*list)
+		result = h.getInfoByIds(pushCas)
+	} else {
+		result = []map[string]interface{}{}
+	}
+	hasNextPage = int(count) > pageNum*pageSize
+	return
+}
+
 //获取历史推送记录入口
 //selectTime 查询推送的日期 传入的值为‘20060102’ 如果不查询具体天数 传入""
 func (h *historyPush) Datas(userId string, pageNum int, firstPushTime int64, selectTime string) (hasNextPage bool, result []map[string]interface{}, err error) {
@@ -256,22 +303,21 @@ func (h *historyPush) halfYearAgoDatas(userId string, firstPushTime int64) (push
 func (h *historyPush) getJyPushs(datas []map[string]interface{}) (pushCas []*jy.PushCa) {
 	pushCas = []*jy.PushCa{}
 	for _, v := range datas {
-		isvisit := util.Int64All(v["isvisit"])
-		keys := v["keys"].([]string)
+		keys := v["matchkeys"].(string)
 		//		for id_k, id_v := range strings.Split(util.ObjToString(v["pushinfo"]), ",") {
 		pushCas = append(pushCas, &jy.PushCa{
 			Date:       util.Int64All(v["date"]),
-			InfoId:     util.ObjToString(v["pushinfo"]),
-			Visit:      h.isVisited(isvisit, 1),
+			InfoId:     util.ObjToString(v["infoid"]),
+			Visit:      util.IntAll(v["isvisit"]),
 			Index:      1,
 			Area:       util.ObjToString(v["area"]),
 			City:       util.ObjToString(v["city"]),
 			Buyerclass: util.ObjToString(v["buyerclass"]),
-			Keys:       keys,
+			Keys:       strings.Split(keys, " "),
 		})
-		if len(pushCas) == 4000 {
-			return
-		}
+		//		if len(pushCas) == 4000 {
+		//			return
+		//		}
 		//		}
 	}
 	return
@@ -319,6 +365,7 @@ func (h *historyPush) getInfoByIds(pushCas []*jy.PushCa) []map[string]interface{
 			es_ids = append(es_ids, v)
 		}
 	}
+	//	log.Println(es_ids)
 	//elasticsearch
 	if len(es_ids) > 0 {
 		list := elastic.Get("bidding", "bidding", fmt.Sprintf(query, strings.Join(es_ids, `","`), len(es_ids)))
@@ -475,6 +522,13 @@ func (h *historyPush) UserInfo(userId string) (*map[string]interface{}, int64) {
 	}
 	return user, util.Int64All((*user)["l_firstpushtime"])
 }
+func (h *historyPush) Visit_Mysql(userId, infoId string) {
+	if infoId == "" || userId == "" {
+		return
+	}
+	ok := Mysql.UpdateOrDeleteBySql("update pushsubscribe set isvisit=1 where userid='" + userId + "' and infoid='" + util.DecodeArticleId2ByCheck(infoId)[0] + "'")
+	log.Println("--update:", ok)
+}
 
 //已访问过的，改变状态值
 func (h *historyPush) Visit(userId, infoId string, date int64, index int) {

src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -162,9 +162,10 @@
   line-height: .88rem;
   padding: 0 .3rem;
   background: #fff;
+      border-bottom: 1px solid #E6E6E6;
 }
 
-.filter_tab:after {
+/*.filter_tab:after {
   position: absolute;
   content: '';
   left: 0;
@@ -174,7 +175,7 @@
   background-color: #E6E6E6;
   transform-origin: 0 0;
   transform: scaleY(0.5);
-}
+}*/
 
 .filter_tab .tab_left {
   flex: 1;
@@ -248,7 +249,7 @@
 
 .filter_tab .area_container .area_wrap .area_data {
   flex: 1;
-  overflow-y: scroll;
+  overflow-y: hidden;
   display: flex;
   justify-content: space-between;
 }
@@ -290,7 +291,7 @@
   height: 1px;
   background-color: #E0E0E0;
   transform-origin: 0 0;
-  transform: scaleY(0.5);
+  /*transform: scaleY(0.5);*/
 }
 
 .filter_tab .area_container .area_wrap .area_data .active {

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -53,7 +53,7 @@ $(function () {
         if(kws_count>300){
             alert("您设置的关键词已超出最高上限，请调整后再添加。")
         }else if (saveData("SK")){
-            
+            $(".add-keyword-container .addNewKeyword").show();
             //点击保存关键词，查看缓存中存的附加词 和排除词。
             $(".kws_count").text(kws_count);
             var html = `<li><div class="one"><div>

src/web/templates/weixin/historypush.html

@@ -21,9 +21,9 @@
 	<script src="/vipsubscribe/js/rem.js"></script>
 	<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css"/>
 	<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css" />
-	<link rel="stylesheet" href="/vipsubscribe/css/base.css" />
-	<link rel="stylesheet" href="/vipsubscribe/css/public.css">
-	<link rel="stylesheet" href="/vipsubscribe/css/subscribe_list.css">
+	<link rel="stylesheet" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
+	<link rel="stylesheet" href="/vipsubscribe/css/subscribe_list.css?v={{Msg "seo" "version"}}">
 	<script>
 		var zbadd = {{Msg "seo" "ZBADDRESS"}};
 		var firstPage = null;
@@ -35,6 +35,8 @@
 		var wxflag = "";
 		var a_visitedindex = new Array;
 		var closeAdvert=false//是否关闭广告
+		//
+		var selectCity = "";
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 		$(function(){
 			var isinitpage = false;
@@ -58,20 +60,18 @@
 		var isInTSguide=false;//订阅向导
 		var isVipSub=false;//是不是VIP
 		var firstTime = {{.T.stime}};
-			console.log(firstTime)
 		if (firstTime!=""){
 			firstTime = firstTime+"000";
-		}else{
-			if(sessionStorage.date!==undefined&&sessionStorage.date!==""){
-				firstTime = sessionStorage.date;
-
-			}
-		}		
+		}
+		if(sessionStorage.date!==undefined){
+			firstTime = sessionStorage.date;
+			sessionStorage.removeItem("date");
+		}
 		setTimeout(function(){
 			if(firstTime!=""){
 				var _formatDate = formatDate(firstTime/1000,"2");
+				date = formatDate(firstTime/1000,"1");
 				$('#showDatePicker .time_result').html(_formatDate).addClass('current');
-
 			}
 			$(".tab_left .time").show();
 		},500)
@@ -80,7 +80,7 @@
 			$.ajax({
 				type: 'post',
 				url: '/front/hasPushHistory?t='+new Date().getTime(),
-				data: {"selectTime":firstTime },
+				data: {"selectTime":firstTime,"pageNum":pageIndex},
 				async: false,
 				dataType: 'json',
 				success: function(data){
@@ -90,7 +90,7 @@
 					firstPage = data.data;
 					isVipSub = data.isVipSub;
 					if(isVipSub){
-						if(!data.hasKeyFlag){
+						if(!data.haskey){
 							$(".set_keyword").show();
 							if(data.isPassCount){
 								weuiDialog();
@@ -140,9 +140,6 @@
 				},
 				error: function(xhr, type){
 					hasNoData();
-					if (sessionStorage.date === undefined){
-						$(".findnull").css("display","block")
-					}
 				}
 			});
 			new FastClick(document.body);
@@ -151,31 +148,8 @@
 				window.location.href='/wxkeyset/keyset/index';
 			});
 			if(firstPage.length==0){
-				//选择某天没有数据 显示 .findnull_
-				if(sessionStorage.date!=undefined&&sessionStorage.date!=""&&sessionStorage.historypushCount==0){
-					if($(".findnull").css("display")=="block"){
-						$(".findnull").css("display","none");
-					}
-					$(".listcontent").css("display","none");
-					$(".findnull_").css("display","block");
-					$(".showType").css("display","none");
-					$(".showType").next().css("display","none");
-					$(".loading_").css("display","none");
-
-					sessionStorage.removeItem("historypushDataCache");
-					sessionStorage.removeItem("historypushPageIndexCache");
-					sessionStorage.removeItem("historypushScrollTop");
-					sessionStorage.removeItem("historypushHasNextPage");
-					sessionStorage.removeItem("historypushCount");
-				}else{
-					//最开始没有数据 
-					hasNoData();
-					if (sessionStorage.date === undefined){
-						$(".findnull").css("display","block")
-					}else{
-						$(".findnull_").css("display","block");
-					}
-				}
+				//最开始没有数据 
+				hasNoData();
 				return;
 			}else{
 				$(".showType").css("display","flex");
@@ -183,7 +157,6 @@
 			}
 			$(window).scroll(function(){
 				scrollTop = $(this).scrollTop();
-				console.log(scrollTop)
 			});
 			//
 			if(sessionStorage && sessionStorage.historypushScrollTop && sessionStorage.historypushDataCache){
@@ -191,24 +164,13 @@
 				hasNextPage = sessionStorage.historypushHasNextPage=="true"?true:false;
 				scrollTop = sessionStorage.historypushScrollTop;
 				dataCache = JSON.parse(sessionStorage.historypushDataCache);
+				selectCity = sessionStorage.selectCity;
 			    if(sessionStorage.closeAdvert=="true"){
 			      	closeAdvert=true
 			    }
 				$("#list>*").remove();
 				count = 0;
-				if(sessionStorage.date!=""&&sessionStorage.historypushCount==0){
-					if($(".findnull").css("display")=="block"){
-						$(".findnull").css("display","none");
-					}
-					$(".listcontent").css("display","none");
-					$(".findnull_").css("display","block");
-					$(".showType").css("display","none");
-					$(".showType").next().css("display","none");
-					$(".loading_").css("display","none");
-				}else{
-					structureHtml(dataCache,true);
-				}
-				
+				structureHtml(dataCache,true);
 				$(window).scrollTop(scrollTop);
 				sessionStorage.removeItem("historypushDataCache");
 				sessionStorage.removeItem("historypushPageIndexCache");
@@ -216,9 +178,6 @@
 				sessionStorage.removeItem("historypushHasNextPage");
 				sessionStorage.removeItem("historypushCount");
 			}else{
-				if(firstTime!=""){
-					sessionStorage.date=firstTime;
-				}
 				$("#list").css("visibility","hidden");
 				dataCache = dataCache.concat(firstPage);
 				structureHtml(firstPage,true);
@@ -227,7 +186,6 @@
 					$("#list").css("visibility","visible");
 				},300);
 			}
-			console.log(hasNextPage)
 			if(hasNextPage){
 				wxflag = $('.listcontent').dropload({
 			        scrollArea : window,
@@ -238,7 +196,7 @@
 			            $.ajax({
 			                type: 'post',
 			                url: '/swordfish/historypush/paging',
-							data: {"pageNum": pageIndex, "selectTime":sessionStorage.date},
+							data: {"pageNum": pageIndex, "selectTime":firstTime},
 			                dataType: 'json',
 			                success: function(data){
 								//没有数据
@@ -285,6 +243,8 @@
 				sessionStorage.historypushHasNextPage = hasNextPage;
 				sessionStorage.historypushCount = count;
 				sessionStorage.point="1";
+				sessionStorage.selectCity = selectCity;
+				sessionStorage.date = firstTime;
 			}
 		}
 		//		
@@ -345,9 +305,16 @@
 				//行业
 				var	industryname = "";
 				var industryListname ="";
-				if(obj.s_subscopeclass!=null&&obj.s_subscopeclass!=""){
-					industryname=obj.s_subscopeclass
-					industryListname='<span class="industry">'+industryname+'</span>';
+				if(isVipSub){
+					if(obj.ca_buyerclass!=null&&obj.ca_buyerclass!=""){
+						industryname=obj.ca_buyerclass
+						industryListname='<span class="buyerclass">'+industryname+'</span>';
+					}
+				}else{
+					if(obj.s_subscopeclass!=null&&obj.s_subscopeclass!=""){
+						industryname=obj.s_subscopeclass
+						industryListname='<span class="industry">'+industryname+'</span>';
+					}
 				}
 				//时间
 				var showdateList=""
@@ -472,30 +439,25 @@
 		}
 		//		
 		function setVisitedIndex(obj,eid){
-			var times = sessionStorage.date;
 			if(obj.find("a.bt").hasClass("visited")||obj.hasClass("visited")){
 				return;
 			}
 			obj.find("a.bt").addClass("visited");
 			obj.find("span.xh").addClass("visited");
-			var _id = obj.find("a.bt").attr("push_date");
-			var index = obj.find("a.bt").attr("openlist_index");
 			var vsid=obj.find("a.bt").attr("eid");
 			if (eid != ""){
 				obj.addClass("visited");
 				vsid = eid;
-				_id = obj.attr("push_date");
-				index = obj.attr("openlist_index");
 			}
-			if(index&&_id&&vsid){
-				$.post("/wxpush/bid/ajaxReq",{_id:_id,index:parseInt(index),vsid:vsid,times:times});
+			if(vsid){
+				$.post("/wxpush/bid/ajaxReq",{vsid:vsid});
 			}
 		}
 		//
 		function beforeJump(eid,h,sds,index,pd,vis){
 			if(!vis){
 				for(var i=0;i<dataCache.length;i++){
-					if(dataCache[i].ca_openlist_index==index&&dataCache[i].ca_date==pd){
+					if(dataCache[i]._id==eid&&dataCache[i].ca_date==pd){
 						dataCache[i].ca_visit=1;
 						break
 					}
@@ -505,12 +467,16 @@
 			newredirect(zbadd,h,eid,"subkey_"+sds);
 		}
 		//
-		function ajaxFun(time){
-			console.log(time,"----------")
+		function tosetkeyspage(){
+			setSessionStorage();
+			window.location.href="/front/vipsubscribe/toSetPage"
+		}
+		//
+		function ajaxFun(time,area){
 			$.ajax({
 				type: 'post',
 				url: '/front/hasPushHistory?t=' + new Date().getTime(),
-				data: {"selectTime": time},
+				data: {"selectTime": time,"area":area},
 				async: false,
 				dataType: 'json',
 				success: function (data) {
@@ -519,8 +485,16 @@
 					firstPage = data.data;
 					hasNextPage = data.hasNextPage;
 					count=0;
-					if(time!=""){
-						sessionStorage.time=$("#times").text();
+					if(time!=undefined&&time!=""){
+						firstTime = time;
+					}else{
+						firstTime = ""
+					}
+					if(area!=undefined&&area!=""){
+						sessionStorage.selectCity = area;
+					}else{
+						sessionStorage.removeItem("selectCity");
+						sessionStorage.removeItem("selectedCityName");
 					}
 				},
 				error: function(xhr, type){
@@ -738,10 +712,28 @@
 		.filter_tab .screen{
 			top:1.88rem;
 		}
+		.buyerclass {
+		    border: 1px solid #CFAD89;
+		    background: #CFAD89;
+		    border-radius: 3px;
+		    margin: 0px 5px;
+		    padding: 1px 3px;
+		    color: #fff;
+		    font-size: 14px;
+		}
+		._header{
+			position: fixed;
+			top: 0;
+			width: 100%;
+			z-index: 999;
+		}
+		.subscribe{
+			margin-top: 1rem;
+		}
 	</style>
 </head>
 <body>
-	<div class="subscribe">
+	<div class="_header">
 		<!-- banner -->
 		<div class="vip_banner" style="display: none;">
 			<div class="box">
@@ -774,26 +766,28 @@
                   	</div>
               	</div>
               	<div class="vip_set" style="display: none;">
-              		<a href="vip_index.html" class="vip_set_box">
+              		<a onclick="tosetkeyspage()" class="vip_set_box">
               			<span class="free7days_pic"></span>
               			<span>VIP订阅设置</span>
               		</a>
               	</div>
-          </div>
-          <div class="screen"></div>
-          <div class="area_container">
-          	<section class="area_wrap">
-          		<div class="area_data">
-          			<!-- 这里省份的顺序，和下面省份的顺序对应 -->
-          			
-          		</div>
-          		<div class="handle_menu">
-          			<button class="reset_btn">重置</button>
-          			<button class="enter_btn">确认</button>
-          		</div>
-          	</section>
-          </div>
-      </div>
+	         </div>
+	         <div class="screen"></div>
+	         <div class="area_container">
+	          	<section class="area_wrap">
+	          		<div class="area_data">
+	          			<!-- 这里省份的顺序，和下面省份的顺序对应 -->
+	          			
+	          		</div>
+	          		<div class="handle_menu">
+	          			<button class="reset_btn">重置</button>
+	          			<button class="enter_btn">确认</button>
+	          		</div>
+	          	</section>
+	         </div>
+	     </div>
+    </div>
+	<div class="subscribe">
       <!-- 列表 -->
       <div class="list" style="display: none;">
       	<div class="list_item">
@@ -868,6 +862,23 @@
   	<script type="text/javascript" charset="UTF-8">
   		mapData();
   		function mapData(){
+  			var _citySessionData = null
+  			var _provinceArr = {}
+  			var _cityMap = []
+  			if (sessionStorage&&sessionStorage.selectedCityName!=null){
+  				_citySessionData  = JSON.parse(sessionStorage.selectedCityName);
+  				for(var k=0;k<_citySessionData.length;k++){
+  					_provinceArr[_citySessionData[k]["province"]] = _citySessionData[k]["selectCity"].length
+  					_cityMap = _cityMap.concat(_citySessionData[k]["selectCity"])
+  				}
+  				if(_cityMap.length>0){
+  					 $('#showArea .jymobile-tab-triangle').addClass('current').text(`地区 ${_cityMap.length}`);
+  				}
+				//
+				sessionStorage.removeItem("selectedCityName");
+  			}
+  			// console.log(_provinceArr)
+  			// console.log(_cityMap)
 	  		var provinceArr = ["安徽","澳门","北京","重庆","福建","广东","广西","贵州","甘肃","河北","湖北","黑龙江","海南","河南","湖南","吉林","江苏","江西","辽宁","内蒙古","宁夏","青海","山西","陕西","上海","山东","四川","天津","台湾","西藏","新疆","香港","云南","浙江"]
 	  		var provinceHtml = '<div class="province">';
 	  		var cityHtml = '<div class="city" >';
@@ -876,17 +887,38 @@
 	  			var _active = "";
 	  			for (var i = chinaMapJSON.length - 1; i >= 0; i--) {
 	  				_chinaMap = chinaMapJSON[i]
-	  				if(_chinaMap["name"].indexOf(provinceArr[j])>-1){if (j==0){
-	  					console.log(chinaMapJSON[i])
+	  				if(_chinaMap["name"].indexOf(provinceArr[j])>-1){
+	  					if (j==0){
 	  						shwohide = "";
 	  						_active = "active";
 	  					}
-	  					provinceHtml +='<p class="p_item '+_active+'"><span class="province-name">'+provinceArr[j]+'</span><span class="city-count"></span></p>'
+	  					var provinceFlag = true;
+	  					if(_provinceArr[provinceArr[j]]!=undefined&&_provinceArr[provinceArr[j]]>0){
+								provinceHtml +='<p class="p_item '+_active+'"><span class="province-name">'+provinceArr[j]+'</span><span class="city-count" style="display: inline;">('+_provinceArr[provinceArr[j]]+')</span></p>'
+								//
+								cityHtml +='<div class="province_city" data-id="'+provinceArr[j]+'" style="display:'+shwohide+'">';
+								provinceFlag = false;
+	  					}
+	  					if(provinceFlag){
+	  						provinceHtml +='<p class="p_item '+_active+'"><span class="province-name">'+provinceArr[j]+'</span><span class="city-count"></span></p>'
 	  					
-	  					cityHtml +='<div class="province_city" data-id="'+provinceArr[j]+'" style="display:'+shwohide+'">'
+	  						cityHtml +='<div class="province_city" data-id="'+provinceArr[j]+'" style="display:'+shwohide+'">'
+	  					}
 	  					var cityArr = _chinaMap["city"]
 	  					for(var m = 0;m < cityArr.length;m++){
-	  						cityHtml +='<p class="c_item"><input type="checkbox" class="checkbox"><span class="city-name">'+cityArr[m]["name"]+'</span></p>'
+	  						var cityFlag = true;
+		  					if(_cityMap.length>0){
+			  					for(var k=0;k<_cityMap.length;k++){
+			  						if(_cityMap[k]==cityArr[m]["name"]){
+			  							cityHtml +='<p class="c_item"><input type="checkbox" class="checkbox"  checked><span class="city-name">'+cityArr[m]["name"]+'</span></p>';
+			  							cityFlag = false;
+			  							break;
+			  						}
+			  					}
+			  				}
+			  				if(cityFlag){
+	  							cityHtml +='<p class="c_item"><input type="checkbox" class="checkbox"><span class="city-name">'+cityArr[m]["name"]+'</span></p>'
+	  						}
 	  					}
 	  					cityHtml +='</div>'
 	  				}
@@ -931,21 +963,18 @@
         })();
         //
         function FTAGData(time){
-        	console.log(time)
         	if(time!=undefined&&time.toString()!=""){
 				var Time = new Date(time);
 				var timestemp = Time.getTime();
-				ajaxFun(timestemp.toString());
+				ajaxFun(timestemp.toString(),selectCity);
         	}else{
-        		ajaxFun();
+        		ajaxFun("",selectCity);
         	}
         }
         //
         $(function () { 
-
 			if(firstTime!=""){
 				date = formatDate(firstTime/1000,"1");
-        		console.log(date)
         	}
             // 点击选择时间
             $('#showDatePicker').on('click', function () {
@@ -1003,7 +1032,7 @@
             $('#showArea').on('click', function (){
             	$('.area_container').slideToggle();
             	$('.screen').toggle();
-            	$("body").toggleClass('overClass');
+            	$(".subscribe").toggleClass('overClass');
             })
             // 地区省份选择的操作
             $('.province .p_item').click(function(){
@@ -1032,18 +1061,21 @@
             //
             $('.screen').click(function(){
             	$('.area_container').slideUp();
-            	$("body").toggleClass('overClass');
+            	$(".subscribe").toggleClass('overClass');
             	$('.screen').hide();
             })
             // 地区选择确认按钮
             $('.enter_btn').click(function (){
-            	$("body").toggleClass('overClass');
+            	$(".subscribe").toggleClass('overClass');
             	let cityCount = $('.area_wrap .city input:checked').length;
             	$('.area_container').slideUp();
             	$('.screen').hide()
+                selectCity = "" //重新选择 初始化地区 参数
 
             	if(!cityCount){
             		$('#showArea .jymobile-tab-triangle').removeClass('current').text(`地区`);
+                    sessionStorage.selectedCityName  = JSON.stringify([]);
+            		 ajaxFun(firstTime,selectCity);
             		return
             	}
 
@@ -1066,15 +1098,21 @@
                     var cityArr = []
                     selectedCities.each(function(i, dom){
                         // 对获取到的城市名字符串去空格处理
-                        cityArr.push($(dom).text().replace(/\s+/g, ''))
+                        cityArr.push($(dom).text().replace(/\s+/g, ''));
                     })
-                    
+                    for(var i=0;i<cityArr.length;i++){
+                        if(selectCity!=""){
+                        	selectCity += ","
+                        }
+                        selectCity += cityArr[i];
+                    }
                     selectedCityName.push({
                     	province: provinceName,
                     	selectCity: cityArr
                     });
+                    sessionStorage.selectedCityName  = JSON.stringify(selectedCityName);
+                    ajaxFun(firstTime,selectCity);
                 })
-                console.log(selectedCityName);
                 // 重写地区text
                 $('#showArea .jymobile-tab-triangle').addClass('current').text(`地区 ${cityCount}`);
                 

src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -229,6 +229,13 @@
     <script src="/js/jquery.cookie.js"></script>
     <script src="/vipsubscribe/js/weui.min.js"></script>
     <script>
+        weui.loading();
+        setTimeout(function(){
+            weui.loading().hide();
+            if(history.state){
+                window.history.go(-1)
+            }
+        },500)
         var a_items = [];//全部数据
         var classify_name = "";//分类名称
         var classify_index = 0;//分类索引
@@ -247,7 +254,6 @@
         }
         $(function(){
             init();
-
             // 关键词分类 - 去设置按钮点击事件
             $('.classify-show-pop .dialog__btn_confirm').on('click', function() {
                 $('.classify-show-pop').hide();
@@ -638,7 +644,7 @@
         // 设置一条空记录，用户第一次进入添加关键词点击确定时候调用
         function setEmptyHistory() {
             if (pageState.isFirstSetKeyword) {
-                history.pushState({}, "","")
+                history.pushState({id:1}, "","")
                 pageState.isFirstSetKeyword = false
             }
         }
@@ -646,7 +652,7 @@
         $(function(){
 
             $(".addNewKeyword div").on('click', function () {
-                history.pushState({}, "","");
+                history.pushState({id:1}, "","");
                 classify_index = $(".classify-list li").length;
                 var noNameIndex = -1;
                 var noName = "未分类"
@@ -674,7 +680,7 @@
                 $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 附加词');
                 $(".enter.addkeyWord").find("input").val("");
                 $(".enter.addkeyWord").show();
-                $('.enterOne').focus();
+                $(".add-keyword-container .addNewKeyword").hide();
                 //第一次进来分类提示
                 showMeg();
             })
@@ -691,6 +697,7 @@
                     $('.add-keyword-container .showKeyWord ul').html('');
                     
                 }
+                $(".add-keyword-container .addNewKeyword").hide();
                 $('.add-keyword-container').show();
                 $('.all-classify-column').hide();
                 
@@ -705,7 +712,7 @@
             // 点击分类目录的每一项，进入对应列表
             $('.classify-list').on('click', '.classify-item-r', function() {
                 // 添加一条空历史记录
-                history.pushState({}, "","");
+                history.pushState({id:1}, "","");
                 classify_name = $(this).parent('div').find('.classify-item-l').text();
                 classify_index = $(this).parent().parent("li.classify-item").index()
                 //展示此关键词信息

src/web/templates/weixin/vipsubscribe/vip_index.html

@@ -119,13 +119,13 @@
                 <div>
                     <i class="icon iconfont" id="close_renew">&#xe61a;</i>
                     <span>VIP订阅服务还有 <span class="renew_day"></span> 天到期，请及时续费！</span>
-                    <a href="vip_renew.html">去续费</a>
+                    <a href="/front/vipsubscribe/renewPayPage">去续费</a>
                 </div>
             </div>
             <!-- 升级 续费 -->
             <div class="tabbar">
-                <a href="vip_update.html" class="update_btn">升级</a>
-                <a href="./vip_renew.html" class="renew_btn">续费</a>
+                <a href="/front/vipsubscribe/toUpgradePage" class="update_btn">升级</a>
+                <a href="/front/vipsubscribe/renewPayPage" class="renew_btn">续费</a>
             </div>
         </div>
         <!-- 自动续费关闭提醒 -->

src/web/templates/weixin/vipsubscribe/vip_viewPage.html

@@ -234,7 +234,7 @@
 				//
 				var buyerclass = "";
 				if(list[i].buyerclass){
-					buyerclass='<span class="buyclass">'+list[i].buyerclass+'</span>'
+					buyerclass='<span class="buyerclass">'+list[i].buyerclass+'</span>'
 				}
 				var tabletime = formatDate(list[i].publishtime);
 				//					
@@ -327,14 +327,14 @@
 		}
 </script>
 <style type="text/css">
-	.restime span.buyclass{
-	border: 1px solid #CFAD89;
-    background: #CFAD89;
-    border-radius: 3px;
-    margin: 0px 5px;
-    padding: 1px 3px;
-    color: #fff;
-    font-size: 14px;
+	.restime span.buyerclass{
+		border: 1px solid #CFAD89;
+	    background: #CFAD89;
+	    border-radius: 3px;
+	    margin: 0px 5px;
+	    padding: 1px 3px;
+	    color: #fff;
+	    font-size: 14px;
 	}
 	.findnull{
 		display:none;