Merge branch 'dev2.7' into release

core/src/qfw/mobile/wxmenu.go

@@ -62,7 +62,7 @@ func (m *Mobile) Wxex() error {
 					queryop := make(M)
 					queryop["s_m_openid"] = (*userdata)["s_m_openid"]
 					jysb := mongodb.Find("jy_subscribe", queryop, `{"l_date":-1}`, `{"s_event":1}`, false, 0, 1)
-					if (*jysb)[0]["s_event"] == "subscribe" {
+					if jysb != nil && len(*jysb) > 0 && (*jysb)[0]["s_event"] == "subscribe" {
 						newsubscribe = "Y"
 					}
 				}

core/src/web/templates/swordfish/wxex.html

@@ -11,7 +11,7 @@
 	var newsubscribe = {{.T.newsubscribe}};
 	$(function(){
 		if (newsubscribe == "Y"){	
-		window.location.href="http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000024&idx=1&sn=c2f4271a361bfb90b22abb1d6818accc#rd";
+		window.location.href="https://mp.weixin.qq.com/s/tlarfElThAHc9sqWIX-BmQ";
 		return false;
 		}else{
 			$(".sf_promptone").removeClass("hidden");