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

src/jfw/front/vipsubscribe.go

@@ -201,28 +201,61 @@ func (s *Subscribepay) SubmitEditSubFinish() {
 
 //升级订阅服务
 func (s *Subscribepay) ToUpgradePage() {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["openid"] = se.EncodeString(myopenid)
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/vip_upgrade.html")
 }
 
 //升级订阅新增区域
 func (s *Subscribepay) AddArea() {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
+	s.T["openid"] = se.EncodeString(myopenid)
 	s.Render("/weixin/vipsubscribe/choose_area_upgrade.html")
 }
 
 //升级订阅新增行业
 func (s *Subscribepay) AddIndustry() {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
+	s.T["openid"] = se.EncodeString(myopenid)
 	s.Render("/weixin/vipsubscribe/choose_industry_upgrade.html")
 }
 
 //服务续费(will：即将到期，exprie：已到期)
 func (s *Subscribepay) RenewPage(sign string) {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
+	s.T["openid"] = se.EncodeString(myopenid)
 	s.T["exprie"] = sign //是否已到期
 	s.Render("/weixin/vipsubscribe/renew_notice.html", &s.T)
 }
 
 //服务续费(will：即将到期，exprie：已到期)
 func (s *Subscribepay) RenewPayPage() {
+	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
+	mynickname, _ := s.Session().Get("s_nickname").(string)
+	myavatar, _ := s.Session().Get("s_avatar").(string)
+	s.T["nickname"] = mynickname
+	s.T["avatar"] = myavatar
+	s.T["openid"] = se.EncodeString(myopenid)
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 }

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

@@ -265,7 +265,17 @@
 		}
     </script>
     <script>
-    	
+    	$(function () {    
+			var isPageHide = false;   
+			window.addEventListener('pageshow', function () {      
+			    if (isPageHide) {
+	                location.reload();
+			    }    
+			});    
+			window.addEventListener('pagehide', function () {
+			    isPageHide = true;
+			});  
+		});
         // 隐藏dialog选择框
         function hideDialog() {
             $('#pay_way').hide(200);

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

@@ -361,7 +361,18 @@
 		}
     </script>
     <script>
-        
+        $(function () {    
+			var isPageHide = false;   
+			window.addEventListener('pageshow', function () {      
+			    if (isPageHide) {
+	                location.reload();
+			    }    
+			});    
+			window.addEventListener('pagehide', function () {
+			    isPageHide = true;
+			});  
+		});
+		
 		var monthPrice = "";
         var yearPrice = "";