xuzhiheng 5 years ago
parent
commit
ddfbfc5569

+ 0 - 12
src/jfw/front/vipsubscribe.go

@@ -226,12 +226,6 @@ func (s *Subscribepay) SubmitEditSubFinish() {
 
 
 //升级订阅服务
 //升级订阅服务
 func (s *Subscribepay) ToUpgradePage() {
 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.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/vip_upgrade.html")
 	s.Render("/weixin/vipsubscribe/vip_upgrade.html")
 }
 }
@@ -283,12 +277,6 @@ func (s *Subscribepay) RenewPage(sign string) {
 
 
 //服务续费(will:即将到期,exprie:已到期)
 //服务续费(will:即将到期,exprie:已到期)
 func (s *Subscribepay) RenewPayPage() {
 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.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 }
 }

+ 1 - 0
src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -14,6 +14,7 @@
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
 	{{include "/common/weixin.html"}}
 	{{include "/common/weixin.html"}}
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 </head>
 <style type="text/css">
 <style type="text/css">
 	body,html {
 	body,html {

+ 1 - 1
src/web/templates/weixin/vipsubscribe/choose_industry_upgrade.html

@@ -12,7 +12,7 @@
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         {{include "/common/weixin.html"}}
         {{include "/common/weixin.html"}}
-        
+        <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     </head>
     <style type="text/css">
     <style type="text/css">
     	body,html {
     	body,html {

+ 6 - 5
src/web/templates/weixin/vipsubscribe/renew_notice.html

@@ -4,12 +4,13 @@
 		<meta charset="utf-8">
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>VIP订阅</title>
 		<title>VIP订阅</title>
-		<script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
-		<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
+		<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
 		{{include "/common/weixin.html"}}
 		{{include "/common/weixin.html"}}
+		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	</head>
 	<style type="text/css">
 	<style type="text/css">
 		body,html {
 		body,html {

+ 0 - 3
src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -39,9 +39,6 @@
 	
 	
 </style>
 </style>
 <body class="no-touch">
 <body class="no-touch">
-	<script type="text/javascript">
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
     <div class="vip_renew">
     <div class="vip_renew">
         <div class="choose_condition">
         <div class="choose_condition">
              <!-- 正常点击vip首页续费进入显示下列提示 -->
              <!-- 正常点击vip首页续费进入显示下列提示 -->

+ 0 - 3
src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -40,9 +40,6 @@
 	
 	
 </style>
 </style>
 <body class="no-touch">
 <body class="no-touch">
-	<script type="text/javascript">
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
     <div class="vip_update">
     <div class="vip_update">
         <div class="choose_condition">
         <div class="choose_condition">
             <p class="update_tip">提示:订阅升级可在已购买的服务基础上,增加区域、行业、以及延长订阅周期!</p>
             <p class="update_tip">提示:订阅升级可在已购买的服务基础上,增加区域、行业、以及延长订阅周期!</p>