Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/front/pchelper.go

@@ -343,9 +343,10 @@ func (l *PcHelper) PushView() error {
 	res := map[string]interface{}{}
 	res["hasNextPage"] = false
 	if userid != "" {
-		user, firstPushTime := public.HistoryPush.UserInfo(userid)
+		user, _ := public.HistoryPush.UserInfo(userid)
 		if user != nil {
-			hasNextPage, list, _ := public.HistoryPush.Datas(userid, pageNum, firstPushTime, "")
+			hasNextPage, list := public.HistoryPush.Datas_Mysql(userid, pageNum, "", "")
+			//hasNextPage, list, _ := public.HistoryPush.Datas(userid, pageNum, firstPushTime, "")
 			res["hasNextPage"] = hasNextPage
 			res["data"] = &list
 		}

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

@@ -678,7 +678,7 @@ $(function () {
 		}
 		let showCount = selectedCityLength - dataCount;
 		if(showCount > 2){
-			$(".tips_d_text").text("已选择"+showCount+"个市，建议购买“全省”");
+			$(".tips_d_text").text("已新增"+showCount+"个市，建议新增“全省”");
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();

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

@@ -340,7 +340,7 @@
                 let showCount = buyset - disabledCount;
                 let showCounts = selectedArr.length - showCount;
                 if (showCounts > 3) {
-                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
+                	$('.tips_btn .tips_d_text').text("已新增"+showCounts+"个行业，建议新增“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

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

@@ -752,21 +752,20 @@
             }
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		"area": JSON.stringify(areas),
-	    		"industry": industrys.toString(),
+	    		"areas": JSON.stringify(areas),
+	    		"industrys": industrys.toString(),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":payType,
 	    		"pay_source": "Renew",
-	    		"endtime": ends,
 	    	}
-	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder", param, function (r) {
                 if (r.success) {
+                	$(".save_renew").removeAttr("disabled");
                     //唤起app支付
                     try {
-                        if (pay_way == "wx_app") {
+                        if (payType == "wx_app") {
                             JyObj.wxPay(r.data.res);
-                        } else if(pay_way === "ali_app"){
+                        } else {
                             JyObj.aliPay(r.data.res)
                         }
                         //校验是否支付完成
@@ -774,10 +773,8 @@
                     } catch (e) {
                         alert(e)
                     }
-                    clearSessionStorage();
-                    $(".save_renew").removeAttr("disabled");
                 } else {
-                    $(".save_renew").removeAttr("disabled");
+                    $(".save_renew").removeAttr("disabled")
                 }
             });
 	    });
@@ -803,6 +800,8 @@
 	                if (r.success) {
 	                    clearInterval(interval);
 	                    clearSessionStorage();
+	                    sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 	                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
 	                }
 	            });

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

@@ -766,6 +766,8 @@
         sessionStorage.removeItem("vipSubSelectTime");
         sessionStorage.removeItem("vipSub_read");
         sessionStorage.removeItem("vipSubPayWay");
+        sessionStorage.removeItem("historypushDataCache");
+        sessionStorage.To_introducePage=2;
     }
 
 </script>

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

@@ -1162,9 +1162,10 @@
 	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder", param, function (r) {
                 if (r.success) {
+                    $(".save_upgrade").removeAttr("disabled");
                     //唤起app支付
                     try {
-                        if (pay_way == "wx_app") {
+                        if (payType === "wx_app") {
                             JyObj.wxPay(r.data.res);
                         } else {
                             JyObj.aliPay(r.data.res)
@@ -1175,7 +1176,6 @@
                         alert(e)
                     }
                     clearSessionStorage();
-                    $(".save_upgrade").removeAttr("disabled")
                 } else {
                     $(".save_upgrade").removeAttr("disabled")
                 }
@@ -1209,6 +1209,8 @@
 	                if (r.success) {
 	                    clearInterval(interval);
 	                    clearSessionStorage();
+	                    sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 	                    window.location.replace("/jyapp/vipsubscribe/toPaySuccessPage?orderCode=" + orderid);
 	                }
 	            });

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

@@ -535,30 +535,22 @@ func PayCancel(userId string) bool {
 		"product_type": "VIP订阅",
 	}
 	i, order_len := 0, 0
-	order := util.Mysql.Find("dataexport_order", queryMap, "order_code,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
+	order := util.Mysql.Find("dataexport_order", queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
 	if order != nil {
 		order_len = len(*order)
 		//遍历未支付订单
 		for _, v := range *order {
-			flag := false
-			if qutil.Int64All(v["order_status"]) == 0 {
-				//关闭未支付订单
-				flag = pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
-
-			} else {
-				flag = true
-			}
+			//关闭未支付订单
+			flag := pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
 			if flag {
 				//更改未支付订单状态 -2  逐个取消订单
 				bl := util.Mysql.Update("dataexport_order", bson.M{
-					"user_id":      userId,
-					"product_type": "VIP订阅",
-					"order_status": 0,
-					"order_code":   v["order_code"],
+					"id": v["id"],
 				}, bson.M{
 					"order_status": -2,
 				})
 				if bl {
+					util.MsgRemind.Delete(qutil.IntAll(v["id"]))
 					i++
 				}
 			}

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

@@ -164,7 +164,6 @@ func (a *AfterPay) DirectSubKWS() error {
 			} else if kwsCount >= 300 {
 				flag = "m"
 			} else {
-				//首次添加分类和关键词
 				var _key = make(map[string]interface{})
 				var a_key = make([]map[string]interface{}, 1)
 				classify_name := "未分类"
@@ -269,6 +268,7 @@ func (a *AfterPay) SetUserInfo() error {
 			actionType := a.GetString("actionType")
 			addtion_kws := a.GetSlice("addition_kws")
 			not_kws := a.GetSlice("not_kws")
+			kwscount := a.GetString("kwscount")
 			if len([]rune(kws_name)) > 20 {
 				kws_name = qutil.SubString(kws_name, 0, 20)
 			}
@@ -295,27 +295,36 @@ func (a *AfterPay) SetUserInfo() error {
 							}
 						}
 					}
-					var _key = make(map[string]interface{})
-					var a_key = make([]map[string]interface{}, 1)
-					if classify_name == "" {
-						classify_name = "未分类"
-					}
-					_key["key"] = _kws
-					_key["appendkey"] = addtion_kws
-					_key["notkey"] = not_kws
-					a_key[0] = _key
-					if len(a_key) > 0 {
-						flag = util.MQFW.UpdateById("user", userId, bson.M{
-							"$push": bson.M{
-								"o_vipjy.a_items." + classify_index + ".a_key": bson.M{
-									"$each": a_key,
+					if kwscount != "0" {
+						//修改关键词
+						saveData["o_vipjy.a_items."+classify_index+".s_item"] = classify_name
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".key"] = _kws
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".appendkey"] = addtion_kws
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".notkey"] = not_kws
+					} else {
+						//首次添加分类和关键词
+						var _key = make(map[string]interface{})
+						var a_key = make([]map[string]interface{}, 1)
+						if classify_name == "" {
+							classify_name = "未分类"
+						}
+						_key["key"] = _kws
+						_key["appendkey"] = addtion_kws
+						_key["notkey"] = not_kws
+						a_key[0] = _key
+						if len(a_key) > 0 {
+							flag = util.MQFW.UpdateById("user", userId, bson.M{
+								"$push": bson.M{
+									"o_vipjy.a_items." + classify_index + ".a_key": bson.M{
+										"$each": a_key,
+									},
 								},
-							},
-							"$set": bson.M{
-								"o_vipjy.l_modifydate":                          time.Now().Unix(),
-								"o_vipjy.a_items." + classify_index + ".s_item": classify_name,
-							},
-						})
+								"$set": bson.M{
+									"o_vipjy.l_modifydate":                          time.Now().Unix(),
+									"o_vipjy.a_items." + classify_index + ".s_item": classify_name,
+								},
+							})
+						}
 					}
 					//					}
 				} else if actionType == "DK" { //删除关键词
@@ -376,12 +385,17 @@ func (a *AfterPay) GetUserInfo() error {
 			}
 			delete((*userData), "o_jy")
 			//区域
-			_buyset := qutil.ObjToMap((*data)["o_buyset"].(interface{}))
-			var area_i = qutil.IntAll((*_buyset)["areacount"])
-			var citys = qutil.ObjToMap((*_buyset)["citys"].(interface{}))
+			var area_i = -1
+			var buyerclasscount = -1
 			var city_i = 0
-			for _, cv := range *citys {
-				city_i += qutil.IntAll(cv.(int))
+			_buyset := qutil.ObjToMap((*data)["o_buyset"].(interface{}))
+			if (*_buyset)["citys"] != nil {
+				area_i = qutil.IntAll((*_buyset)["areacount"])
+				citys := qutil.ObjToMap((*_buyset)["citys"].(interface{}))
+				buyerclasscount = qutil.IntAll((*_buyset)["buyerclasscount"])
+				for _, cv := range *citys {
+					city_i += qutil.IntAll(cv.(int))
+				}
 			}
 			if area_i != -1 && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域、" + strconv.Itoa(city_i) + "个地市"
@@ -393,7 +407,7 @@ func (a *AfterPay) GetUserInfo() error {
 				(*data)["o_area"] = "全国"
 			}
 			//采购行业
-			(*data)["a_buyerclass"] = qutil.IntAll((*_buyset)["buyerclasscount"])
+			(*data)["a_buyerclass"] = buyerclasscount
 			//有效日期
 			var _starttime = (*userData)["l_vip_starttime"]
 			(*userData)["l_vip_starttime"] = strings.Replace(qutil.FormatDateWithObj(&_starttime, qutil.Date_Short_Layout), "-", ".", -1)

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

@@ -212,7 +212,7 @@ func (o *OrderListDetails) DeleteOrder() error {
 		var boo = false
 		var flag = false
 		//删除 取消前 先关闭订单
-		order := util.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
+		order := util.Mysql.FindOne(tableName_order, queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "")
 		if order != nil {
 			if qutil.IntAll((*order)["order_status"]) == 0 { //未支付状态下 删除订单需要先关闭订单
 				flag = pay.CloseDataExportOrder(qutil.ObjToString((*order)["pay_way"]), qutil.ObjToString((*order)["out_trade_no"]), qutil.ObjToString((*order)["prepay_time"]))
@@ -228,6 +228,9 @@ func (o *OrderListDetails) DeleteOrder() error {
 				//删除订单
 				boo = util.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
 			}
+			if boo {
+				util.MsgRemind.Delete(qutil.IntAll((*order)["id"]))
+			}
 		}
 
 		o.ServeJson(map[string]interface{}{

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

@@ -180,10 +180,9 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 		filter := entity.VipSimpleMsg{}
 		if pay_source == "Renew" {
-			vipjy := (*res)["o_vipjy"].(map[string]interface{})
 			filter = entity.VipSimpleMsg{
-				qutil.ObjToMap(vipjy["o_area"]),
-				qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{})),
+				areas,
+				industrys,
 				nil,
 				nil,
 				nil,
@@ -216,8 +215,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			totalfee = entity.JyVipSubStruct.GetSubVipPrice(area, industry, date_count, date_unit)
 		} else if pay_source == "Upgrade" {
 			upgradeYear, upgradeMonth := MaxUpgradeMonth(end) //获取最大升级月数
-			log.Println(upgradeYear)
-			log.Println(upgradeMonth)
 			vipjy := (*res)["o_vipjy"].(map[string]interface{})
 			addIndustry := qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{}))
 			buyerclasscount := vipjy["o_buyset"].(map[string]interface{})["buyerclasscount"]
@@ -306,7 +303,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			}
 			prepayid = qutil.ObjToString((*ret)["prepayid"])
 			payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
-			log.Println("tradeno", tradeno)
 		} else { //支付宝支付
 			var err error
 			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(totalfee)), "", pay.ALI_SUBVIP_APP)

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -72,7 +72,7 @@ func syncVipUpgrade() {
 
 //每天0点 检查试用、vip服务是否到期
 func checkIsExpire() {
-	crontab(false, TimeTaskConfig.CheckIsExpire, func() {
+	crontab(true, TimeTaskConfig.CheckIsExpire, func() {
 		log.Println("定时任务，开始更新vip状态")
 		now_unix := time.Now().Unix()
 		sess := util.MQFW.GetMgoConn()

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

@@ -55,6 +55,14 @@ func (m *msgRemind) Add(orderId, orderMoney, vipType, remindStatus int, orderCod
 	})
 }
 
+/*删除待提醒的订单
+ *@param orderId 订单id
+ */
+func (m *msgRemind) Delete(orderId int) {
+	log.Println("删除待提醒的订单", orderId)
+	m.unpaidOrders.Delete(orderId)
+}
+
 /*
  *订单支付成功以后，消息通知处理
  *@param orderId 订单id

src/jfw/modules/weixin/src/wx/wx.go

@@ -1559,9 +1559,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 	}
 	o_vipjy, _ := (*user)["o_vipjy"].(map[string]interface{})
 	var classify_index = 0 //未分类索引
-	//var keys_index = 0     未分类关键词组数量
-	var keysHas = ""    //已订阅关键词
-	var itemHas = false //是否有未分类
+	var keysHas = ""       //已订阅关键词
 	flag := false
 	//有分类
 	var keysFilter = strings.Split(strings.Replace(keyWord, "+", " ", -1), " ")
@@ -1574,7 +1572,6 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			keysMap := util.ObjArrToMapArr(v["a_key"].([]interface{}))
 			if v["s_item"].(string) == "未分类" {
 				classify_index = i
-				itemHas = true
 			}
 			keysCount += len(keysMap)
 			for _, k := range keysMap {
@@ -1607,29 +1604,23 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 		}
 	}
-	var _key []map[string]interface{}
-	if itemHas {
-		for _, v := range keysFilter {
-			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
-			_key = append(_key, tmp)
-		}
+	var _key = make(map[string]interface{})
+	var a_key = make([]map[string]interface{}, 1)
+	classify_name := "未分类"
+	_key["key"] = keysFilter
+	a_key[0] = _key
+	if len(a_key) > 0 {
 		flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
-			"$push": bson.M{"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": bson.M{"$each": _key}},
+			"$push": bson.M{
+				"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": bson.M{
+					"$each": a_key,
+				},
+			},
+			"$set": bson.M{
+				"o_vipjy.l_modifydate":                                        time.Now().Unix(),
+				"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".s_item": classify_name,
+			},
 		}, false, false)
-	} else {
-		var o_kws = make(map[string]interface{})
-		o_kws["s_item"] = "未分类"
-		for _, v := range keysFilter {
-			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
-			_key = append(_key, tmp)
-		}
-		o_kws["a_key"] = _key
-		o_kws["i_tips"] = 0
-		if o_kws != nil && len(o_kws) > 0 {
-			flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
-				"$push": bson.M{"o_vipjy.a_items": o_kws},
-			}, false, false)
-		}
 	}
 	if flag {
 		return 1, strings.Replace(strings.Join(keysFilter, " "), "+", " ", -1), hasOldKey
@@ -1646,6 +1637,7 @@ func fastSubscribe(content, openId string) (int, string, bool) {
 		//content = strings.TrimSpace(content)
 		content = regexp.MustCompile("\\s+").ReplaceAllString(content, " ")
 		keyWord := strings.Replace(content, " ", "+", -1)
+		log.Println(keyWord, ":kwssssssss")
 		o_jy, _ := (*user)["o_jy"].(map[string]interface{})
 		i_vip_status := util.IntAll((*user)["i_vip_status"])
 		if (*user)["i_vip_status"] != nil && i_vip_status > 0 && keyWord != "" {

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

@@ -149,6 +149,7 @@
 .vip_banner .box .left h4 {
   font-size: .32rem;
   color: #FFDAB1;
+font-weight: bold;
 }
 
 .vip_banner .box .right {

src/web/staticres/vipsubscribe/js/updateArea.js

@@ -660,7 +660,7 @@ $(function () {
 	function showCityTips(dom){
 		let isAll = $(".area-list").attr("data-buy-province-count");
 		if(Number(isAll)===-1){
-			return	
+			return
 		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;

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

@@ -393,7 +393,7 @@
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}14"></script>
+    <script src="/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}16"></script>
 </body>
 
 </html>

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

@@ -339,7 +339,7 @@
                 let showCount = buyset - disabledCount;
                 let showCounts = selectedArr.length - showCount;
                 if (showCounts > 3) {
-                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
+                	$('.tips_btn .tips_d_text').text("已新增"+showCounts+"个行业，建议新增“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

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

@@ -634,6 +634,7 @@
             param.actionType = actionType;
             param.addition_kws = addition_kws;
             param.not_kws = not_kws;
+			 param.kwscount = $(".content .showKeyWord li").length;
             $.ajax({
                 type: "POST",
                 url: "/subscribepay/afterPay/setUserInfo",

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

@@ -254,29 +254,33 @@
   				},
   				function(r){
 				    if(r.err_msg == "get_brand_wcpay_request:ok"){
-						setTimeout(function(){
-							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-						},500)
-					}	
-//					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){               
-////	                	alert("开发环境【支付跳转完成】")
-//		                try{
-////		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-////		                    window.location.reload();
-//		                }catch(e){
-//		                  alert(e)
-//		                }
-//	  				}else{
-//	                	weui.toast("系统异常，请稍微再试",{
-//	                  		duration: 2000,
-//	                  		className: 'custom-toast',
-//	                	});
-//	  				}
+						clearSessionStorage();
+						sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
+						checkPaySuccess(ordercode);
+					}
   				});
   			}   
 		}catch(e){
 		  console.log(e)
 		}
+		var interval
+        //支付完成跳转
+        function checkPaySuccess(orderCode){
+        	if(interval){
+            	clearInterval(interval);
+    		}
+        	interval=setInterval(function() {
+            	$.post("/jypay/vipPaySuccess", {
+							code: orderCode
+						}, function(r) {
+							if (r.success) {
+								window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
+								clearInterval(interval);
+							}
+						})
+         	},3000)
+        }
     </script>
     <script>
     	$(function () {    
@@ -775,8 +779,8 @@
 	    $(".save_renew").on("click", function(){
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		"area": JSON.stringify(areas),
-	    		"industry": industrys.toString(),
+	    		"areas": JSON.stringify(areas),
+	    		"industrys": industrys.toString(),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":"wx_js",
 	    		"pay_source": "Renew",

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

@@ -763,6 +763,7 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
             sessionStorage.removeItem("historypushDataCache");
+            sessionStorage.To_introducePage=2;
         }
 
         /******* 获取url参数（正则）********/

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

@@ -245,7 +245,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}3"></script>
     <script type="text/javascript">
@@ -289,10 +288,8 @@
 				    if(r.err_msg == "get_brand_wcpay_request:ok"){
 				    	//
                     	clearSessionStorage();
-						
-						/*setTimeout(function(){
-							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-						},500)*/
+						sessionStorage.To_introducePage=2;
+						sessionStorage.removeItem("historypushDataCache");
 						checkPaySuccess(ordercode);
 					}
 				});
@@ -300,23 +297,23 @@
 		}catch(e){
 		  console.log(e)
 		}
-				var interval
-		        //支付完成跳转
-		        function checkPaySuccess(orderCode){
-		        	if(interval){
-		            	clearInterval(interval);
-	        		}
-		        	interval=setInterval(function() {
-		            	$.post("/jypay/vipPaySuccess", {
-									code: orderCode
-								}, function(r) {
-									if (r.success) {
-										window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
-										clearInterval(interval);
-									}
-								})
-		         	},3000)
-		        }
+		var interval
+        //支付完成跳转
+        function checkPaySuccess(orderCode){
+        	if(interval){
+            	clearInterval(interval);
+    		}
+        	interval=setInterval(function() {
+            	$.post("/jypay/vipPaySuccess", {
+							code: orderCode
+						}, function(r) {
+							if (r.success) {
+								window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+orderCode);
+								clearInterval(interval);
+							}
+						})
+         	},3000)
+        }
     </script>
     <script>
         $(function () {    

src/web/templates/weixin/wxkeyset/index.html

@@ -47,6 +47,7 @@
 .vip_banner .box .left h4 {
     font-size: .32rem;
     color: #FFDAB1;
+	font-weight: bold;
 }
 .msg_alert {
     position: fixed;
@@ -108,13 +109,18 @@ $(function(){
 		$(".keyWordContent").removeClass("_margin_b");
 	})
 	if(sessionStorage){
+		if(sessionStorage.To_introducePage==2){
+			sessionStorage.removeItem("To_introducePage");
+			history.go(-1);
+			return
+		}
 		if(sessionStorage.keysetindexToHistory=="2"){
 			sessionStorage.keysetindexToHistory="3"
 		}else{
 			sessionStorage.keysetindexToHistory="1"
 		}
 	}
-	$("body").css("background-color","FFF");
+	$("body").css({"visibility":"","background-color":"FFF"});
 
 	if(!isIOS){
 		$(".relRecom").addClass("isnotios");
@@ -703,13 +709,14 @@ function saveSeniorset(r){
 }
 //
 function tointroducepage(){
-	//sessionStorage.removeItem("keysetindexToHistory");
-	window.location.replace("/front/vipsubscribe/introducePage");
+	sessionStorage.To_introducePage=1;
+	$("body").css({"visibility":"hidden"});
+	window.location.href="/front/vipsubscribe/introducePage";
 }
 
 </script>
 </head>
-<body class="keysetpage">
+<body class="keysetpage" style="visibility:hidden;">
 	<div class="vip_banner" style="">
 		<div class="box">
 			<div class="left">