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

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

@@ -21,6 +21,24 @@ type AfterPay struct {
 	getPushView    xweb.Mapper `xweb:"/afterPay/getPushView"`    //VIP推送预览
 	updateUserTips xweb.Mapper `xweb:"/afterPay/updateUserTips"` //修改用户未分类关键词提醒
 	directSubKWS   xweb.Mapper `xweb:"/afterPay/directSubKWS"`   //搜索列表直接订阅关键词
+	checkOrder     xweb.Mapper `xweb:"/afterPay/checkOrder"`     //是否有未执行的订单
+}
+
+//
+func (a *AfterPay) CheckOrder() error {
+	defer qutil.Catch()
+	var flag = false
+	userId, _ := a.GetSession("userId").(string)
+	if userId != "" {
+		data, ok := util.MQFW.FindOne("vip_upgrade", `{"s_userid":"`+userId+`","i_isvalid":0}`)
+		if ok && (*data) != nil && len(*data) > 0 {
+			flag = true
+		}
+	}
+	a.ServeJson(map[string]interface{}{
+		"flag": flag,
+	})
+	return nil
 }
 
 //

src/web/staticres/vipsubscribe/js/common.js

@@ -196,4 +196,27 @@ function getSetMealPrice(c,iCount,u,price){
 				return price.year.oneCity_oneBuyerClass * iCount	//1年1市icount个行业
 			}
 	}
+}
+
+//查看用户是否有未执行的订单
+function checkOrder(){
+	var flag = false;
+	$.ajax({
+		type: 'post',
+		url: '/subscribepay/afterPay/checkOrder?t='+new Date().getTime(),
+		data: {},
+		async: false,
+		dataType: 'json',
+		success: function(r){
+			flag = r.flag;
+			if(r.flag){
+				weui.toast('订单尚未到期', {
+	                duration: 2000,
+	                className: 'custom-toast',
+	                callback: function () { console.log('close') }
+	            });
+			}
+		}
+	});
+	return flag
 }

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

@@ -142,8 +142,8 @@
             </div>
             <!-- 升级 续费 -->
             <div class="tabbar">
-                <a href="/weixin/pay/toUpgradePage" class="update_btn">升级</a>
-                <a href="/weixin/pay/renewPayPage" class="renew_btn">续费</a>
+                <a onclick="upgrade()" class="update_btn">升级</a>
+                <a onclick="rebuy()" class="renew_btn">续费</a>
             </div>
         </div>
         <!-- 项目匹配提醒 -->
@@ -279,7 +279,7 @@
 	                        }else{
 	                            $(".to_expired").hide();
 	                        }
-							$(".tabbar").html('<a href="/weixin/pay/toUpgradePage" class="update_btn">升级</a><a href="/weixin/pay/renewPayPage" class="renew_btn">续费</a>')
+							$(".tabbar").html('<a onclick="upgrade()" class="update_btn">升级</a><a onclick="rebuy()" class="renew_btn">续费</a>')
 							$('.free7days_pic').text("已开通VIP订阅服务");
 	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:none}</style>");
 	                   }
@@ -344,6 +344,18 @@
 	            })
 			}
 		}
+		//
+		function upgrade(){
+			if(!checkOrder()){
+				window.location.href="/weixin/pay/toUpgradePage"
+			}
+		}
+		//
+		function rebuy(){
+			if(!checkOrder()){
+				window.location.href="/weixin/pay/renewPayPage"
+			}
+		}
     </script>
 	{{include "/common/baiducc.html"}}
 </body>