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/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/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()