瀏覽代碼

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

wangshan 5 年之前
父節點
當前提交
8f6cc44bdb

+ 26 - 5
src/jfw/front/vipsubscribe.go

@@ -1,6 +1,7 @@
 package front
 
 import (
+	"jfw/public"
 	"jfw/wx"
 	"qfw/util"
 
@@ -15,7 +16,7 @@ type Subscribepay struct {
 	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"` //订阅收费支付订单详情页面
+	toOrderDetailPage xweb.Mapper `xweb:"/weixin/pay/toOrderDetailPage"`         //订阅收费支付订单详情页面
 	toSetKeyWordPage  xweb.Mapper `xweb:"/front/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
 	toSetPage         xweb.Mapper `xweb:"/front/vipsubscribe/toSetPage"`         //订阅收费设置
 	toSetInfoTypePage xweb.Mapper `xweb:"/front/vipsubscribe/toSetInfoTypePage"` //订阅收费设置信息类型
@@ -109,15 +110,35 @@ func (s *Subscribepay) ToSetPage() {
 }
 
 //vip订阅介绍页
-func (s *Subscribepay) Introduce() {
+func (s *Subscribepay) Introduce() error {
+	userId := util.ObjToString(s.GetSession("userId"))
+	if userId == "" {
+		return s.Redirect("/swordfish/about")
+	}
+	m, _ := public.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1}`)
+	if len(*m) == 0 {
+		return s.Redirect("/swordfish/about")
+	}
+	obj := util.ObjToMap((*m)["o_vipjy"])
+	s.T["notShowTrial"] = util.IntAll((*obj)["i_trial"]) == -1 || (*m)["i_vip_status"] != nil
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
-	s.Render("/weixin/vipsubscribe/vip_introduce.html")
+	return s.Render("/weixin/vipsubscribe/vip_introduce.html")
 }
 
 //试用完善信息
-func (s *Subscribepay) TrialInfo() {
+func (s *Subscribepay) TrialInfo() error {
+	userId := util.ObjToString(s.GetSession("userId"))
+	if userId == "" {
+		return s.Redirect("/swordfish/about")
+	}
+	m, ok := public.MQFW.FindById("user", userId, `{"o_vipjy":1}`)
+	if !ok || len(*m) == 0 {
+		return s.Redirect("/swordfish/about")
+	}
+	obj := util.ObjToMap((*m)["o_vipjy"])
+	s.T["trialSign"] = util.IntAll((*obj)["i_trial"]) == 1
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
-	s.Render("/weixin/vipsubscribe/trial_info.html", &s.T)
+	return s.Render("/weixin/vipsubscribe/trial_info.html", &s.T)
 }
 
 //订阅收费购买页面

+ 4 - 0
src/jfw/modules/app/src/app/front/myorder.go

@@ -161,6 +161,8 @@ func (m *MyOrder) QueryMyOrder() error {
 	} else {
 		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
+	//2.8.5 app暂时不显示 vip订单
+	queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
 	//总数
 	haveNextPage, res, _ := m.Datas(queryM, 1)
 	count := len(res)
@@ -222,6 +224,8 @@ func (m *MyOrder) MyOrderPaging() error {
 	} else {
 		queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 	}
+	//2.8.5 app暂时不显示 vip订单
+	queryM["product_type"] = map[string]interface{}{"ne": "VIP订阅"}
 	haveNextPage, res, _ := m.Datas(queryM, pageNum)
 	if res != nil {
 		for _, v := range res {

+ 15 - 13
src/jfw/modules/app/src/web/templates/me/index.html

@@ -200,18 +200,18 @@
 		</div>
 		<!--通知end-->
 		
-		<!--vip订阅开始-->
-		<div class="vip">
-			<ul>
-				<li class="vip_">
-				<img src="/jyapp/me/images/vip.svg" class="vipimg"/>
-					<a class="vipa">VIP订阅</a>
-					<i class="redspot"></i>
-					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>			
-			</ul>
-		</div>
-		
+		<!--vip订阅开始
+			<div class="vip">
+				<ul>
+					<li class="vip_">
+					<img src="/jyapp/me/images/vip.svg" class="vipimg"/>
+						<a class="vipa">VIP订阅</a>
+						<i class="redspot"></i>
+						<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
+					</li>			
+				</ul>
+			</div>
+		-->
 		<!--vip订阅结束-->
 		
 		<!--我的订单-->
@@ -234,12 +234,14 @@
 					<i class="redspot"></i>
 					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
 				</li>	
+			<!--				
 				<li class="myEmail">
 					<img src="/jyapp/me/images/email.svg" class="emailimg"/>
 					<a class="emaila">邮箱地址 {{if .T.isNoEmail}}<span class="no_set_email">未绑定</span>{{end}}</a>
 					<i class="redspot"></i>
 					<i class="jyapp-icon jyapp-icon-youjiantou"> </i>
-				</li>			
+				</li>	
+			-->		
 			</ul>
 		</div>
 		<!--我的关注start-->

+ 1 - 1
src/jfw/modules/subscribepay/src/service/vipSubscribeTrial.go

@@ -188,7 +188,7 @@ func (t *TrialOrder) SubmitApply() {
 			if res != nil && len(*res) > 0 && ok {
 				o_vipjy := qutil.ObjToMap((*res)["o_vipjy"])
 				i_trial, ok := (*o_vipjy)["i_trial"]
-				if !ok || qutil.IntAll(i_trial) == 2 { //2为不提示状态
+				if !ok || qutil.IntAll(i_trial) == 2 {  //2为不提示状态
 					if !util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"o_vipjy.i_trial": 1}}) {
 						log.Println("更新使用状态出错", userId)
 					}

+ 1 - 0
src/web/staticres/vipsubscribe/css/trial_info.css

@@ -1,3 +1,4 @@
+
 .trial_info {
   width: 100%;
   height: 100%;

+ 3 - 1
src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -565,7 +565,9 @@
   position: fixed;
   bottom: 0;
 }
-
+.weui-check__label:active {
+    background-color: #fff !important;
+}
 .vip_purchase .fixed-bottom-box .price {
   display: flex;
   align-items: center;

+ 1 - 1
src/web/staticres/vipsubscribe/css/vip_update.css

@@ -877,7 +877,7 @@
 }
 
 .vip_renew .detail_item .item_info .label {
-  width: 1.56rem;
+  width: 1.6rem;
 }
 
 .vip_renew .detail_item .item_info .label_for {

+ 5 - 1
src/web/staticres/vipsubscribe/js/common.js

@@ -1,6 +1,10 @@
 $(function() {
     // 解决ios系统click 事件300毫秒的延迟
-    FastClick.attach(document.body); 
+    try{
+	    FastClick.attach(document.body); 
+    }catch(e){
+		console.log(e)    	
+    }
 });
 
 //请求同意调用

+ 6 - 6
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -294,12 +294,12 @@
   					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
   						//取消支付 可以再次支付
 			            canpay=true;
-			            alert("开发环境【支付跳转完成】")
-			            try{
-			  				window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-		            	}catch(e){
-			                alert(e)
-		                }
+//			            alert("开发环境【支付跳转完成】")
+//			            try{
+//			  				window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+//		            	}catch(e){
+//			                alert(e)
+//		                }
   					}else{
 		                weui.toast("系统异常,请稍微再试",{
 		               		duration: 2000,

+ 32 - 10
src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -363,7 +363,8 @@
         <div class="tips_btn">
             <div class="tips_discount">
                 <div class="tips_d_money" style="display: block">&yen;38</div>
-                <div class="tips_d_text">已选择4个市,建议购买“全省”更划算哦~</div>
+                <div class="tips_d_text citys">已选择4个市,建议购买“全省”更划算哦~</div>
+                <div class="tips_d_text all">已选择10个省,建议购买“全国”更划算哦~</div>
             </div>
             <div class="btns">
                 <button class="reset-btn">重置</button>
@@ -390,7 +391,7 @@
         </div>
     </div>
     <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="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
@@ -401,7 +402,7 @@
             	buystr = data.area;
         	}
         }, false);
-        console.log(buystr)
+//      console.log(buystr)
       var AreaChoose={
         selectObj:{},//已选择,未购买城市;
         buyObj:{},//已购买
@@ -426,7 +427,7 @@
             if(checkObj(buystr)){
             	this.buyObj = {"全国":[]}
             }
-            console.log(this.buyObj)
+//          console.log(this.buyObj)
             //是否试用界面
             if(sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial=true;
           }catch(e){
@@ -522,6 +523,7 @@
           $('.result_name').empty()
           var data = []; //定义一个总数组
           var cityArr =[]; //定义一个选中城市数组
+          var provincesArr = [];
           var val = $('.other').parents('.province').text().trim();
           if ($('.other').is(':checked')) {
             // data.push(val)
@@ -533,13 +535,14 @@
               let arr =[];
               // 判断省份下的城市是否等于选中的城市长度,相等就是全部选中
               if (length == activeLeng) {
-                  $('.tips_btn .tips_d_text').hide()
+                  $('.tips_btn .tips_d_text.citys').hide()
                   // data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim())
                   let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
                   data.push({
                       name:province,
                       children:[]
-                  })
+                  });
+                  provincesArr.push(province);
               } else { 
                   let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
                   let city = $(this).html()
@@ -561,7 +564,8 @@
           data = data.reduce((cur,next) =>{
               obj[next.name] ? "" : obj[next.name] = true && cur.push(next);
               return cur
-          },[]) 
+          },[]);
+          
           // 数组筛选
           let result = data.map(v =>{
               let filterArr = v.children.filter(s =>{
@@ -579,7 +583,8 @@
                   // 判断每个省份下选中的城市长度,当大于等于4的时候 弹出"选择全省更划算的弹窗"
                   let childrenArr=[];
                   if (children.length >= 4 && !this.vipSubisTrial) {
-                      $('.tips_btn .tips_d_text').show()
+                      $('.tips_btn .tips_d_text.citys').text("已选择"+children.length+"个市,建议购买“全省”更划算哦~");
+                      $('.tips_btn .tips_d_text.citys').show();
                   } 
                   html += `${result[i].name}(`
                   for(var j = 0;j < children.length;j++){
@@ -605,6 +610,21 @@
                   this.selectObj[result[i].name]=[];//
               }
           }
+          	for (var x = 0; x < provincesArr.length; x++) {
+	            for (var j =x+1; j <provincesArr.length; ) {
+	                if (provincesArr[x] === provincesArr[j]){
+	                    provincesArr.splice(j, 1);
+	                }
+	                else j++;
+	            }
+	        }
+          	if(provincesArr.length > 9){
+          		$('.tips_d_text.all').text("已选择"+provincesArr.length+"个省,建议购买“全国”更划算哦~");
+          		$('.tips_d_text.all').show();
+          		$('.tips_d_text.citys').hide();
+          	}else{
+          		$('.tips_d_text.all').hide();
+          	}
 //        console.log("this.selectObj:",this.selectObj)
           $('.result_name').append(html)
           AreaChoose.isOpen()
@@ -642,7 +662,7 @@
           let minHeight = $('.result_text').css('min-height')
           let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
           $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
-          console.log("高度:"+ pHeight,"最小高度"+ minHeight,"行数:" + rows)
+//        console.log("高度:"+ pHeight,"最小高度"+ minHeight,"行数:" + rows)
           if(rows == 1){
               if(length >= 50){
                   $('.detail').show()
@@ -652,7 +672,7 @@
                   $('.packup').hide()
               }
           }else if(rows == 2){
-              console.log($('.result_name').html().trim().length)
+//            console.log($('.result_name').html().trim().length)
               let length = $('.result_name').html().trim().length;
               if(length >= 50){
                   $('.detail').show()
@@ -819,6 +839,8 @@
 		    }
 		    return false;
 		}
+	    //
+
     </script>
 </body>
 

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

@@ -114,7 +114,7 @@
           },
           initClick:function(){
             $(".edit_item").on("click",function(){
-              window.location.href=$(this).attr("data_href");
+               window.location.replace($(this).attr("data_href"));
             });
             //提交
           },

+ 22 - 15
src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -13,7 +13,7 @@
     <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"}}3">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}5">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
@@ -30,7 +30,7 @@
              <!-- 正常点击vip首页续费进入显示下列提示 -->
             <p class="update_tip renew_upgrade">提示:订阅续费可在已购买的服务基础上,延长订阅服务周期</p>
              <!-- 即将到期点击vip首页续费显示下列提示 -->
-            <p class="expire_tip renew_update">提示:您的VIP订阅服务即将到期,为不影响您的使用请立即续费</p>
+            <p class="expire_tip renew_update">提示:您的VIP订阅服务即将到期,为不影响您的使用请立即续费</p>
             <ul class="chooseList">
                 <li class="detail_item">
                         <div class="item_info item_area">
@@ -46,10 +46,8 @@
                             <span class="label_for">10个月</span>
                         </div>
                         <div class="item_info item_validity">
-                            <p>
-                                <span class="label">有效日期:</span>
-                                <span class="label_for">2020.01.31 - 2020.10.31</span>
-                            </p>
+                            <span class="label">有效日期:</span>
+                            <span class="label_for">2020.01.31 - 2020.10.31</span>
                             <p>
                                 <!-- 正常点击vip首页续费进入显示去升级,即将到期点击vip首页续费显示订阅修改 -->
                                 <a href="/weixin/pay/toUpgradePage" class="go_update renew_upgrade">去升级</a>
@@ -200,7 +198,7 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <script src="/vipsubscribe/js/common.js"></script>
+    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}3"></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 type="text/javascript">
@@ -246,9 +244,10 @@
 							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
 						},500)
 					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){               
-	                	alert("开发环境【支付跳转完成】")
+//	                	alert("开发环境【支付跳转完成】")
 		                try{
-		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+//		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+		                    window.location.reload();
 		                }catch(e){
 		                  alert(e)
 		                }
@@ -353,6 +352,12 @@
                 currentNum = currentNum <= data.numboxMin ? data.numboxMin : currentNum - data
                     .numboxStep;
             }
+            if (currentNum >= 10) {
+            	$('.profit_tips').text("已选择"+currentNum+"个月,建议“按年订阅”更划算哦~");
+                $('.profit_tips').show();
+            } else {
+                $('.profit_tips').hide()
+            }
             $number.text(currentNum)
             if(currentNum >= 10){
             	currentNum = 10;
@@ -361,11 +366,12 @@
             $('.computed_price').html('¥' + price)
             var firstButton = $('#number_box_month button:first')
             var lastButton = $('#number_box_month button:last')
-            if (currentNum >= 10) {
-                $('.profit_tips').show()
-            } else {
-                $('.profit_tips').hide()
-            }
+//          if (currentNum >= 10) {
+//          	$('.profit_tips').text("已选择"+currentNum+"个月,建议“按年订阅”更划算哦~");
+//              $('.profit_tips').show();
+//          } else {
+//              $('.profit_tips').hide()
+//          }
             // 如果为操作后的结果为1,则锁定减号按钮
             if (currentNum === data.numboxMin) {
                 firstButton.attr('disabled', true)
@@ -399,7 +405,8 @@
             let isChecked = $(this).is(':checked')
             let val = $('.month_number').text();
             if (val >= 10) {
-                $('.profit_tips').show()
+            	$('.profit_tips').text("已选择"+val+"个月,建议“按年订阅”更划算哦~");
+                $('.profit_tips').show();
                 val = 10;
             }
 //          console.log(val)

+ 17 - 7
src/web/templates/weixin/vipsubscribe/trial_info.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="/vipsubscribe/css/trial_info.css?v=111">    
 </head>
 
-<body>
+<body style="height: 100vh">
     <div class="trial_info">
         <form class="form" id="formInfo">
             <div class="trial_body">
@@ -23,11 +23,14 @@
                     <div class="shadow"></div>
                 </div>
                  <!-- 未完善个人信息展示的内容 -->
+                {{if not .T.trialSign }}
                  <div class="form_title">- 完善个人信息 -</div>
+                {{else}}
                  <!-- 已完善展示的内容-->
-                <div class="perfect" style="display:none;">您已完善过个人信息<br/>可直接领取试用</div>
-
+                <div class="perfect">您已完善过个人信息<br/>可直接领取试用</div>
+                {{end}}
                  <!-- 未完善个人信息展示form_info  已完善不展示-->
+               {{if not .T.trialSign }}
                 <div class="form_info">
                     <div class="form_top">
                         <div class="form_item form_item_line">
@@ -55,7 +58,7 @@
                         </div>
                     </div>
                 </div>
-
+                {{end}}
                 <div class="explain">
                     <div class="explain_title">- 活动说明 -</div>
                     <p class="explain_item">1、每个用户完善个人信息后,只有一次7天试用权;</p>
@@ -65,9 +68,8 @@
             </div>
             <div class="trial_btn">
                 <!-- 未完善个人信息展示的按钮 type类型为submit-->
-                <button class="btn" disabled type="submit">申请免费试用</button>
+                <button class="btn"  type="submit">立即免费试用</button>
                 <!-- 已完善过个人信息 展示的按钮 type类型为button -->
-                <button type="button" style="display: none;" onclick="window.location.href='/front/vipsubscribe/introducePage'">申请免费试用</button>
             </div>
             
         </form>
@@ -81,7 +83,9 @@
     <script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
     <script>
         initShare({{.T.signature}});
+        {{if not .T.trialSign }}
         $(function () {
+            $(".btn").text("申请免费试用").attr("disabled","disabled");
             //获取用户信息
             $DoPost("/subscribepay/trial/GetUserPhone",{},function(r){
               if(r.success){
@@ -152,12 +156,18 @@
                 // ajax提交成功后跳转至vip购买页
                 $DoPost("/subscribepay/trial/submitApply",post_data,function(r){
                   if(r.success){
-                    window.location.replace("/front/vipsubscribe/introducePage");
+                    window.location.replace("/weixin/pay/vipsubscribe_trial");
                   }
                 })
                 return false;	
             });
         });
+        {{else}}
+            $('#formInfo').submit(function(e) {	
+              window.location.replace("/weixin/pay/vipsubscribe_trial");
+              return false;	
+            });
+        {{end}}
     </script>
 </body>
 

+ 3 - 1
src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -133,7 +133,9 @@
                 </div>
         </div>
         <div class="menu">
-            <a href="/weixin/pay/vipsubscribe_trial" class="try_btn">试用7天</a>
+            {{if not .T.notShowTrial }}
+            <a href="/front/vipsubscribe/trialInfo" class="try_btn">试用7天</a>
+            {{end}}
             <a href="/weixin/pay/vipsubscribe_new" class="subscribe_btn">去订阅</a>
         </div>
     </div>

+ 215 - 210
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -257,7 +257,7 @@
         </div>
     </div>
     <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="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
@@ -436,234 +436,239 @@
           }
         }
       }
-        
+      
+      $(window).bind("pageshow", function(event){
+          if(event.originalEvent.persisted){
+              window.location.reload();
+          }
+      });  
         
 
         $(function () {           
-            purchase.initData();
-            purchase.showArea();
-            purchase.showIndustry();
-            purchase.showTime();
-            purchase.flushPrice();
-            checkOk();
-            var time_limit;//定义一个周期变量
-            /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
-            $('.weui-mask').click(hideDialog);
-            $('.cancel').click(hideDialog);
+          purchase.initData();
+          purchase.showArea();
+          purchase.showIndustry();
+          purchase.showTime();
+          purchase.flushPrice();
+          checkOk();
+          var time_limit;//定义一个周期变量
+          /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
+          $('.weui-mask').click(hideDialog);
+          $('.cancel').click(hideDialog);
 
-            /* -----  订阅周期、支付方式弹窗弹出事件 -------*/
-            // 选择订阅周期
-            $('.select_cycle a').click(function (e) {
-                $('#time_cycle').show(200);
-            })
-            // 选择支付方式
-            $('.select_payment .choose_way').click(function () {
-                return
-                $('#pay_way').show(200);
-            })
+          /* -----  订阅周期、支付方式弹窗弹出事件 -------*/
+          // 选择订阅周期
+          $('.select_cycle a').click(function (e) {
+              $('#time_cycle').show(200);
+          })
+          // 选择支付方式
+          $('.select_payment .choose_way').click(function () {
+              return
+              $('#pay_way').show(200);
+          })
 
 
 
-            /* -----  选择完支付方式、订阅周期 回显到页面 -------*/
-            // 对支付方式选择的input绑定点击事件
-            $('#pay_way input:radio[name="way"]').click(function () {
-                var checkValue = $('input:radio[name="way"]:checked').val();              
-                $('.pay_way').hide(200);
-                $('.pay_mode .select_payment .choose_way.info').html(checkValue);
-            });
-            // 对订阅时间选择的input绑定点击事件
-            $('#time_cycle input:radio[name="time"]').on('click', function (e) {
-                // 解除确认按钮的锁定
-                $('#time_cycle .form-btn button').removeAttr('disabled')
-                if ($(e.target).hasClass('monthly')) {
-                    // 按月订阅
-                    $('#number_box_month').addClass('active');
-                    $('#number_box_year span').removeClass('active');
-                } else {
-                    // 按年订阅
-                    $('#number_box_month').removeClass('active');
-                    // $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active');
-                }
-            })
+          /* -----  选择完支付方式、订阅周期 回显到页面 -------*/
+          // 对支付方式选择的input绑定点击事件
+          $('#pay_way input:radio[name="way"]').click(function () {
+              var checkValue = $('input:radio[name="way"]:checked').val();              
+              $('.pay_way').hide(200);
+              $('.pay_mode .select_payment .choose_way.info').html(checkValue);
+          });
+          // 对订阅时间选择的input绑定点击事件
+          $('#time_cycle input:radio[name="time"]').on('click', function (e) {
+              // 解除确认按钮的锁定
+              $('#time_cycle .form-btn button').removeAttr('disabled')
+              if ($(e.target).hasClass('monthly')) {
+                  // 按月订阅
+                  $('#number_box_month').addClass('active');
+                  $('#number_box_year span').removeClass('active');
+              } else {
+                  // 按年订阅
+                  $('#number_box_month').removeClass('active');
+                  // $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active');
+              }
+          })
 
-            /* --------控制月份number_box的事件  点击加减号触发的事件------- */
-            $('#number_box_month').on('click', 'button', function (e) {
-                // 点击加减号让input radio选中
-                $('#monthly').prop('checked', true);
-                $('#yearly').prop('checked', false);
-                $('.number_box span').removeClass('active')
-                $('#number_box_month').addClass('active')
+          /* --------控制月份number_box的事件  点击加减号触发的事件------- */
+          $('#number_box_month').on('click', 'button', function (e) {
+              // 点击加减号让input radio选中
+              $('#monthly').prop('checked', true);
+              $('#yearly').prop('checked', false);
+              $('.number_box span').removeClass('active')
+              $('#number_box_month').addClass('active')
 
-                var $number = $('#number_box_month span.month_number');
-                var $monthlyInput = $('#monthly');
-                // 未整理的data数组,里面的值都是字符串
-                var preData = e.delegateTarget.dataset
-                var currentNum = parseInt($number.text());
-                var data = {};
-                // 把字符串转换成数字
-                for (var i in preData) {
-                    data[i] = preData[i] - 0
-                }
+              var $number = $('#number_box_month span.month_number');
+              var $monthlyInput = $('#monthly');
+              // 未整理的data数组,里面的值都是字符串
+              var preData = e.delegateTarget.dataset
+              var currentNum = parseInt($number.text());
+              var data = {};
+              // 把字符串转换成数字
+              for (var i in preData) {
+                  data[i] = preData[i] - 0
+              }
 
-                if (!$monthlyInput.prop('checked')) {
+              if (!$monthlyInput.prop('checked')) {
+                  return
+              }
+              // 判断是点击的是+ 还是-
+              if ($(e.target).hasClass('add')) {
+                  if(currentNum==11){ //12个月自动跳转1年
+                    $("#number_box_year .year_number:eq(0)").trigger("click");
                     return
-                }
-                // 判断是点击的是+ 还是-
-                if ($(e.target).hasClass('add')) {
-                    if(currentNum==11){ //12个月自动跳转1年
-                      $("#number_box_year .year_number:eq(0)").trigger("click");
-                      return
-                    }
-                    // 点的+
-                    // currentNum = currentNum >= 12 ? 12 : currentNum + 1;
-                    currentNum = currentNum >= data.numboxMax ? data.numboxMax : currentNum + data
-                        .numboxStep;
-                } else {
-                    // 点的-
-                    // currentNum = currentNum <= 1 ? 1 : currentNum - 1;
-                    currentNum = currentNum <= data.numboxMin ? data.numboxMin : currentNum - data
-                        .numboxStep;
-                }
-                $number.text(currentNum)
-                purchase.timeSelect=[Number(currentNum),2];
-                purchase.flushPrice();
-                //var price = (5.8 * currentNum).toFixed(1);
-                //$('.computed_price').html('¥' + price)
-                var firstButton = $('#number_box_month button:first')
-                var lastButton = $('#number_box_month button:last')
-                if (currentNum >= 10) {
-                    $('.profit_tips').show()
-                } else {
-                    $('.profit_tips').hide()
-                }
-                // 如果为操作后的结果为1,则锁定减号按钮
-                if (currentNum === data.numboxMin) {
-                    firstButton.attr('disabled', true)
-                } else {
-                    firstButton.removeAttr('disabled')
-                }
-                // 如果为操作后的结果为12,则锁定加号按钮
-                if (currentNum === data.numboxMax) {
-                    lastButton.attr('disabled', true)
-                } else {
-                    lastButton.removeAttr('disabled')
-                }
-            })
+                  }
+                  // 点的+
+                  // currentNum = currentNum >= 12 ? 12 : currentNum + 1;
+                  currentNum = currentNum >= data.numboxMax ? data.numboxMax : currentNum + data
+                      .numboxStep;
+              } else {
+                  // 点的-
+                  // currentNum = currentNum <= 1 ? 1 : currentNum - 1;
+                  currentNum = currentNum <= data.numboxMin ? data.numboxMin : currentNum - data
+                      .numboxStep;
+              }
+              $number.text(currentNum)
+              purchase.timeSelect=[Number(currentNum),2];
+              purchase.flushPrice();
+              //var price = (5.8 * currentNum).toFixed(1);
+              //$('.computed_price').html('¥' + price)
+              var firstButton = $('#number_box_month button:first')
+              var lastButton = $('#number_box_month button:last')
+              if (currentNum >= 10) {
+                  $('.profit_tips').show()
+              } else {
+                  $('.profit_tips').hide()
+              }
+              // 如果为操作后的结果为1,则锁定减号按钮
+              if (currentNum === data.numboxMin) {
+                  firstButton.attr('disabled', true)
+              } else {
+                  firstButton.removeAttr('disabled')
+              }
+              // 如果为操作后的结果为12,则锁定加号按钮
+              if (currentNum === data.numboxMax) {
+                  lastButton.attr('disabled', true)
+              } else {
+                  lastButton.removeAttr('disabled')
+              }
+          })
 
-            /* -------- 控制年份number_box的事件  点击1年 2年 3年触发的事件------- */
-            $('#number_box_year').on('click', 'span', function (e) {
-                console.log(e.target.dataset.id)
-                $('#number_box_month').removeClass('active')
-                let id = e.target.dataset.id;
-                $('.profit_tips').hide()
-                $(this).addClass('active').siblings().removeClass('active')
-                $('#yearly').prop('checked', true);
-                $("#monthly").prop('checked', false);
+          /* -------- 控制年份number_box的事件  点击1年 2年 3年触发的事件------- */
+          $('#number_box_year').on('click', 'span', function (e) {
+              console.log(e.target.dataset.id)
+              $('#number_box_month').removeClass('active')
+              let id = e.target.dataset.id;
+              $('.profit_tips').hide()
+              $(this).addClass('active').siblings().removeClass('active')
+              $('#yearly').prop('checked', true);
+              $("#monthly").prop('checked', false);
 
-                // 渲染结果 保留一位小数
-                //let result = (Number(id) * 58).toFixed(1);
-                //$('.computed_price').html('¥' + result)
-                purchase.timeSelect=[Number(id),1];
-                purchase.flushPrice();
-            })
+              // 渲染结果 保留一位小数
+              //let result = (Number(id) * 58).toFixed(1);
+              //$('.computed_price').html('¥' + result)
+              purchase.timeSelect=[Number(id),1];
+              purchase.flushPrice();
+          })
 
-            /* -------- 选择按月订阅  radio触发的事件------- */
-            $('#monthly').on('change', function (e) {
-                let isChecked = $(this).is(':checked')
-                let val = $('.month_number').text();
-                if (val >= 10) {
-                    $('.profit_tips').show()
-                }
-                if (!isChecked) {
-                    $('#number_box_month button').attr('disabled', true)
-                } else {
-                    $('#number_box_month button').removeAttr('disabled')
-                }
-                //let result = (Number(val) * 5.8).toFixed(1);
-                //$('.computed_price').html('¥' + result);
-                purchase.timeSelect=[Number(val),2];
-                purchase.flushPrice();
+          /* -------- 选择按月订阅  radio触发的事件------- */
+          $('#monthly').on('change', function (e) {
+              let isChecked = $(this).is(':checked')
+              let val = $('.month_number').text();
+              if (val >= 10) {
+                  $('.profit_tips').show()
+              }
+              if (!isChecked) {
+                  $('#number_box_month button').attr('disabled', true)
+              } else {
+                  $('#number_box_month button').removeAttr('disabled')
+              }
+              //let result = (Number(val) * 5.8).toFixed(1);
+              //$('.computed_price').html('¥' + result);
+              purchase.timeSelect=[Number(val),2];
+              purchase.flushPrice();
 
-            })
-            /* -------- 选择按年订阅  radio触发的事件------- */
-            $('#yearly').on('change', function (e) {
-                $('.profit_tips').hide()
-                // console.log($(this).is(':checked'))
-                let isChecked = $(this).is(':checked')
-                // 按年订阅默认选择1年 
-                //let val = 1;
-                //$('.computed_price').html('¥' + Number(val) * 58)
-                if (isChecked) {
-                    $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
-                }
-                purchase.timeSelect=[Number(val),1];
-                purchase.flushPrice();
-            })
+          })
+          /* -------- 选择按年订阅  radio触发的事件------- */
+          $('#yearly').on('change', function (e) {
+              $('.profit_tips').hide()
+              // console.log($(this).is(':checked'))
+              let isChecked = $(this).is(':checked')
+              // 按年订阅默认选择1年 
+              //let val = 1;
+              //$('.computed_price').html('¥' + Number(val) * 58)
+              if (isChecked) {
+                  $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
+              }
+              purchase.timeSelect=[Number(val),1];
+              purchase.flushPrice();
+          })
 
-            // 确认订阅周期
-            $('#enter_period').on('click', function () {
-                var val;
-                $('input[name="time"]').each(function (i, v) {
-                    let isChecked = $(v).is(':checked')
-                    if ($(v).is(':checked') === true && $('.year_number').hasClass('active')) {
-                        val = $('.active').html()
-                        $('#time_cycle').hide(function () {
-                            $('.choose_time').val(val)
-                        })
-                        purchase.timeSelect=[parseInt(val[0]),1]
-                    } else if ($(v).is(':checked') === true) {
-                        val = $('.month_number').html();
-                        $('#time_cycle').hide(function () {
-                            $('.choose_time').val(val + '个月')
-                        })
-                        purchase.timeSelect=[parseInt(val),2]
-                    }
-                })
-                purchase.flushPrice();
-                sessionStorage.setItem("vipSubSelectTime",JSON.stringify(purchase.timeSelect));
-            })
-            $("input").bind("input propertychange change", function (event) {
-              checkOk();  
-            });
+          // 确认订阅周期
+          $('#enter_period').on('click', function () {
+              var val;
+              $('input[name="time"]').each(function (i, v) {
+                  let isChecked = $(v).is(':checked')
+                  if ($(v).is(':checked') === true && $('.year_number').hasClass('active')) {
+                      val = $('.active').html()
+                      $('#time_cycle').hide(function () {
+                          $('.choose_time').val(val)
+                      })
+                      purchase.timeSelect=[parseInt(val[0]),1]
+                  } else if ($(v).is(':checked') === true) {
+                      val = $('.month_number').html();
+                      $('#time_cycle').hide(function () {
+                          $('.choose_time').val(val + '个月')
+                      })
+                      purchase.timeSelect=[parseInt(val),2]
+                  }
+              })
+              purchase.flushPrice();
+              sessionStorage.setItem("vipSubSelectTime",JSON.stringify(purchase.timeSelect));
+          })
+          $("input").bind("input propertychange change", function (event) {
+            checkOk();  
+          });
 
-            $('#payHandle').click(function () {
-                $("#payHandle").attr("disabled","disabled")
-                //支付请求
-                var area=purchase.areaSelect;
-                var industry=purchase.industrySelect;
-                if(area["全国"]){
-                  area={};
-                }
-                if(industry.length==1&&industry[0]=="全部行业"){
-                  industry=[];
+          $('#payHandle').click(function () {
+              $("#payHandle").attr("disabled","disabled")
+              //支付请求
+              var area=purchase.areaSelect;
+              var industry=purchase.industrySelect;
+              if(area["全国"]){
+                area={};
+              }
+              if(industry.length==1&&industry[0]=="全部行业"){
+                industry=[];
+              }
+              {{if not .T.isTrial}}
+                //付费用户
+                var param={
+                  "area":JSON.stringify(area),
+                  "industry":industry.join(","),
+                  "time":$(".info:eq(2)").val().trim(),
+                  "payWay":"wx_js",
+                  "orderType":{{.T.orderType}},
                 }
-                {{if not .T.isTrial}}
-                  //付费用户
-                  var param={
-                    "area":JSON.stringify(area),
-                    "industry":industry.join(","),
-                    "time":$(".info:eq(2)").val().trim(),
-                    "payWay":"wx_js",
-                    "orderType":{{.T.orderType}},
+                $DoPost("/subscribepay/vipsubscribe/createOrder",param,function(r){
+                  if(r.success){
+                    clearSessionStorage();
+                    onBridgeReady(JSON.parse(r.data.res),r.data.code);
                   }
-                  $DoPost("/subscribepay/vipsubscribe/createOrder",param,function(r){
-                    if(r.success){
-                      clearSessionStorage();
-                      onBridgeReady(JSON.parse(r.data.res),r.data.code);
-                    }
-                    $("#payHandle").removeAttr("disabled")  
-                  })
-                {{else}} 
-                  //试用用户
-                  $DoPost("/subscribepay/order/trialPay",{"area":JSON.stringify(area),"industry":industry.join(",")},function(r){
-                    if(r.success){
-                      clearSessionStorage();
-                      $("#payHandle").attr("disabled","disabled");  
-                      window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+r.data.code);
-                    }
-                  }) 
-                {{end}}
-            })
+                  $("#payHandle").removeAttr("disabled")  
+                })
+              {{else}} 
+                //试用用户
+                $DoPost("/subscribepay/order/trialPay",{"area":JSON.stringify(area),"industry":industry.join(",")},function(r){
+                  if(r.success){
+                    clearSessionStorage();
+                    $("#payHandle").attr("disabled","disabled");  
+                    window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+r.data.code);
+                  }
+                }) 
+              {{end}}
+          })
           
         })
         // 隐藏dialog选择框

+ 16 - 8
src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -342,9 +342,10 @@
 							window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
 						},500)
 					}else if(r.err_msg == "get_brand_wcpay_request:cancel"){               
-	                	alert("开发环境【支付跳转完成】")
+//	                	alert("开发环境【支付跳转完成】")
 		                try{
-		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+//		  					window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
+		                	window.location.reload();
 		                }catch(e){
 		                  alert(e)
 		                }
@@ -526,6 +527,12 @@
 		        return
             }
             $(".computed_price").show();
+            if (currentNum >= 10) {
+            	$('.profit_tips').text("已选择"+currentNum+"个月,建议“按年订阅”更划算哦~");
+                $('.profit_tips').show();
+            } else {
+                $('.profit_tips').hide()
+            }
             $number.text(currentNum)
             if(currentNum >= 10){
             	currentNum = 10;
@@ -534,11 +541,11 @@
             $('.computed_price').html('¥' + price)
             var firstButton = $('#number_box_month button:first')
             var lastButton = $('#number_box_month button:last')
-            if (currentNum >= 10) {
-                $('.profit_tips').show()
-            } else {
-                $('.profit_tips').hide()
-            }
+//          if (currentNum >= 10) {
+//              $('.profit_tips').show()
+//          } else {
+//              $('.profit_tips').hide()
+//          }
             // 如果为操作后的结果为1,则锁定减号按钮
             if (currentNum === data.numboxMin) {
                 firstButton.attr('disabled', true)
@@ -584,7 +591,8 @@
             let isChecked = $(this).is(':checked')
             let val = $('.month_number').text();
             if (val >= 10) {
-                $('.profit_tips').show()
+                $('.profit_tips').text("已选择"+val+"个月,建议“按年订阅”更划算哦~");
+                $('.profit_tips').show();
             }
             console.log(val)
             if (!isChecked) {