页面提交

src/jfw/front/vipsubscribe.go

@@ -9,20 +9,29 @@ import (
 
 type Subscribepay struct {
 	*xweb.Action
-	tailInfo          xweb.Mapper `xweb:"/front/vipsubscribe/tailInfo"`          //vip订阅服务-用户信息录入页面
-	introduce         xweb.Mapper `xweb:"/front/vipsubscribe/introducePage"`     //订阅收费介绍页
-	toPurchasePage    xweb.Mapper `xweb:"/front/vipsubscribe/toPurchasePage"`    //订阅收费购买页面
-	toChooseArea      xweb.Mapper `xweb:"/front/vipsubscribe/toChooseArea"`      //订阅收费地区筛选
-	toChooseIndustry  xweb.Mapper `xweb:"/front/vipsubscribe/toChooseIndustry"`  //订阅收费行业筛选
-	toPaySuccessPage  xweb.Mapper `xweb:"/front/vipsubscribe/toPaySuccessPage"`  //订阅支付完成页面
-	toOrderDetailPage xweb.Mapper `xweb:"/front/vipsubscribe/toOrderDetailPage"` //订阅收费支付订单详情页面
-	toSetKeyWordPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
-
+	tailInfo          xweb.Mapper `xweb:"/front/vipsubscribe/tailInfo"`              //vip订阅服务-用户信息录入页面
+	introduce         xweb.Mapper `xweb:"/front/vipsubscribe/introducePage"`         //订阅收费介绍页
+	toPurchasePage    xweb.Mapper `xweb:"/front/vipsubscribe/toPurchasePage"`        //订阅收费购买页面
+	toChooseArea      xweb.Mapper `xweb:"/front/vipsubscribe/toChooseArea/(.*)"`     //订阅收费地区筛选
+	toChooseIndustry  xweb.Mapper `xweb:"/front/vipsubscribe/toChooseIndustry/(.*)"` //订阅收费行业筛选
+	toPaySuccessPage  xweb.Mapper `xweb:"/front/vipsubscribe/toPaySuccessPage"`      //订阅支付完成页面
+	toOrderDetailPage xweb.Mapper `xweb:"/front/vipsubscribe/toOrderDetailPage"`     //订阅收费支付订单详情页面
+	toSetKeyWordPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetKeyWordPage"`      //订阅收费设置关键词
+
+	//修改
 	toEditSubPage     xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`     //订阅收费修改页面
 	toEditSubProvPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubProvPage"` //订阅收费修改省份
 	toEditSubCityPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubCityPage"` //订阅收费修改城市
 	toEditSubInduPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubInduPage"` //订阅收费修改行业
 	submitEditSub     xweb.Mapper `xweb:"/front/vipsubscribe/submitEditSub"`     //提交订阅收费
+
+	//升级
+	toUpgradePage xweb.Mapper `xweb:"/front/vipsubscribe/toUpgradePage"` //订阅收费升级服务页面
+
+	//续费
+	renewPage    xweb.Mapper `xweb:"/front/vipsubscribe/renewPage/(.*)"` //订阅到期(will：即将到期，exprie：已到期)
+	renewPayPage xweb.Mapper `xweb:"/front/vipsubscribe/renewPayPage"`   //订阅到期续费
+
 }
 
 func init() {
@@ -39,14 +48,24 @@ func (s *Subscribepay) ToPurchasePage() {
 	s.Render("/weixin/vipsubscribe/vip_purchase.html")
 }
 
-//订阅收费地区筛选
-func (s *Subscribepay) ToChooseArea() {
-	s.Render("/weixin/vipsubscribe/choose_area.html")
+//订阅收费地区筛选（new：新订单；upgrade：升级）
+func (s *Subscribepay) ToChooseArea(sign string) {
+	if sign == "new" { //新订单
+
+	} else if sign == "upgrade" { //升级服务
+		s.T["hasCity"] = []string{"北京市", "上海市", "广州市"}
+	}
+	s.Render("/weixin/vipsubscribe/choose_area.html", &s.T)
 }
 
-//订阅收费地区筛选
-func (s *Subscribepay) ToChooseIndustry() {
-	s.Render("/weixin/vipsubscribe/choose_industry.html")
+//订阅收费地区筛选（new：新订单；upgrade：升级）
+func (s *Subscribepay) ToChooseIndustry(sign string) {
+	if sign == "new" { //新订单
+
+	} else if sign == "upgrade" { //升级服务
+
+	}
+	s.Render("/weixin/vipsubscribe/choose_industry.html", &s.T)
 }
 
 //订阅收费支付完成页面
@@ -89,7 +108,22 @@ func (s *Subscribepay) SubmitEditSub() {
 	s.Render("/weixin/vipsubscribe/edit_subscribe_success.html")
 }
 
-//
+//升级订阅服务
+func (s *Subscribepay) ToUpgradePage() {
+	s.Render("/weixin/vipsubscribe/vip_upgrade.html")
+}
+
+//服务续费(will：即将到期，exprie：已到期)
+func (s *Subscribepay) RenewPage(sign string) {
+	s.T["exprie"] = sign == "exprie" //是否已到期
+	s.Render("/weixin/vipsubscribe/renew_notice.html", &s.T)
+}
+
+//服务续费(will：即将到期，exprie：已到期)
+func (s *Subscribepay) RenewPayPage() {
+	s.Render("/weixin/vipsubscribe/renew_pay.html")
+}
+
 func (s *Subscribepay) TailInfo() error {
 	defer util.Catch()
 	userId := util.ObjToString(s.GetSession("userId"))

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

@@ -385,7 +385,7 @@
     <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script>
-        var hasCity = []; //定义已购买的城市数组
+        var hasCity = {{.T.hasCity}}; //定义已购买的城市数组
         
         // 获取url传参
         function getParam(name) {

src/web/templates/weixin/vipsubscribe/tmp/vip_service_expire.html → src/web/templates/weixin/vipsubscribe/renew_notice.html

@@ -41,7 +41,7 @@
                 </div>
             </div>
 			<div class="renew_box">
-                <button class="renew_service" onclick="window.location.href='vip_renew.html'">续费</button>
+                <button class="renew_service" onclick="window.location.href='/front/vipsubscribe/renewPayPage'">续费</button>
                 <button class="free_service">使用免费订阅</button>
             </div>
 		</div>

src/web/templates/weixin/vipsubscribe/tmp/vip_renew.html → src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -9,11 +9,11 @@
     <title>VIP订阅续费</title>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="../js/rem.js"></script>
-    <link rel="stylesheet" type="text/css" href="../css/weui.min.css" />
-    <link rel="stylesheet" type="text/css" href="../css/base.css" />
-    <link rel="stylesheet" type="text/css" href="../iconfont/iconfont.css" />
-    <link rel="stylesheet" href="../css/vip_update.css">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.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/vip_update.css?v={{Msg "seo" "version"}}">
 </head>
 
 <body class="no-touch">
@@ -44,8 +44,8 @@
                             </p>
                             <p>
                                 <!-- 正常点击vip首页续费进入显示去升级，即将到期点击vip首页续费显示订阅修改 -->
-                                <a href="vip_update.html" class="go_update">去升级</a>
-                                <a href="vip_subscribe_edit.html" class="go_update">订阅修改</a>
+                                <a href="/front/vipsubscribe/toUpgradePage" class="go_update">去升级</a>
+                                <a href="/front/vipsubscribe/toEditSubPage" class="go_update">订阅修改</a>
                             </p>
                         </div>
                 </li>
@@ -173,7 +173,7 @@
                     <div class="weui-cells weui-cells_checkbox choose-form">
                         <label class="weui-cell weui-check__label wx_label" for="wx">
                             <div class="weui-cell__bd read">
-                                <p><img src="../image/weixin.png?v={{Msg "seo" "version"}}">微信支付</p>
+                                <p><img src="/vipsubscribe/image/weixin.png?v={{Msg "seo" "version"}}">微信支付</p>
                             </div>
                             <div class="weui-cell__hd">
                                 <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
@@ -182,7 +182,7 @@
                         </label>
                         <label class="weui-cell weui-check__label zfb_label" for="zfb">
                             <div class="weui-cell__bd read">
-                                <p><img src="../image/zhifubao.png?v={{Msg "seo" "version"}}">支付宝支付</p>
+                                <p><img src="/vipsubscribe/image/zhifubao.png?v={{Msg "seo" "version"}}">支付宝支付</p>
                             </div>
                             <div class="weui-cell__hd">
                                 <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
@@ -194,9 +194,9 @@
             </div>
         </div>
     </div>
-    <script src="../js/jquery-2.1.4.js"></script>
-    <script src="../js/fastclick.js"></script>
-    <script src="https://res.wx.qq.com/open/libs/weuijs/1.1.4/weui.min.js"></script>
+    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+    <script src="https://res.wx.qq.com/open/libs/weuijs/1.1.4/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         // 隐藏dialog选择框
         function hideDialog() {

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

@@ -18,7 +18,7 @@
         <div class="choose_condition">
             <ul class="chooseList">
                 <li class="choose_item">
-                    <a href="/front/vipsubscribe/toChooseArea">
+                    <a href="/front/vipsubscribe/toChooseArea/new">
                         <span class="label">区域</span>
                         <!-- <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info"> -->
                         <input type="text" disabled value="郑州市" placeholder="1个市" class="info">
@@ -28,7 +28,7 @@
                     <p class="add_tips">已选择 0 个省级区域、0 个地市</p>
                 </li>
                 <li class="choose_item">
-                    <a href="/front/vipsubscribe/toChooseIndustry">
+                    <a href="/front/vipsubscribe/toChooseIndustry/new">
                         <span class="label">行业</span>
                         <!-- <input type="text" disabled value="" placeholder="选择采购单位行业" class="info"> -->
                         <input type="text" disabled value="安监" placeholder="1个行业" class="info">

src/web/templates/weixin/vipsubscribe/tmp/vip_update.html → src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -23,7 +23,7 @@
             <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期!</p>
             <ul class="chooseList">
                 <li class="choose_item">
-                    <a href="choose_area.html?city=北京市、上海市、广州市">
+                    <a href="/front/vipsubscribe/toChooseArea/upgrade">
                         <span class="label">区域</span>
                         <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info">
                         <i class="iconfont icon-arrow"></i>
@@ -31,7 +31,7 @@
                     <p class="add_tips">已新增 1 个省级区域、4 个地市</p>
                 </li>
                 <li class="choose_item">
-                    <a href="choose_industry.html">
+                    <a href="/front/vipsubscribe/toChooseIndustry/upgrade">
                         <span class="label">行业</span>
                         <input type="text" disabled value="" placeholder="选择采购单位行业" class="info">
                         <i class="iconfont icon-arrow"></i>