Prechádzať zdrojové kódy

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

xuzhiheng 5 rokov pred
rodič
commit
73999344c9

+ 3 - 2
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
 		}

+ 8 - 0
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

+ 1 - 0
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 {

+ 11 - 4
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">