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

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

@@ -84,7 +84,7 @@ func checkIsExpire() {
 				"$in": []int{1, 2},
 			},
 			"l_vip_endtime": map[string]interface{}{
-				"$lt": now_unix + threeday,
+				"$lte": now_unix + threeday,
 			},
 		}).Select(map[string]interface{}{"i_vip_status": 1, "l_vip_endtime": 1, "i_vip_expire_tip": 1}).Iter()
 		for m := make(map[string]interface{}); it.Next(&m); {

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

@@ -119,6 +119,7 @@
 			    if(exprie === "will"){
 			    	$(".free_service").hide();
 			    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
+			    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
 			    }else{
 			    	$(".free_service").show();
 			    }