Browse Source

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

zhangxinlei1996 5 năm trước cách đây
mục cha
commit
4e57914e84

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/trial_info.html

@@ -59,7 +59,7 @@
                                 <button class="code_btn" type="button">获取验证码</button>
                             </div>
                         </div>
-                        <div class="form_bottom">
+                        <div class="form_bottom form_item_line">
                             <div class="form_item">
                                 <input type="text" id="" placeholder="输入公司名称" class="company"
                                        onchange="check_company($(this))"></input>

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -213,8 +213,8 @@
 				</a>
 			</li>
       <li class="dataExport">
-				<a href="/jyapp/dataReport/toPayPage/1">
-					<div>历史数据导出</div>
+				<a href="/jyapp/vipsubscribe/introducePage">
+					<div>vip订阅</div>
 					<div>导出任意条件的招标数据,按条数付费</div>
 				</a>
 			</li>

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

@@ -258,7 +258,7 @@ func (this *TrialOrder) TrialPay() {
 		date_count, date_unit := 7, 3
 		now := time.Now()
 		//数据校验
-		if len(industry) == 1 { //去掉[""]
+		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 		}
 		//插入订单表

+ 2 - 2
src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -467,7 +467,7 @@
 .vip_purchase .choose_condition .pay_mode .choose_item a .info {
   width: 5rem;
   height: 100%;
-  color: #686868;
+  color: #000;
   font-size: 0.28rem;
   text-align: right;
   overflow: hidden;
@@ -479,7 +479,7 @@
 
 .vip_purchase .choose_condition .chooseList .choose_item a .info::placeholder,
 .vip_purchase .choose_condition .pay_mode .choose_item a .info::placeholder {
-  color: #686868;
+  color: #000;
 }
 
 .choose_item input:disabled, .choose_item input[disabled]{

+ 106 - 99
src/web/templates/weixin/vipsubscribe/edit_subscribe.html

@@ -2,130 +2,137 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <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="/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" 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_subscribe_edit.css?v={{Msg "seo" "version"}}">
 </head>
 <body>
-    <div class="vip_subscribe_edit">
-       <div class="edit_content">
-           <!-- 购买的全国则不显示可修改区域 -->
-           <div class="title">可修改区域</div>
-           <a data_href="/front/vipsubscribe/toEditSubAllArea" class="edit_item allArea" style="display:none">
-               <div class="item_top">
-                   <span>全国</span>
-                   <i class="iconfont icon-arrow"></i>
-               </div>
-               <div class="item_bottom"></div>
-           </a>
-           <a data_href="/front/vipsubscribe/toEditSubProvPage" class="edit_item province" style="display:none">
-               <div class="item_top">
-                   <span></span>
-                   <i class="iconfont icon-arrow"></i>
-               </div>
-               <div class="item_bottom"></div>
-           </a>
-           <a data_href="/front/vipsubscribe/toEditSubCityPage" class="edit_item city" style="display:none">
-                <div class="item_top">
-                    <span></span>
-                    <i class="iconfont icon-arrow"></i>
-                </div>
-                <div class="item_bottom"></div>
-           </a>
-           <!-- 购买的全行业则不显示可修改行业 -->
-           <div class="title">可修改行业</div>
-           <a data_href="/front/vipsubscribe/toEditSubInduPage" class="edit_item industry">
-                <div class="item_top">
-                    <span></span>
-                    <i class="iconfont icon-arrow"></i>
-                </div>
-                <div class="item_bottom"></div>
-           </a>
-       </div>
-      <!--
-       <div class="edit_tips">
-           <div class="edit_count">总共可修改次数:<em>3</em> / 3</div>
-       </div>-->
+<div class="vip_subscribe_edit">
+    <div class="edit_content">
+        <!-- 购买的全国则不显示可修改区域 -->
+        <div class="title">可修改区域</div>
+        <a data_href="/front/vipsubscribe/toEditSubAllArea" class="edit_item allArea" style="display:none">
+            <div class="item_top">
+                <span>全国</span>
+                <i class="iconfont icon-arrow"></i>
+            </div>
+            <div class="item_bottom"></div>
+        </a>
+        <a data_href="/front/vipsubscribe/toEditSubProvPage" class="edit_item province" style="display:none">
+            <div class="item_top">
+                <span></span>
+                <i class="iconfont icon-arrow"></i>
+            </div>
+            <div class="item_bottom"></div>
+        </a>
+        <a data_href="/front/vipsubscribe/toEditSubCityPage" class="edit_item city" style="display:none">
+            <div class="item_top">
+                <span></span>
+                <i class="iconfont icon-arrow"></i>
+            </div>
+            <div class="item_bottom"></div>
+        </a>
+        <!-- 购买的全行业则不显示可修改行业 -->
+        <div class="title">可修改行业</div>
+        <a data_href="/front/vipsubscribe/toEditSubInduPage" class="edit_item industry">
+            <div class="item_top">
+                <span></span>
+                <i class="iconfont icon-arrow"></i>
+            </div>
+            <div class="item_bottom"></div>
+        </a>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.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>
-    <script>
-        var EditSub={
-          reqData:{},
-          init:function(){
+    <!--
+     <div class="edit_tips">
+         <div class="edit_count">总共可修改次数:<em>3</em> / 3</div>
+     </div>-->
+</div>
+<script src="/vipsubscribe/js/jquery-2.1.4.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>
+<script>
+    $(window).bind("pageshow", function (event) {
+        if (event.originalEvent.persisted) {
+            window.location.reload();
+        }
+    });
+    var EditSub = {
+        reqData: {},
+        init: function () {
             this.getData();
             this.showData();//初始化页面展示
             this.initClick();//初始化点击事件
-          },
-          getData:function(){
+        },
+        getData: function () {
             //加载数据
-            $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
-              if(r.success){
-                EditSub.reqData=r.data;
-              }
-            },false)
-          },
-          showData:function(){
+            $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
+                if (r.success) {
+                    EditSub.reqData = r.data;
+                }
+            }, false)
+        },
+        showData: function () {
             //展示已选择省份 和 城市
             var area = this.reqData.area;
-            var num=getAreaClassArr(area);
-            
+            var num = getAreaClassArr(area);
+
             //判断是否可编辑
-            if(this.reqData.buyset.areacount==-1){ //显示编辑全国
-              $(".allArea").css("display","");
-              var tmpArr = num[0].concat(num[1]);
-              $(".edit_item.allArea .item_bottom").text(tmpArr.join("、"));
-            }else{
-              if(this.reqData.buyset.areacount>0){ //显示编辑省
-                $(".province").css("display",""); 
-                $(".edit_item.province span").text(this.reqData.buyset.areacount+"个省");
-                $(".edit_item.province .item_bottom").text(num[0].join("、"));
-              } 
-              if(!$.isEmptyObject(this.reqData.buyset.citys)){ //显示编辑市
-                var cityCount=0 
-                for(var i in this.reqData.buyset.citys) {
-                  cityCount+=this.reqData.buyset.citys[i]
+            if (this.reqData.buyset.areacount == -1) { //显示编辑全国
+                $(".allArea").css("display", "");
+                var tmpArr = num[0].concat(num[1]);
+                $(".edit_item.allArea .item_bottom").text(tmpArr.join("、"));
+            } else {
+                if (this.reqData.buyset.areacount > 0) { //显示编辑省
+                    $(".province").css("display", "");
+                    $(".edit_item.province span").text(this.reqData.buyset.areacount + "个省");
+                    $(".edit_item.province .item_bottom").text(num[0].join("、"));
                 }
-                $(".city").css("display","");
-                $(".edit_item.city span").text(cityCount+"个市");
-                $(".edit_item.city .item_bottom").text(num[1].join("、"));
-              } 
-            }  
-            
+                if (!$.isEmptyObject(this.reqData.buyset.citys)) { //显示编辑市
+                    var cityCount = 0
+                    for (var i in this.reqData.buyset.citys) {
+                        cityCount += this.reqData.buyset.citys[i]
+                    }
+                    $(".city").css("display", "");
+                    $(".edit_item.city span").text(cityCount + "个市");
+                    $(".edit_item.city .item_bottom").text(num[1].join("、"));
+                }
+            }
+
             //行业展示                 
-            if(this.reqData.buyset.buyerclasscount==-1){
-              $(".edit_item.industry span").text("全部行业");
-            }else{
-              $(".edit_item.industry span").text(this.reqData.buyset.buyerclasscount+"个行业");
+            if (this.reqData.buyset.buyerclasscount == -1) {
+                $(".edit_item.industry span").text("全部行业");
+            } else {
+                $(".edit_item.industry span").text(this.reqData.buyset.buyerclasscount + "个行业");
             }
-            if(this.reqData.industry.length>0){
-              $(".edit_item.industry .item_bottom").text(this.reqData.industry.join("、"));
+            if (this.reqData.industry.length > 0) {
+                $(".edit_item.industry .item_bottom").text(this.reqData.industry.join("、"));
             }
 
-          },
-          initClick:function(){
-            $(".edit_item").on("click",function(){
-               window.location.href=$(this).attr("data_href");
+        },
+        initClick: function () {
+            $(".edit_item").on("click", function () {
+                window.location.href = $(this).attr("data_href");
             });
             //提交
-          },
-          showTip:function(msg){
-            weui.toast(msg,{
-              duration: 2000,
-              className: 'custom-toast',
+        },
+        showTip: function (msg) {
+            weui.toast(msg, {
+                duration: 2000,
+                className: 'custom-toast',
             });
-          }
         }
-        
-        EditSub.init();  
-    </script>
+    };
+    $(function () {
+        EditSub.init();
+    });
+</script>
 </body>
 </html>

+ 560 - 541
src/web/templates/weixin/vipsubscribe/edit_subscribe_city.html

@@ -5,412 +5,419 @@
     <meta charset="utf-8">
     <title>区域修改</title>
     <meta name="viewport"
-        content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+          content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" 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" 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/public.css?v={{Msg "seo" "version"}}"> -->
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
     <style>
-        .checkbox[disabled]{background: none no-repeat center center #eee!important;}
-        .city[disabled]{background: #F4F4F9;color: #1D1D1D;}
+        .checkbox[disabled] {
+            background: none no-repeat center center #eee !important;
+        }
+
+        .city[disabled] {
+            background: #F4F4F9;
+            color: #1D1D1D;
+        }
     </style>
 </head>
 
 <body>
-    <div id="choose_area">
-        <p class="optional_count" style="position: fixed;width: 100%;top: 0px;"> 可选择市数量:<em class="count"></em> / <span class="total">11</span></p>
-        <div class="result" style="top:0.88rem">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            <p class="result_text line_two">
+<div id="choose_area">
+    <p class="optional_count" style="position: fixed;width: 100%;top: 0px;"> 可选择市数量:<em class="count"></em> / <span
+                class="total">11</span></p>
+    <div class="result" style="top:0.88rem">
+        <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
+        <p class="result_text line_two">
             已选择:<span class="result_name"></span>
             <a href="javascript:;" class="detail">详情</a>
-            </p>
-            <a href="javascript:;" class="packup" style="display: none;">收起</a>
-        </div>
-        <div class="form">
-            <div class="select-area-box">
-                <ul class="area-list">
-                    <!-- <li>
-                        <div class="tab whole">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox other">全国
-                            </div>
-                        </div>
-                    </li> -->
-                    <li class="index" id="A">A</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">安徽
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">澳门
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <!-- <li class="index" id="B">B</li> -->
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">北京
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <!-- <li class="index" id="C">C</li> -->
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">重庆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <li class="index" id="F">F</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">福建
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="G">G</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">贵州
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">甘肃
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="H">H</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">黑龙江
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">海南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <p class="index" id="J">J</p>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">吉林
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江苏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="L">L</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">辽宁
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="N">N</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">内蒙古
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">宁夏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Q">Q</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">青海
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="S">S</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">陕西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">上海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">四川
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <!-- <li class="index" id="T">T</li> -->
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">天津
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">台湾
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <li class="index" id="X">X</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">西藏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">新疆
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <!-- <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">香港
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li> -->
-                    <li class="index" id="Y">Y</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">云南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Z">Z</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">浙江
-                            </div>
-                            <span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="tips_btn">
-            <div class="btns">
-                <button class="reset-btn" id="cancel">取消</button>
-                <button disabled class="save-btn" id="enter">确认修改</button>
-            </div>
+        </p>
+        <a href="javascript:;" class="packup" style="display: none;">收起</a>
+    </div>
+    <div class="form">
+        <div class="select-area-box">
+            <ul class="area-list">
+                <!-- <li>
+                    <div class="tab whole">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox other">全国
+                        </div>
+                    </div>
+                </li> -->
+                <li class="index" id="A">A</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">安徽
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">澳门
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <!-- <li class="index" id="B">B</li> -->
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">北京
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <!-- <li class="index" id="C">C</li> -->
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">重庆
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <li class="index" id="F">F</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">福建
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="G">G</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">广东
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">广西
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">贵州
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">甘肃
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="H">H</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">河北
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">湖北
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">黑龙江
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">海南
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">河南
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">湖南
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <p class="index" id="J">J</p>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">吉林
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">江苏
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">江西
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="L">L</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">辽宁
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="N">N</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">内蒙古
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">宁夏
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="Q">Q</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">青海
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="S">S</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">山西
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">陕西
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">上海
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">山东
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">四川
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <!-- <li class="index" id="T">T</li> -->
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">天津
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">台湾
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <li class="index" id="X">X</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">西藏
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">新疆
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <!-- <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">香港
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li> -->
+                <li class="index" id="Y">Y</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">云南
+                        </div>
+                        <span><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="Z">Z</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">浙江
+                        </div>
+                        <span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+            </ul>
         </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <!--<a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>-->
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">S</a>
-            <!--<a href="javascript:;">T</a>-->
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
+    </div>
+    <div class="tips_btn">
+        <div class="btns">
+            <button class="reset-btn" id="cancel">取消</button>
+            <button disabled class="save-btn" id="enter">确认修改</button>
         </div>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/weui.min.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>
-        var EditCity={
-          reqData:{},
-          selectObj:{},//上次修改的地区
-          init:function(){
+    <div class="slide">
+        <a href="javascript:;">#</a>
+        <a href="javascript:;">A</a>
+        <!--<a href="javascript:;">B</a>
+        <a href="javascript:;">C</a>-->
+        <a href="javascript:;">F</a>
+        <a href="javascript:;">G</a>
+        <a href="javascript:;">H</a>
+        <a href="javascript:;">J</a>
+        <a href="javascript:;">L</a>
+        <a href="javascript:;">N</a>
+        <a href="javascript:;">Q</a>
+        <a href="javascript:;">S</a>
+        <!--<a href="javascript:;">T</a>-->
+        <a href="javascript:;">X</a>
+        <a href="javascript:;">Y</a>
+        <a href="javascript:;">Z</a>
+    </div>
+</div>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/weui.min.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>
+    var EditCity = {
+        reqData: {},
+        selectObj: {},//上次修改的地区
+        init: function () {
             this.getData();
             this.showData();//初始化页面展示
             this.initClick();//初始化点击事件
-          },
-          getData:function(){
+        },
+        getData: function () {
             //加载数据
-            $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
-              if(r.success){
-                EditCity.reqData=r.data;
-              }
-            },false)
+            $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
+                if (r.success) {
+                    EditCity.reqData = r.data;
+                }
+            }, false);
             console.log(EditCity.reqData);
-          },
-          showData:function(){
-            var num= getAreaClassArr(this.reqData.area);//已选择多少省市
-            var cityCount=0 
-            for(var i in this.reqData.buyset.citys) {
-              cityCount+=this.reqData.buyset.citys[i];
+        },
+        showData: function () {
+            var num = getAreaClassArr(this.reqData.area);//已选择多少省市
+            var cityCount = 0;
+            for (var i in this.reqData.buyset.citys) {
+                cityCount += this.reqData.buyset.citys[i];
             }
             // 渲染可选择城市总数
             $('.total').html(cityCount);
@@ -421,85 +428,88 @@
             $(".select-area-box ul li:not('.index')").each(function () {
                 var text = $(this).find(".province").text().trim();
                 //只显示购买城市的省份
-                if(EditCity.reqData.buyset.citys[text]){
-                  var data = null
-                  chinaMapJSON.some(function (v) {
-                      data = v
-                      return v.name.indexOf(text) !== -1
-                  })
-                  var box = $(this).find('div.tab_content');
-                  var html = EditCity.createMoreCity(data.city);
-                  box.attr("count",EditCity.reqData.buyset.citys[text]).html(html);
-                  box.prev().find(".checkbox").attr("disabled","disabled");
+                if (EditCity.reqData.buyset.citys[text]) {
+                    var data = null;
+                    chinaMapJSON.some(function (v) {
+                        data = v;
+                        return v.name.indexOf(text) !== -1
+                    });
+                    var box = $(this).find('div.tab_content');
+                    var html = EditCity.createMoreCity(data.city);
+                    box.attr("count", EditCity.reqData.buyset.citys[text]).html(html);
+                    box.prev().find(".checkbox").attr("disabled", "disabled");
                 }
-            })
-            
+            });
+
             //删除其他城市
-            $(".tab_content").each(function(){
-              if(!$(this).attr("count")){
-                if(($(this).parents("li").prev().hasClass("index")&&$(this).parents("li").next().hasClass("index"))||!$(this).parents("li").next().html()){
-                  var zimu = $(this).parents("li").prev().text().trim();
-                  $('.slide a').each(function(){
-                    if(zimu == $(this).text().trim()){
-                      $(this).remove();
+            $(".tab_content").each(function () {
+                if (!$(this).attr("count")) {
+                    if (($(this).parents("li").prev().hasClass("index") && $(this).parents("li").next().hasClass("index")) || !$(this).parents("li").next().html()) {
+                        var zimu = $(this).parents("li").prev().text().trim();
+                        $('.slide a').each(function () {
+                            if (zimu == $(this).text().trim()) {
+                                $(this).remove();
+                            }
+                        });
+                        $(this).parents("li").prev().remove();
                     }
-                  })
-                  $(this).parents("li").prev().remove();
+                    $(this).parents("li").remove();
                 }
-                $(this).parents("li").remove();
-              }
-            })
+            });
 
             //选中已选择城市
-            $('.city').each(function () {  
+            $('.city').each(function () {
                 let text = $(this).text().trim();
-                num[1].forEach(v =>{
-                    if(v == text){
+                num[1].forEach(v => {
+                    if (v == text) {
                         $(this).addClass('active');
                     }
-                })
-              EditCity.checkFull($(this))  
-            })
+                });
+                EditCity.checkFull($(this))
+            });
             this.getSelectAreaObj();
-          },
-          checkFull:function(obj){//该省份下 是否选择满
+        },
+        checkFull: function (obj, showtip) {//该省份下 是否选择满
             let count = obj.parent().attr("count");
             let selected = obj.parent().find(".city.active").length;
-            if(selected>=count){
-              obj.parent().find(".city:not(.active)").attr("disabled","disabled");
-            }else{
-              obj.parent().find(".city:not(.active)").removeAttr("disabled","disabled");
+            if (selected >= count) {
+                obj.parent().find(".city:not(.active)").attr("disabled", "disabled");
+                if (showtip) {
+                    this.showTip(`<p>当前省份只可选择${count}个城市<br/><span style="white-space: nowrap;">您只购买了${count}个城市,如需更多请升级<span></p>`)
+                }
+            } else {
+                obj.parent().find(".city:not(.active)").removeAttr("disabled", "disabled");
             }
-          },
-          initClick:function(){
-            $('.detail').click(function () {  
-                $('.result_text').removeClass('line_two')
-                $(".result").css("padding-bottom","0.3rem")
+        },
+        initClick: function () {
+            $('.detail').click(function () {
+                $('.result_text').removeClass('line_two');
+                $(".result").css("padding-bottom", "0.3rem");
                 $(this).hide();
-                $('.packup').show()
-                $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
-            })
-            $('.packup').click(function () { 
-                $(".result").css("padding-bottom","0.2rem")
-                $('.result_text').addClass('line_two')
+                $('.packup').show();
+                $('.select-area-box').css("margin-top", $(".optional_count").height() + $('.result_text').height() + 25);
+            });
+            $('.packup').click(function () {
+                $(".result").css("padding-bottom", "0.2rem");
+                $('.result_text').addClass('line_two');
                 $(this).hide();
-                $('.detail').show()
-                $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
-            })
+                $('.detail').show();
+                $('.select-area-box').css("margin-top", $(".optional_count").height() + $('.result_text').height() + 25);
+            });
             // 锚点跳转
             $("body").on('click', '.slide a', function () {
-                var s = $(this).html()
+                var s = $(this).html();
                 if (s == '#') {
                     return;
                 }
                 document.querySelector('#' + s).scrollIntoView({
                     block: 'center'
                 });
-            })
+            });
             // 阻止input checkbox选中取消 触发父元素下拉事件
-            $('.checkbox').click(function (e) {  
+            $('.checkbox').click(function (e) {
                 e.stopPropagation();
-            })
+            });
             // 省下拉市
             $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
                 if ($(this).next('.tab_content:not(:animated)').css("display") == "block") {
@@ -513,155 +523,164 @@
                         "transform": "rotate(-180deg)"
                     })
                 }
-                $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+                $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500);
                 $(this).parent().siblings().children('.tab').removeClass('selected');
-            })
+            });
             //点击城市            
             $('.tab_content').on('click', '.city', function () {
                 $(this).toggleClass('active');
-                EditCity.checkFull($(this));
+                EditCity.checkFull($(this), true);
                 EditCity.getSelectAreaObj()
-            })
+            });
             // 取消按钮事件 返回上一页
-            $('#cancel').click(function(){
+            $('#cancel').click(function () {
                 window.history.go(-1)
-            })
+            });
             // 确定修改事件
-            $('#enter').click(function(){
-              $("#enter").attr("disabled","disabled");
-              //更新 reqData.areaSelect
-              for(var i in EditCity.selectObj) {
-                EditCity.reqData.area[i]=EditCity.selectObj[i];
-              }
-              //提交修改
-              console.log("final select ",EditCity.reqData.area);
-              $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditCity.reqData.area)},function(r){
-                if(r.success){
-                  window.location.replace('/front/vipsubscribe/submitEditSubFinish');
+            $('#enter').click(function () {
+                $("#enter").attr("disabled", "disabled");
+                //更新 reqData.areaSelect
+                for (var i in EditCity.selectObj) {
+                    EditCity.reqData.area[i] = EditCity.selectObj[i];
                 }
-              },false)
-              $("#enter").removeAttr("disabled");  
+                //提交修改
+                console.log("final select ", EditCity.reqData.area);
+                $DoPost("/subscribepay/editSub/submit", {
+                    "type": "area",
+                    "value": JSON.stringify(EditCity.reqData.area)
+                }, function (r) {
+                    if (r.success) {
+                        window.location.replace('/front/vipsubscribe/submitEditSubFinish');
+                    }
+                }, false);
+                $("#enter").removeAttr("disabled");
             })
-          },
-          createMoreCity:function(arr){
+        },
+        createMoreCity: function (arr) {
             var tempHtml = arr.map(function (v) {
-              // v.name.replace(/市$/g, '')
-              return '<button class="city">' + v.name + '</button>'
-            }).join('')
+                // v.name.replace(/市$/g, '')
+                return '<button class="city">' + v.name + '</button>'
+            }).join('');
             return tempHtml
-          },
-          showTip:function(msg){
-            weui.toast(msg,{
-              duration: 2000,
-              className: 'custom-toast',
+        },
+        showTip: function (msg) {
+            weui.toast(msg, {
+                duration: 2000,
+                className: 'custom-toast',
             });
-          },
-          getSelectAreaObj:function(){
-            $('.result_name').empty()
+        },
+        getSelectAreaObj: function () {
+            $('.result_name').empty();
             var selectObj = {};
             var data = []; //定义一个总数组
-            var cityArr =[]; //定义一个选中城市数组
+            var cityArr = []; //定义一个选中城市数组
             $(".tab_content").find(".city.active:not('[disabled]')").each(function () {
                 var length = $(this).parent('.tab_content').find('.city').length; //省份下城市的length
-                let arr =[];
+                let arr = [];
                 // 判断省份下的城市是否等于选中的城市长度,相等就是全部选中
                 let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
-                let city = $(this).html()
-                arr.push({name:city,parent:province})
-                for(let i =0;i<arr.length;i++){
-                    let obj ={};
+                let city = $(this).html();
+                arr.push({name: city, parent: province});
+                for (let i = 0; i < arr.length; i++) {
+                    let obj = {};
                     obj.name = arr[i].name;
                     obj.parent = arr[i].parent;
                     cityArr.push(obj)
                 }
                 data.push({
-                    name:province,
-                    children:cityArr
+                    name: province,
+                    children: cityArr
                 })
-              
-            })
+
+            });
             //数组对象去重
             let obj = {};
-            data = data.reduce((cur,next) =>{
+            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 =>{
-                   return s.parent === v.name
-                })
+            let result = data.map(v => {
+                let filterArr = v.children.filter(s => {
+                    return s.parent === v.name
+                });
                 return {
-                    name:v.name,
-                    children:filterArr
+                    name: v.name,
+                    children: filterArr
                 }
-            })
+            });
             var html = '';
-            var cityCount = 0
+            var cityCount = 0;
             for (var i = 0; i < result.length; i++) {
-              let children = result[i].children;
-              let childrenArr=[]; 
-              for(var j = 0;j < children.length;j++){
-                childrenArr.push(children[j].name)
-              }
-              selectObj[result[i].name]=childrenArr;//
-              html+=result[i].name+"("+childrenArr.join(",")+") "
-              cityCount += childrenArr.length;
+                let children = result[i].children;
+                let childrenArr = [];
+                for (var j = 0; j < children.length; j++) {
+                    childrenArr.push(children[j].name)
+                }
+                selectObj[result[i].name] = childrenArr;//
+                html += result[i].name + "(" + childrenArr.join(",") + ") ";
+                cityCount += childrenArr.length;
             }
-            this.selectObj=selectObj;
-            $('.count').text(cityCount)
+            this.selectObj = selectObj;
+            $('.count').text(cityCount);
             $('.result_name').append(html);
-            $('.select-area-box').css("margin-top",$(".optional_count").height()+$(".result").height()+25);
+            $('.select-area-box').css("margin-top", $(".optional_count").height() + $(".result").height() + 25);
             this.isOpen();
-            if(this.noChange(this.selectObj,EditCity.reqData.area)||!this.compareArr(Object.keys(this.selectObj),Object.keys(this.reqData.buyset.citys))){
-              $("#enter").attr("disabled","disabled")
-            }else{
-              $("#enter").removeAttr("disabled");
+            if (this.noChange(this.selectObj, EditCity.reqData.area) || !this.compareArr(Object.keys(this.selectObj), Object.keys(this.reqData.buyset.citys))) {
+                $("#enter").attr("disabled", "disabled")
+            } else {
+                $("#enter").removeAttr("disabled");
             }
-          },
-          noChange:function(obj1,obj2){//选择是否改变
-            for(var i in obj1) {
-              if(!obj1[i]||!obj2[i]) return false
-              if(this.compareArr(obj1[i],obj2[i])){
-                continue
-              }else{
-                return false
-              }
+        },
+        noChange: function (obj1, obj2) {//选择是否改变
+            for (var i in obj1) {
+                if (!obj1[i] || !obj2[i]) return false;
+                if (this.compareArr(obj1[i], obj2[i])) {
+                    continue
+                } else {
+                    return false
+                }
             }
             return true
-          },
-          compareArr:function(arr1,arr2){
+        },
+        compareArr: function (arr1, arr2) {
             return JSON.stringify(arr1.sort()) === JSON.stringify(arr2.sort());
-          },
-          isOpen:function(){
-            let pHeight = $('.result_text').height()
-            let minHeight = $('.result_text').css('min-height')
-            let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
-            $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
-            if(rows == 1){
-                $('.packup').hide()
-                $('.detail').hide()
-            }else if(rows == 2){
-                console.log($('.result_name').html().trim().length)
+        },
+        isOpen: function () {
+            let pHeight = $('.result_text').height();
+            let minHeight = $('.result_text').css('min-height');
+            let rows = Math.round(Math.round(pHeight) / parseFloat(minHeight));
+            $('.select-area-box').css("margin-top", $(".optional_count").height() + $('.result_text').height() + 25);
+            if (rows == 1) {
+                $('.packup').hide();
+                $('.detail').hide();
+            } else if (rows == 2) {
+                console.log($('.result_name').html().trim().length);
                 let length = $('.result_name').html().trim().length;
-                if(length >= 50){
-                    $('.detail').show()
-                    $('.packup').hide()
-                }else{
-                    $('.detail').hide()
+                if (length >= 50) {
+                    $('.detail').show();
                     $('.packup').hide()
+                } else {
+                    $('.detail').hide();
+                    $('.packup').hide();
                 }
-                
-            } else{
-                $('.packup').show()
-                $('.detail').hide()
+
+            } else {
+                $('.packup').show();
+                $('.detail').hide();
             }
-          }
+        },
+        showTip: function (msg) {
+            weui.toast(msg, {
+                duration: 2000,
+                className: 'custom-toast',
+            });
         }
-        $(function(){
-           EditCity.init();
-        })
-    </script>
+    };
+    $(function () {
+        EditCity.init();
+    })
+</script>
 </body>
 
 </html>

+ 487 - 472
src/web/templates/weixin/vipsubscribe/edit_subscribe_province.html

@@ -4,505 +4,520 @@
 <head>
     <meta charset="utf-8">
     <title>区域修改</title>
-    <meta name="viewport" content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" 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" 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/public.css?v={{Msg "seo" "version"}}"> -->
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
     <style>
-        .checkbox[disabled]{background: none no-repeat center center #eee!important;}
+        .checkbox[disabled] {
+            background: none no-repeat center center #eee !important;
+        }
     </style>
 </head>
 
 <body>
-    <div id="choose_area" >
-        <p class="optional_count"> 可选择省数量:<em class="count"></em> / <span class="total"></span></p>
-        <div class="result" style="top: .88rem">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            
-            <p>已选择:<span class="result_name">安徽、河南</span></p>
-        </div>
-        <div class="form">
-            <div class="select-area-box">
-                <ul class="area-list">
-                    <!--<li>
-                        <div class="tab whole" style="display:none">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox other">全国
-                            </div>
-                        </div>
-                    </li>-->
-                    <li class="index" id="A">A</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">安徽
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">澳门
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="B">B</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">北京
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="C">C</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">重庆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="F">F</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">福建
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="G">G</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广东
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广西
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">贵州
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">甘肃
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="H">H</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河北
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖北
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">黑龙江
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">海南
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河南
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖南
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <p class="index" id="J">J</p>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">吉林
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江苏
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江西
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="L">L</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">辽宁
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="N">N</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">内蒙古
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">宁夏
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Q">Q</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">青海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="S">S</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山西
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">陕西
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">上海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山东
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">四川
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="T">T</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">天津
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">台湾
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="X">X</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">西藏
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">新疆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">香港
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Y">Y</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">云南
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Z">Z</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">浙江
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="tips_btn">
-            <div class="btns">
-                <button class="reset-btn" id="cancel">取消</button>
-                <button disabled class="save-btn" id="enter">确认修改</button>
-            </div>
+<div id="choose_area">
+    <p class="optional_count"> 可选择省数量:<em class="count"></em> / <span class="total"></span></p>
+    <div class="result" style="top: .88rem">
+        <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
+
+        <p>已选择:<span class="result_name">安徽、河南</span></p>
+    </div>
+    <div class="form">
+        <div class="select-area-box">
+            <ul class="area-list">
+                <!--<li>
+                    <div class="tab whole" style="display:none">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox other">全国
+                        </div>
+                    </div>
+                </li>-->
+                <li class="index" id="A">A</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">安徽
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">澳门
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="B">B</li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">北京
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="C">C</li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">重庆
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="F">F</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">福建
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="G">G</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">广东
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">广西
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">贵州
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">甘肃
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="H">H</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">河北
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">湖北
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">黑龙江
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">海南
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">河南
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">湖南
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <p class="index" id="J">J</p>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">吉林
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">江苏
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">江西
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="L">L</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">辽宁
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="N">N</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">内蒙古
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">宁夏
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="Q">Q</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">青海
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="S">S</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">山西
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">陕西
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">上海
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">山东
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">四川
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="T">T</li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">天津
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">台湾
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="X">X</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">西藏
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">新疆
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li>
+                    <div class="tab municipality">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">香港
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="Y">Y</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">云南
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+                <li class="index" id="Z">Z</li>
+                <li>
+                    <div class="tab">
+                        <div class="province">
+                            <input type="checkbox" class="checkbox">浙江
+                        </div>
+                    </div>
+                    <div class="tab_content clearfix"></div>
+                </li>
+            </ul>
         </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">S</a>
-            <a href="javascript:;">T</a>
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
+    </div>
+    <div class="tips_btn">
+        <div class="btns">
+            <button class="reset-btn" id="cancel">取消</button>
+            <button disabled class="save-btn" id="enter">确认修改</button>
         </div>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script>
-        //加载数据
-            var EditProvince={
-              reqData:{},
-              selectlast:[],//上次修改的省份
-              selectedArr:[],//当前选择的省份
-              init:function(){
-                this.getData();
-                this.showData();//初始化页面展示
-                this.initClick();//初始化点击事件
-              },
-              getData:function(){
-                //加载数据
-                $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
-                  if(r.success){
-                    EditProvince.reqData=r.data;
-                  }
-                },false)
-                console.log(EditProvince.reqData);
-              },
-              showData:function(){
-                
-                $(".total").text(this.reqData.buyerclasscount);
-                var num= getAreaClassArr(EditProvince.reqData.area);//已选择多少省份
-                $(".select-area-box ul li:not('.index')").each(function () {
-                  var text = $(this).find(".province").text().trim();
-                  num[0].forEach(v =>{
-                      if(v == text){
-                          $(this).children().children('.province').children('input').prop('checked',true);
-                      }
-                  })
-                  //不能选中单独购买的城市的省份
-                  Object.keys(EditProvince.reqData.buyset.citys).forEach(v =>{
-                      if(v == text){
-                        if(($(this).prev().hasClass("index")&&$(this).next().hasClass("index"))||!$(this).next().html()){
-                          var zimu = $(this).prev().text().trim();
-                          $('.slide a').each(function(){
-                            if(zimu == $(this).text().trim()){
-                              $(this).remove();
-                            }
-                          })
-                          $(this).prev().remove();
+    <div class="slide">
+        <a href="javascript:;">#</a>
+        <a href="javascript:;">A</a>
+        <a href="javascript:;">B</a>
+        <a href="javascript:;">C</a>
+        <a href="javascript:;">F</a>
+        <a href="javascript:;">G</a>
+        <a href="javascript:;">H</a>
+        <a href="javascript:;">J</a>
+        <a href="javascript:;">L</a>
+        <a href="javascript:;">N</a>
+        <a href="javascript:;">Q</a>
+        <a href="javascript:;">S</a>
+        <a href="javascript:;">T</a>
+        <a href="javascript:;">X</a>
+        <a href="javascript:;">Y</a>
+        <a href="javascript:;">Z</a>
+    </div>
+</div>
+<script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script>
+    //加载数据
+    var EditProvince = {
+        reqData: {},
+        selectlast: [],//上次修改的省份
+        selectedArr: [],//当前选择的省份
+        init: function () {
+            this.getData();
+            this.showData();//初始化页面展示
+            this.initClick();//初始化点击事件
+        },
+        getData: function () {
+            //加载数据
+            $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
+                if (r.success) {
+                    EditProvince.reqData = r.data;
+                }
+            }, false);
+            console.log(EditProvince.reqData);
+        },
+        showData: function () {
+
+            $(".total").text(this.reqData.buyerclasscount);
+            var num = getAreaClassArr(EditProvince.reqData.area);//已选择多少省份
+            $(".select-area-box ul li:not('.index')").each(function () {
+                var text = $(this).find(".province").text().trim();
+                num[0].forEach(v => {
+                    if (v == text) {
+                        $(this).children().children('.province').children('input').prop('checked', true);
+                    }
+                });
+                //不能选中单独购买的城市的省份
+                Object.keys(EditProvince.reqData.buyset.citys).forEach(v => {
+                    if (v == text) {
+                        if (($(this).prev().hasClass("index") && $(this).next().hasClass("index")) || !$(this).next().html()) {
+                            var zimu = $(this).prev().text().trim();
+                            $('.slide a').each(function () {
+                                if (zimu == $(this).text().trim()) {
+                                    $(this).remove();
+                                }
+                            });
+                            $(this).prev().remove();
                         }
                         $(this).remove();
-                      }
-                  })
-                })
-                EditProvince.selectlast=num[0];
-                $(".count").text(num[0].length);
-                $(".total").text(EditProvince.reqData.buyset.areacount);
-              },
-              initClick:function(){
-                // 锚点跳转 
-                $("body").on('click','.slide a',function(){
-                  var s = $(this).html()
-                  if(s == '#'){
-                      return;
-                  }
-                  document.querySelector('#' + s).scrollIntoView({block:'center'});
-                })
-                
-                $('.province .checkbox').on('change', function () {
-                  EditProvince.getResult();
-                })
-                
-                // 取消按钮事件 返回上一页
-                $('#cancel').click(function(){
-                  window.history.go(-1)
-                })
-                // 确定修改事件
-                $('#enter').click(function(){
-                  $("#enter").attr("disabled","disabled");
-                  //删除所选省份
-                  for(var i in EditProvince.reqData.area) {
-                    let citys=EditProvince.reqData.area[i]
-                    if(citys.length==0){
-                    	if(i=="全国"){
-                  			continue
-                  		}
-                      delete EditProvince.reqData.area[i];
-                    }
-                  }
-                  //添加所选省份
-                  for(var i in EditProvince.selectedArr) {
-                    EditProvince.reqData.area[EditProvince.selectedArr[i]]=[];
-                  }
-                  
-                  $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditProvince.reqData.area)},function(r){
-                    if(r.success){
-                      window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
-                  },false)
-                  $("#enter").removeAttr("disabled");  
                 })
-                this.getResult();
-              },
-              getResult:function(){
-                EditProvince.selectedArr = []; //选中的省份数组
-                $('.result_name').empty();
-                $(".province").find(".checkbox:checked").each(function () {
-                  EditProvince.selectedArr.push($(this).parent().text().trim());
-                })
-                
-                if(EditProvince.selectedArr.length==$(".province .checkbox").length-1){//选中了全部省份
-                  $('.checkbox.other').trigger('click');
-                  return
+            });
+            EditProvince.selectlast = num[0];
+            $(".count").text(num[0].length);
+            $(".total").text(EditProvince.reqData.buyset.areacount);
+        },
+        initClick: function () {
+            // 锚点跳转
+            $("body").on('click', '.slide a', function () {
+                var s = $(this).html();
+                if (s == '#') {
+                    return;
                 }
-                
-                if(EditProvince.selectedArr[0]=="全国"){
-                  $(".count").text("all");
-                }else{
-                  $(".count").text(EditProvince.selectedArr.length);
+                document.querySelector('#' + s).scrollIntoView({block: 'center'});
+            });
+
+            $('.province .checkbox').on('change', function () {
+                EditProvince.getResult(true);
+            });
+
+            // 取消按钮事件 返回上一页
+            $('#cancel').click(function () {
+                window.history.go(-1)
+            });
+            // 确定修改事件
+            $('#enter').click(function () {
+                $("#enter").attr("disabled", "disabled");
+                //删除所选省份
+                for (var i in EditProvince.reqData.area) {
+                    let citys = EditProvince.reqData.area[i];
+                    if (citys.length == 0) {
+                        if (i == "全国") {
+                            continue
+                        }
+                        delete EditProvince.reqData.area[i];
+                    }
                 }
-                
-                //是否还能继续选择
-                if(EditProvince.selectedArr.length >= EditProvince.reqData.buyset.areacount){
-                  $(".province .checkbox:not(:checked)").attr('disabled', 'disabled');
-                }else{
-                  $(".province .checkbox:not(:checked)").removeAttr('disabled');
+                //添加所选省份
+                for (var i in EditProvince.selectedArr) {
+                    EditProvince.reqData.area[EditProvince.selectedArr[i]] = [];
                 }
 
-                // 渲染选择结果
-                console.log( EditProvince.selectedArr)
-                var html = '';
-                for (var i = 0; i < EditProvince.selectedArr.length; i++) {
-                    if (i != EditProvince.selectedArr.length - 1) {
-                        html += '<span>' + EditProvince.selectedArr[i] + '、' + '</span>'
-                    } else {
-                        html += '<span>' + EditProvince.selectedArr[i] + '</span>'
+                $DoPost("/subscribepay/editSub/submit", {
+                    "type": "area",
+                    "value": JSON.stringify(EditProvince.reqData.area)
+                }, function (r) {
+                    if (r.success) {
+                        window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
+                }, false);
+                $("#enter").removeAttr("disabled");
+            });
+            this.getResult();
+        },
+        getResult: function (showTip) {
+            EditProvince.selectedArr = []; //选中的省份数组
+            $('.result_name').empty();
+            $(".province").find(".checkbox:checked").each(function () {
+                EditProvince.selectedArr.push($(this).parent().text().trim());
+            });
+
+            if (EditProvince.selectedArr.length == $(".province .checkbox").length - 1) {//选中了全部省份
+                $('.checkbox.other').trigger('click');
+                return
+            }
+
+            if (EditProvince.selectedArr[0] == "全国") {
+                $(".count").text("all");
+            } else {
+                $(".count").text(EditProvince.selectedArr.length);
+            }
+
+            //是否还能继续选择
+            if (EditProvince.selectedArr.length >= EditProvince.reqData.buyset.areacount) {
+                if (showTip) {
+                    this.showTip(`<p>当前省份只可选择${EditProvince.reqData.buyset.areacount}个省份<br/><span style="white-space: nowrap;">您只购买了${EditProvince.reqData.buyset.areacount}个省份,如需更多请升级<span></p>`);
                 }
-                $('.result_name').append(html)
-                $('.form').css("margin-top",$(".optional_count").height()+$(".result").height()+20);
-                //是否提交
-                if(EditProvince.noChange(EditProvince.selectlast,EditProvince.selectedArr)||EditProvince.selectedArr.length==0){
-                  $('#enter').attr('disabled','disabled')
-                }else{
-                  $('#enter').removeAttr('disabled')
+                $(".province .checkbox:not(:checked)").attr('disabled', 'disabled');
+            } else {
+                $(".province .checkbox:not(:checked)").removeAttr('disabled');
+            }
+
+            // 渲染选择结果
+            console.log(EditProvince.selectedArr);
+            var html = '';
+            for (var i = 0; i < EditProvince.selectedArr.length; i++) {
+                if (i != EditProvince.selectedArr.length - 1) {
+                    html += '<span>' + EditProvince.selectedArr[i] + '、' + '</span>'
+                } else {
+                    html += '<span>' + EditProvince.selectedArr[i] + '</span>'
                 }
-              },
-              noChange:function(arr1,arr2){
-                return JSON.stringify(arr1.sort()) === JSON.stringify(arr2.sort());
-              }
             }
-            $(function(){
-              EditProvince.init(); 
-            })
-    </script>
+            $('.result_name').append(html);
+            $('.form').css("margin-top", $(".optional_count").height() + $(".result").height() + 20);
+            //是否提交
+            if (EditProvince.noChange(EditProvince.selectlast, EditProvince.selectedArr) || EditProvince.selectedArr.length == 0) {
+                $('#enter').attr('disabled', 'disabled')
+            } else {
+                $('#enter').removeAttr('disabled')
+            }
+        },
+        noChange: function (arr1, arr2) {
+            return JSON.stringify(arr1.sort()) === JSON.stringify(arr2.sort());
+        },
+        showTip: function (msg) {
+            weui.toast(msg, {
+                duration: 2000,
+                className: 'custom-toast',
+            });
+        }
+    };
+    $(function () {
+        EditProvince.init();
+    })
+</script>
 </body>
 
 </html>

+ 11 - 1
src/web/templates/weixin/vipsubscribe/trial_info.html

@@ -49,7 +49,7 @@
                         </div>
                     </div>
                     <div class="form_bottom">
-                        <div class="form_item">
+                        <div class="form_item form_item_line">
                             <input type="text" id=""  placeholder="输入公司名称" class="company"
                                 onchange="check_company($(this))"></input>
                         </div>
@@ -82,6 +82,16 @@
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
     <script>
+        
+        //解决android 键盘遮挡输入框
+        window.addEventListener("resize", function() {
+            if(document.activeElement.tagName=="INPUT" || document.activeElement.tagName=="TEXTAREA") {
+                window.setTimeout(function() {
+                    //document.activeElement.scrollIntoViewIfNeeded();
+                    document.activeElement.scrollIntoView({block: "center"});
+                },200);
+            }
+        })
         initShare({{.T.signature}});
         {{if not .T.trialSign }}
         $(function () {

+ 487 - 485
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -4,26 +4,27 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport"
-        content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
     <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" 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_purchase.css?v=3{{Msg "seo" "version"}}">
-</head> 
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}">
+</head>
 <body>
-  <div>
+<div>
     <div class="vip_purchase">
         <div class="choose_condition">
             <ul class="chooseList">
-                <li class="choose_item">                      
+                <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseArea">
                         <span class="label">区域</span>
                         {{if not .T.isTrial }}
-                          <input type="text" disabled value="" placeholder="1个市" class="info choose_area">
+                            <input type="text" disabled value="" placeholder="1个市"
+                                   class="info choose_area">
                         {{else}}
-                         <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info choose_area"> 
+                            <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info choose_area">
                         {{end}}
                         <i class="iconfont icon-arrow"></i>
                     </a>
@@ -34,9 +35,10 @@
                     <a href="/front/vipsubscribe/toChooseIndustry">
                         <span class="label">行业</span>
                         {{if not .T.isTrial }}
-                          <input type="text" disabled value="" placeholder="1个行业" class="info choose_industry">
+                            <input type="text" disabled value="" placeholder="1个行业"
+                                   class="info choose_industry">
                         {{else}}
-                          <input type="text" disabled value="" placeholder="选择采购单位行业" class="info choose_industry">
+                            <input type="text" disabled value="" placeholder="选择采购单位行业" class="info choose_industry">
                         {{end}}
                         <i class="iconfont icon-arrow"></i>
                     </a>
@@ -47,29 +49,30 @@
                     <!-- 需要选择订阅周期就用a标签,div.class="free-7day"隐藏 opacity: 1 !important; -->
                     <!-- 需要选择试用就用div标签,a标签隐藏 -->
                     {{if not .T.isTrial }}
-                      <a href="javascript:;">
-                        <span class="label">订阅周期</span>
-                        <input type="text" readonly="readonly" disabled style="color:#000;opacity:0.7;" value="1个月" class="info choose_time">
-                        <i class="iconfont icon-arrow choose_time"></i>
-                      </a>
+                        <a href="javascript:;">
+                            <span class="label">订阅周期</span>
+                            <input type="text" readonly="readonly" disabled style="color:#000;" value="1个月"
+                                   class="info choose_time">
+                            <i class="iconfont icon-arrow choose_time"></i>
+                        </a>
                     {{else}}
-                      <div class="free-7day" >
-                          <span class="label">订阅周期</span>   
-                          <i class="info">免费试用7天</i>
-                      </div>
+                        <div class="free-7day">
+                            <span class="label">订阅周期</span>
+                            <i class="info">免费试用7天</i>
+                        </div>
                     {{end}}
-                    
+
                 </li>
             </ul>
             <div class="pay_mode">
                 {{if not .T.isTrial }}
-                <div class="select_payment choose_item">
-                    <a href="javascript:;">
-                        <span class="label">支付方式</span>
-                        <span class="info choose_way" style="width: 6rem;">微信支付</span>
-                        <!--<i class="iconfont"></i>-->
-                    </a>
-                </div>
+                    <div class="select_payment choose_item">
+                        <a href="javascript:;">
+                            <span class="label">支付方式</span>
+                            <span class="info choose_way" style="width: 6rem;">微信支付</span>
+                            <!--<i class="iconfont"></i>-->
+                        </a>
+                    </div>
                 {{end}}
                 <div class="vip_rules">
                     <!--
@@ -135,7 +138,7 @@
             <div class="weui-cells weui-cells_checkbox radio-form">
                 <label class="weui-cell weui-check__label" for="buy">
                     <div class="weui-cell__hd">
-                        <input type="checkbox" class="weui-check" name="buyService" id="buy" />
+                        <input type="checkbox" class="weui-check" name="buyService" id="buy"/>
                         <i class="weui-icon-checked"></i>
                     </div>
                     <div class="weui-cell__bd read">
@@ -179,7 +182,7 @@
                             <label class="weui-cell weui-check__label monthly_label" for="monthly">
                                 <div class="weui-cell__hd">
                                     <input type="radio" class="weui-check monthly" name="time" value="month"
-                                        id="monthly"/>
+                                           id="monthly"/>
                                     <i class="weui-icon-checked"></i>
                                 </div>
                                 <div class="weui-cell__bd">
@@ -187,7 +190,7 @@
                                 </div>
                             </label>
                             <div class="number_box" id="number_box_month" data-numbox-step="1" data-numbox-min="1"
-                                data-numbox-max="12">
+                                 data-numbox-max="12">
                                 <button class="weui-btn weui-btn_plain-default" type="button">
                                     <div class="jy_icon decrease"></div>
                                 </button>
@@ -201,7 +204,7 @@
                             <label class="weui-cell weui-check__label yearly_label" for="yearly">
                                 <div class="weui-cell__hd">
                                     <input type="radio" class="weui-check yearly" name="time" value="year"
-                                        id="yearly" checked/>
+                                           id="yearly" checked/>
                                     <i class="weui-icon-checked"></i>
                                 </div>
                                 <div class="weui-cell__bd">
@@ -221,7 +224,7 @@
                 </div>
             </div>
         </div>
-        <!-- 选择支付方式 -->        
+        <!-- 选择支付方式 -->
         <div class="js_dialog pay_way" id="pay_way" style="display: none;">
             <div class="weui-mask"></div>
             <div class="box">
@@ -237,7 +240,7 @@
                                 <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 />
+                                <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked/>
                                 <i class="weui-icon-checked"></i>
                             </div>
                         </label>
@@ -246,7 +249,7 @@
                                 <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" />
+                                <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb"/>
                                 <i class="weui-icon-checked"></i>
                             </div>
                         </label>
@@ -258,493 +261,492 @@
     <script src="/vipsubscribe/js/jquery-2.1.4.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"}}
     <script>
-      //微信支付start
-      {{if not .T.isTrial }}
-      try{
-  			var signature = {{.T.signature}};
-  			var isConfigSuccess = true;
-  			var id = {{.T._id}}
-  			if(signature && signature.length == 4){
-  				wx.config({
-  				    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-  				    appId: signature[0], // 必填,公众号的唯一标识
-  				    timestamp:signature[1], // 必填,生成签名的时间戳
-  				    nonceStr: signature[2], // 必填,生成签名的随机串
-  				    signature: signature[3],// 必填,签名,见附录1
-  				    jsApiList: ['chooseWXPay','hideAllNonBaseMenuItem'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
-  				});
-  				wx.ready(function () {
-  					if(!isConfigSuccess){
-  						return;
-  					}
-  					wx.hideAllNonBaseMenuItem();
-  			    });
-  				wx.error(function(res){
-  				    //config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
-  					//alert(res);
-  					isConfigSuccess = false;
-  				});
-  			}
-        //调用微信支付接口
-  			function onBridgeReady(res,ordercode){
-  			   	WeixinJSBridge.invoke('getBrandWCPayRequest',{
-  			    		"appId": res["appId"],
-  			          	"timeStamp": res["timestamp"],
-  			          	"nonceStr": res["nonceStr"],
-  			          	"package": res["prepayId"],
-  			          	"signType": res["signType"],
-  			         	"paySign": res["sign"]
-  					},
-  					function(r){
-  				    if(r.err_msg == "get_brand_wcpay_request:ok"){
-  							setTimeout(function(){
-  								window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode="+ordercode);
-  							},500)
-  						}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
-                console.log("支付已取消")
-						  }else{
-                weui.toast("系统异常,请稍微再试",{
-                  duration: 2000,
-                  className: 'custom-toast',
+        $(window).bind("pageshow", function (event) {
+            if (event.originalEvent.persisted) {
+                window.location.reload();
+            }
+        });
+        //微信支付start
+        {{if not .T.isTrial }}
+        try {
+            var signature = {{.T.signature}};
+            var isConfigSuccess = true;
+            var id = {{.T._id}}
+            if (signature && signature.length == 4) {
+                wx.config({
+                    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+                    appId: signature[0], // 必填,公众号的唯一标识
+                    timestamp: signature[1], // 必填,生成签名的时间戳
+                    nonceStr: signature[2], // 必填,生成签名的随机串
+                    signature: signature[3],// 必填,签名,见附录1
+                    jsApiList: ['chooseWXPay', 'hideAllNonBaseMenuItem'] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
+                });
+                wx.ready(function () {
+                    if (!isConfigSuccess) {
+                        return;
+                    }
+                    wx.hideAllNonBaseMenuItem();
+                });
+                wx.error(function (res) {
+                    //config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。
+                    //alert(res);
+                    isConfigSuccess = false;
                 });
-  					  }
-  				});
-  			}        
-      //微信支付end
-      }catch(e){
-        console.log(e)
-      }
-        sessionStorage.removeItem("vipSubisTrial");//非试用界面
-      {{else}}
-        sessionStorage.setItem("vipSubisTrial","1");//试用界面
-        //试用用户
-      {{end}}
-      var purchase = {
-        areaSelect:{"一个省":["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
-        industrySelect:["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
-        timeSelect:[1,2],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-        price:{}, //价格
-        vipSubisTrial:false,
-        initData: function(){
-          //已选择
-          try{
-            if(sessionStorage.getItem("vipSubSelectArea")){
-              this.areaSelect=JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
             }
-            if(sessionStorage.getItem("vipSubSelectIndustry")){
-              this.industrySelect=JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
+
+            //调用微信支付接口
+            function onBridgeReady(res, ordercode) {
+                WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                        "appId": res["appId"],
+                        "timeStamp": res["timestamp"],
+                        "nonceStr": res["nonceStr"],
+                        "package": res["prepayId"],
+                        "signType": res["signType"],
+                        "paySign": res["sign"]
+                    },
+                    function (r) {
+                        if (r.err_msg == "get_brand_wcpay_request:ok") {
+                            setTimeout(function () {
+                                clearSessionStorage();
+                                window.location.replace("/front/vipsubscribe/toPaySuccessPage?orderCode=" + ordercode);
+                            }, 500)
+                        } else if (r.err_msg == "get_brand_wcpay_request:cancel") {
+                            console.log("支付已取消")
+                        } else {
+                            weui.toast("系统异常,请稍微再试", {
+                                duration: 2000,
+                                className: 'custom-toast',
+                            });
+                        }
+                    });
             }
-            {{if eq .T.orderType 5 }}
-              //即将到期 回显已购买
-              if(!sessionStorage.getItem("vipSubSelectArea")||!sessionStorage.getItem("vipSubSelectIndustry")){
-                $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
-                  if(r.success){
-                    if(!$.isEmptyObject(r.data.area)){
-                      purchase.areaSelect=r.data.area
-                    }else{
-                      purchase.areaSelect={"全国":[]}
+
+            //微信支付end
+        } catch (e) {
+            console.log(e)
+        }
+        sessionStorage.removeItem("vipSubisTrial");//非试用界面
+        {{else}}
+        sessionStorage.setItem("vipSubisTrial", "1");//试用界面
+        //试用用户
+        {{end}}
+        var purchase = {
+            areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
+            industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
+            timeSelect: [1, 2],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+            price: {}, //价格
+            vipSubisTrial: false,
+            initData: function () {
+                //已选择
+                try {
+                    if (sessionStorage.getItem("vipSubSelectArea")) {
+                        this.areaSelect = JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
+                    }
+                    if (sessionStorage.getItem("vipSubSelectIndustry")) {
+                        this.industrySelect = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
                     }
-                    if(r.data.industry.length!=0){
-                      purchase.industrySelect=r.data.industry
-                    }else{
-                      purchase.industrySelect=["全部行业"]
+                    {{if eq .T.orderType 5 }}
+                    //即将到期 回显已购买
+                    if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
+                        $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
+                            if (r.success) {
+                                if (!$.isEmptyObject(r.data.area)) {
+                                    purchase.areaSelect = r.data.area
+                                } else {
+                                    purchase.areaSelect = {"全国": []}
+                                }
+                                if (r.data.industry.length != 0) {
+                                    purchase.industrySelect = r.data.industry
+                                } else {
+                                    purchase.industrySelect = ["全部行业"]
+                                }
+                                sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
+                                sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
+                            }
+                        }, false)
                     }
-                    sessionStorage.setItem("vipSubSelectArea",JSON.stringify(purchase.areaSelect));
-                    sessionStorage.setItem("vipSubSelectIndustry",JSON.stringify(purchase.industrySelect));
-                  }
-                },false)
-              }
-            {{end}}
-            
-			{{if .T.again}}	//再次购买回显
-            {{if eq .T.again 1 }}
-              if(!sessionStorage.getItem("vipSubSelectArea")||!sessionStorage.getItem("vipSubSelectIndustry")){
-                $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
-                  if(r.success){
-                    if(!$.isEmptyObject(r.data.area)){
-                      purchase.areaSelect=r.data.area
-                    }else{
-                     purchase.areaSelect={"全国":[]}
+                    {{end}}
+                    {{if .T.again}}    //再次购买回显
+                    {{if eq .T.again 1 }}
+                    if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
+                        $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
+                            if (r.success) {
+                                if (!$.isEmptyObject(r.data.area)) {
+                                    purchase.areaSelect = r.data.area
+                                } else {
+                                    purchase.areaSelect = {"全国": []}
+                                }
+                                if (r.data.industry.length != 0) {
+                                    purchase.industrySelect = r.data.industry
+                                } else {
+                                    purchase.industrySelect = ["全部行业"]
+                                }
+                                sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
+                                sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
+                            }
+                        }, false)
                     }
-                    if(r.data.industry.length!=0){
-                      purchase.industrySelect=r.data.industry
-                    }else{
-                      purchase.industrySelect=["全部行业"]
+                    {{end}}
+                    {{end}}
+                    if (sessionStorage.getItem("vipSubSelectTime")) {
+                        this.timeSelect = JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
                     }
-                    sessionStorage.setItem("vipSubSelectArea",JSON.stringify(purchase.areaSelect));
-                    sessionStorage.setItem("vipSubSelectIndustry",JSON.stringify(purchase.industrySelect));
-                  }
-                },false)
-              }
-            {{end}}
-            {{end}}
+                    //是否已经点击已读
+                    if (sessionStorage.getItem("vipSub_read") == "true") $("#buy").prop("checked", true);
+                    //是否试用界面
+                    if (sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial = true;
 
-            if(sessionStorage.getItem("vipSubSelectTime")){
-              this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
-            }
-            //是否已经点击已读
-            if(sessionStorage.getItem("vipSub_read")=="true") $("#buy").prop("checked",true);
-            //是否试用界面
-            if(sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial=true;
-            
-            //加载价格
-            $DoPost("/subscribepay/vipsubscribe/getPrice",{},function(r){
-              if(r){
-                purchase.price=r;
-              }
-            },false)
-            
-          }catch(e){
-            console.log(e)
-          }  
-        },
-        showArea:function(){
-          let cityArr=[];//城市
-          let provinceArr=[];//省份
-          let data= this.areaSelect;          
-          for(var i in data) {
-            let citys=data[i]
-            if(citys.length>0){
-              cityArr = cityArr.concat(citys);
-            }else{
-              provinceArr.push(i)
-            }
-          }
-          
-          if(!$.isEmptyObject(data)&&!this.areaSelect["一个省"]){
-            $(".choose_area").val(provinceArr.join(" ")+" "+cityArr.join(" "));
-          }
+                    //加载价格
+                    $DoPost("/subscribepay/vipsubscribe/getPrice", {}, function (r) {
+                        if (r) {
+                            purchase.price = r;
+                        }
+                    }, false)
 
-          if(!$.isEmptyObject(this.areaSelect)&&!this.areaSelect["全国"]&&!this.areaSelect["一个省"]){ //选择有行业信息 且不是全国
-            var tipTxt="已选择 ";
-            if(provinceArr.length>0)tipTxt+=provinceArr.length+" 个省级区域";
-            if(cityArr.length>0){
-              if(provinceArr.length>0) tipTxt+="、"
-              tipTxt+=cityArr.length+" 个地市";
-            }
-            $(".add_tips.area").text(tipTxt).css("display","");
-          }
-        },
-        showPrice:function(){
-          $('.monthly span:eq(0)').text(purchase.price.month.oneCity_oneBuyerClass/100);
-          $('.monthly span:eq(1)').text(purchase.price.month.oneCity_allBuyerClass/100);
-          $('.monthly span:eq(2)').text(purchase.price.month.oneProvince_oneBuyerClass/100);
-          $('.monthly span:eq(3)').text(purchase.price.month.oneProvince_allBuyerClass/100);
-          $('.monthly span:eq(4)').text(purchase.price.month.allProvince_oneBuyerClass/100);
-          $('.monthly span:eq(5)').text(purchase.price.month.allProvince_allBuyerClass/100);
-          
-          $('.yearly span:eq(0)').text(purchase.price.year.oneCity_oneBuyerClass/100);
-          $('.yearly span:eq(1)').text(purchase.price.year.oneCity_allBuyerClass/100);
-          $('.yearly span:eq(2)').text(purchase.price.year.oneProvince_oneBuyerClass/100);
-          $('.yearly span:eq(3)').text(purchase.price.year.oneProvince_allBuyerClass/100);
-          $('.yearly span:eq(4)').text(purchase.price.year.allProvince_oneBuyerClass/100);
-          $('.yearly span:eq(5)').text(purchase.price.year.allProvince_allBuyerClass/100);
-        },
-        showIndustry:function(){
-          let data = this.industrySelect;
-          if(data.length>0&&data[0]!="一个行业"){
-            $(".choose_industry").val(data.join(" "));
-          }
-          if(this.industrySelect.length>0&&this.industrySelect[0]!="全部行业"&&this.industrySelect[0]!="一个行业"){ //选择有行业信息
-            var tipTxt="已选择 ";
-            $(".add_tips.industry").text(tipTxt+this.industrySelect.length+" 个行业").css("display","");
-          }
-        },
-        showTime:function(){
-          let tmp = this.timeSelect[0];
-          if(this.timeSelect[1]==1){
-            tmp +="年"
-            $("#yearly").prop('checked', true);
-            $('.year_number:eq('+(this.timeSelect[0]-1)+')').addClass("active");
-            //$(".number_box:eq(1)").addClass("active");
-          }else{
-            tmp +="个月"
-            $("#monthly").prop('checked', true);
-            $(".number_box:eq(0)").addClass("active");
-            $("#number_box_month .month_number").text(this.timeSelect[0]);
-            if (this.timeSelect[0] >= 10) {
-                $('.profit_tips').text("已选择"+this.timeSelect[0]+"个月,建议“按年订阅”更换算哦~").show();
+                } catch (e) {
+                    console.log(e)
+                }
+            },
+            showArea: function () {
+                let cityArr = [];//城市
+                let provinceArr = [];//省份
+                let data = this.areaSelect;
+                for (var i in data) {
+                    let citys = data[i];
+                    if (citys.length > 0) {
+                        cityArr = cityArr.concat(citys);
+                    } else {
+                        provinceArr.push(i)
+                    }
+                }
+
+                if (!$.isEmptyObject(data) && !this.areaSelect["一个省"]) {
+                    $(".choose_area").val(provinceArr.join(" ") + " " + cityArr.join(" "));
+                }
+
+                if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["全国"] && !this.areaSelect["一个省"]) { //选择有行业信息 且不是全国
+                    var tipTxt = "已选择 ";
+                    if (provinceArr.length > 0) tipTxt += provinceArr.length + " 个省级区域";
+                    if (cityArr.length > 0) {
+                        if (provinceArr.length > 0) tipTxt += "、";
+                        tipTxt += cityArr.length + " 个地市";
+                    }
+                    $(".add_tips.area").text(tipTxt).css("display", "");
+                }
+            },
+            showPrice: function () {
+                $('.monthly span:eq(0)').text(purchase.price.month.oneCity_oneBuyerClass / 100);
+                $('.monthly span:eq(1)').text(purchase.price.month.oneCity_allBuyerClass / 100);
+                $('.monthly span:eq(2)').text(purchase.price.month.oneProvince_oneBuyerClass / 100);
+                $('.monthly span:eq(3)').text(purchase.price.month.oneProvince_allBuyerClass / 100);
+                $('.monthly span:eq(4)').text(purchase.price.month.allProvince_oneBuyerClass / 100);
+                $('.monthly span:eq(5)').text(purchase.price.month.allProvince_allBuyerClass / 100);
+
+                $('.yearly span:eq(0)').text(purchase.price.year.oneCity_oneBuyerClass / 100);
+                $('.yearly span:eq(1)').text(purchase.price.year.oneCity_allBuyerClass / 100);
+                $('.yearly span:eq(2)').text(purchase.price.year.oneProvince_oneBuyerClass / 100);
+                $('.yearly span:eq(3)').text(purchase.price.year.oneProvince_allBuyerClass / 100);
+                $('.yearly span:eq(4)').text(purchase.price.year.allProvince_oneBuyerClass / 100);
+                $('.yearly span:eq(5)').text(purchase.price.year.allProvince_allBuyerClass / 100);
+            },
+            showIndustry: function () {
+                let data = this.industrySelect;
+                if (data.length > 0 && data[0] != "一个行业") {
+                    $(".choose_industry").val(data.join(" "));
+                }
+
+                if (this.industrySelect.length > 0 && this.industrySelect[0] != "全部行业" && this.industrySelect[0] != "一个行业") { //选择有行业信息
+                    var tipTxt = "已选择 ";
+                    $(".add_tips.industry").text(tipTxt + this.industrySelect.length + " 个行业").css("display", "");
+                }
+            },
+            showTime: function () {
+                let tmp = this.timeSelect[0];
+                if (this.timeSelect[1] == 1) {
+                    tmp += "年";
+                    $("#yearly").prop('checked', true);
+                    $('.year_number:eq(' + (this.timeSelect[0] - 1) + ')').addClass("active");
+                    //$(".number_box:eq(1)").addClass("active");
+                } else {
+                    tmp += "个月";
+                    $("#monthly").prop('checked', true);
+                    $(".number_box:eq(0)").addClass("active");
+                    $("#number_box_month .month_number").text(this.timeSelect[0]);
+                    if (this.timeSelect[0] >= 10) {
+                        $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月,建议“按年订阅”更换算哦~").show();
+                    }
+                }
+                $(".info.choose_time").val(tmp);
+            },
+            flushPrice: function () {
+                if (this.vipSubisTrial) {
+                    $('.price strong').text('¥0.00');
+                } else {
+                    var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, this.timeSelect, this.price);
+                    $('.price strong').text('¥' + price);
+                    $('.computed_price').html('¥' + price);
+                }
             }
-          }
-          $(".info.choose_time").val(tmp);
-        },
-        flushPrice:function(){
-          if(this.vipSubisTrial){
-            $('.price strong').text('¥0.00');
-          }else{
-            var price=getsubVipOrderPrice(this.areaSelect,this.industrySelect,this.timeSelect,this.price);
-            $('.price strong').text('¥'+price);
-            $('.computed_price').html('¥' + price);
-          }
-        }
-      }
-      
-      $(window).bind("pageshow", function(event){
-          if(event.originalEvent.persisted){
-              window.location.reload();
-          }
-      });  
-        
+        };
 
-        $(function () {           
-          purchase.initData();
-          purchase.showArea();
-          purchase.showIndustry();
-          purchase.showPrice();
-          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);
-          })
+        $(function () {
+            purchase.initData();
+            purchase.showArea();
+            purchase.showIndustry();
+            purchase.showPrice();
+            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);
+            });
 
 
-          /* -----  选择完支付方式、订阅周期 回显到页面 -------*/
-          // 对支付方式选择的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')) {
-                  return
-              }
-              // 判断是点击的是+ 还是-
-              if ($(e.target).hasClass('add')) {
-                  if(currentNum==11){ //12个月自动跳转1年
-                    $("#number_box_year .year_number:eq(0)").trigger("click");
+                if (!$monthlyInput.prop('checked')) {
                     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').text("已选择"+currentNum+"个月,建议“按年订阅”更换算哦~").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')
-              }
-          })
+                }
+                // 判断是点击的是+ 还是-
+                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').text("已选择" + currentNum + "个月,建议“按年订阅”更换算哦~").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=[];
-              }
-              {{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}},
+            $('#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 = [];
                 }
-                $DoPost("/subscribepay/vipsubscribe/createOrder",param,function(r){
-                  if(r.success){
-                    clearSessionStorage();
-                    onBridgeReady(JSON.parse(r.data.res),r.data.code);
-                  }
-                  $("#payHandle").removeAttr("disabled")  
-                })
-              {{else}} 
+                {{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) {
+                        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}}
-          })
-          
-        })
+                $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选择框
         function hideDialog() {
             $('#pay_way').hide(200);
             $('#time_cycle').hide(200);
         }
+
         //是否可点击
-        function checkOk(){
-          var area = $(".info:eq(0)").val().trim();
-          var industry = $(".info:eq(1)").val().trim();
-          var checked = $('#buy').prop('checked');
-          if (area != '' && industry != '' && checked == true) {
-              $("#payHandle").removeAttr('disabled');
-          } else {
-              $("#payHandle").attr({
-                  'disabled': 'true'
-              });
-          }
-          sessionStorage.setItem("vipSub_read",checked)
-        } 
-        
-        function clearSessionStorage(){
-          sessionStorage.removeItem("vipSubSelectArea");
-					sessionStorage.removeItem("vipSubSelectIndustry");
-					sessionStorage.removeItem("vipSubSelectTime");
-					sessionStorage.removeItem("vipSub_read");
+        function checkOk() {
+            var area = $(".info:eq(0)").val().trim();
+            var industry = $(".info:eq(1)").val().trim();
+            var checked = $('#buy').prop('checked');
+            if (area != '' && industry != '' && checked == true) {
+                $("#payHandle").removeAttr('disabled');
+            } else {
+                $("#payHandle").attr({
+                    'disabled': 'true'
+                });
+            }
+            sessionStorage.setItem("vipSub_read", checked)
         }
-                   
+
+        function clearSessionStorage() {
+            sessionStorage.removeItem("vipSubSelectArea");
+            sessionStorage.removeItem("vipSubSelectIndustry");
+            sessionStorage.removeItem("vipSubSelectTime");
+            sessionStorage.removeItem("vipSub_read");
+        }
+
     </script>
-  </div>  
+    {{include "/common/weixin.html"}}
+</div>
 </body>
 
 </html>