提交

src/jfw/front/vipsubscribe.go

@@ -9,8 +9,8 @@ import (
 
 type Subscribepay struct {
 	*xweb.Action
-	tailInfo          xweb.Mapper `xweb:"/front/vipsubscribe/tailInfo"`              //vip订阅服务-用户信息录入页面
 	introduce         xweb.Mapper `xweb:"/front/vipsubscribe/introducePage"`         //订阅收费介绍页
+	tailInfo          xweb.Mapper `xweb:"/front/vipsubscribe/tailInfo"`              //vip订阅服务-用户信息录入页面
 	toPurchasePage    xweb.Mapper `xweb:"/front/vipsubscribe/toPurchasePage"`        //订阅收费购买页面
 	toChooseArea      xweb.Mapper `xweb:"/front/vipsubscribe/toChooseArea/(.*)"`     //订阅收费地区筛选
 	toChooseIndustry  xweb.Mapper `xweb:"/front/vipsubscribe/toChooseIndustry/(.*)"` //订阅收费行业筛选
@@ -43,6 +43,11 @@ func (s *Subscribepay) Introduce() {
 	s.Render("/weixin/vipsubscribe/vip_introduce.html")
 }
 
+//试用完善信息
+func (s *Subscribepay) TailInfo() error {
+	s.Render("/weixin/vipsubscribe/trial_info.html", &s.T)
+}
+
 //订阅收费购买页面
 func (s *Subscribepay) ToPurchasePage() {
 	s.Render("/weixin/vipsubscribe/vip_purchase.html")
@@ -123,14 +128,3 @@ func (s *Subscribepay) RenewPage(sign string) {
 func (s *Subscribepay) RenewPayPage() {
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 }
-
-func (s *Subscribepay) TailInfo() error {
-	defer util.Catch()
-	userId := util.ObjToString(s.GetSession("userId"))
-	if userId != "" {
-		s.Render("/weixin/vipsubscribe/trial_info.html", &s.T)
-	} else {
-		log.Println("未登录")
-	}
-	return nil
-}

src/jfw/jyutil/sessionkeep.go

@@ -137,6 +137,10 @@ func (sk *SessionKeep) Do(w http.ResponseWriter, r *http.Request) bool {
 				}
 				http.Redirect(w, r, "/", 302)
 				return false
+			} else if strings.HasPrefix(rqu, "/front/vipsubscribe/") {
+				http.Redirect(w, r, "/swordfish/about", 302)
+				//查找不到此用户信息,（用户合并微信登录防止跳转）
+				return true
 			}
 		}
 	}

src/jfw/modules/subscribepay/src/main.go

@@ -1,17 +1,20 @@
 package main
 
 import (
-	_ "a"
+	// 	_ "a"
 	. "config"
 	_ "filter"
 	"net/http"
 	_ "service"
 	_ "util"
 
+	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
 )
 
 func main() {
 	mux1 := http.NewServeMux()
+	httpsession.IsRedisSessionStore = true
+	xweb.RootApp().AppConfig.CheckXsrf = false
 	xweb.RunBase(":"+Config.Webport, mux1)
 }

src/jfw/modules/subscribepay/src/service/public.go

@@ -1,27 +0,0 @@
-package service
-
-import (
-	"github.com/dchest/captcha"
-	"github.com/go-xweb/xweb"
-)
-
-type Public struct {
-	*xweb.Action
-
-	captcha xweb.Mapper `xweb:"/public/captcha"`
-}
-
-//图片验证码
-func (p *Public) Captcha() error {
-	id := captcha.NewLen(4) //此id为生成验证码的ID，并不是实际显示的数字，在提交校验时，需要根据此ID进行查询。
-	p.SetSession("Sub_CheckCodeId", id)
-	//校验时调用以下代码
-	//ccid,_:=p.GetSession("Sub_CheckCodeId").(string)
-	//captcha.VerifyString(ccid,"用户输入的校验码")//返回bool
-	w := p.ResponseWriter
-	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("Content-Type", "image/png")
-	return captcha.WriteImage(w, id, 90, 30)
-}

src/jfw/modules/subscribepay/src/service/trial.go

@@ -0,0 +1,134 @@
+package service
+
+import (
+	qutil "qfw/util"
+	"regexp"
+	"time"
+	"util"
+
+	"github.com/dchest/captcha"
+	"github.com/go-xweb/xweb"
+)
+
+//试用用户接口
+type Trial struct {
+	*xweb.Action
+	captcha          xweb.Mapper `xweb:"/subscribepay/trial/captcha"`          //图形验证码
+	sendPhoneCaptcha xweb.Mapper `xweb:"/subscribepay/trial/sendPhoneCaptcha"` //发送手机验证码
+	submitApply      xweb.Mapper `xweb:"/subscribepay/trial/submitApply"`      //提交申请信息
+}
+
+func init() {
+	xweb.AddAction(&Trial{})
+}
+
+var (
+	phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")
+	nameReg  = regexp.MustCompile("^[\u4E00-\u9FA5A-Za-z\\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$")
+)
+
+//试用用户图片验证码
+func (t *Trial) Captcha() error {
+	id := captcha.NewLen(4)
+	t.SetSession("subvip_trial_imgCode", id)
+	w := t.ResponseWriter
+	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	w.Header().Set("Pragma", "no-cache")
+	w.Header().Set("Expires", "0")
+	w.Header().Set("Content-Type", "image/png")
+	return captcha.WriteImage(w, id, 90, 30)
+}
+
+//发送手机验证码
+func (t *Trial) SendPhoneCaptcha() {
+	phoneNum := t.GetString("phoneNum")
+	imgcode_req := t.GetString("imgCancode")
+	ok, errMsg := func() (bool, string) {
+		if !phoneReg.MatchString(phoneNum) {
+			return false, "手机格式不正确"
+		}
+		imgcode_sess := qutil.ObjToString(t.GetSession("subvip_trial_imgCode"))
+		if !captcha.VerifyString(imgcode_sess, imgcode_req) || imgcode_req == "" {
+			return false, "验证码不正确"
+		}
+		//获取上次发送验证码时间
+		lastSend := qutil.Int64All(t.GetSession("subvip_trial_lastSend"))
+		if time.Now().Unix()-lastSend < 60 {
+			return false, "信息已发送"
+		}
+		//判断手机号是否存在
+		if isExist(phoneNum) {
+			return false, "手机号已使用"
+		}
+		MsgCode := qutil.GetRandom(6)
+		t.SetSession("subvip_trial_MsgCode", MsgCode)
+		t.SetSession("subvip_trial_phoneNum", phoneNum)
+		t.SetSession("subvip_trial_lastSend", time.Now().Unix())
+		go func() {
+			util.SendSMS("2828060", phoneNum, map[string]string{"code": MsgCode})
+		}()
+		return true, ""
+	}()
+	t.ServeJson(map[string]interface{}{
+		"success": ok,
+		"errMsg":  errMsg,
+	})
+}
+
+//提交申请信息
+func (t *Trial) SubmitApply() {
+	name := t.GetString("name")
+	tel := t.GetString("tel")
+	code := t.GetString("code")
+	company := t.GetString("company")
+	job := t.GetString("job")
+	ok, errMsg := func() (bool, string) {
+		//校验数据
+		if !nameReg.MatchString(name) || code == "" || company == "" {
+			return false, "输入校验不通过"
+		}
+		//校验验证码
+		lastSend := qutil.Int64All(t.GetSession("subvip_trial_lastSend"))
+		if time.Now().Unix()-lastSend > 60*5 {
+			return false, "短信验证码已过期"
+		}
+		code_sess := qutil.ObjToString(t.GetSession("subvip_trial_MsgCode"))
+		tel_sess := qutil.ObjToString(t.GetSession("subvip_trial_phoneNum"))
+		if code != code_sess || tel != tel_sess {
+			return false, "短信验证码出错"
+		}
+		if isExist(tel_sess) {
+			return false, "手机号已使用"
+		}
+		//储存数据
+		flag := util.MQFW.Save("user_msg", map[string]interface{}{
+			"s_userId":  t.GetSession("userId"),
+			"s_name":    name,
+			"s_phone":   tel,
+			"s_company": company,
+			"s_job":     job,
+			"i_time":    time.Now().Unix(),
+			"s_source":  "vipsub_trial",
+		})
+		if flag != "" {
+			return false, "稍后重试"
+		}
+		go func() {
+			//更新user表可试用
+		}()
+		return true, ""
+	}()
+	t.ServeJson(map[string]interface{}{
+		"success": ok,
+		"errMsg":  errMsg,
+	})
+}
+
+//查询手机号是否存在
+func isExist(phone string) bool {
+	res, ok := util.MQFW.FindOne("user_msg", map[string]string{"s_phone": phone})
+	if ok && len(*res) > 0 {
+		return true
+	}
+	return false
+}

src/jfw/modules/subscribepay/src/util/db.go

@@ -14,12 +14,12 @@ var Ca_Log = &ca.Cassandra{}
 
 func init() {
 	//初始化cassandra
-	Ca_Log.ViewCacheLen = true
-	Ca_Log.InitCassandra("jianyu",
-		Config.Cassandra.Size,
-		Config.Cassandra.Host,
-		map[string]int{"port": Config.Cassandra.Port},
-	)
+	// Ca_Log.ViewCacheLen = true
+	// Ca_Log.InitCassandra("jianyu",
+	// 	Config.Cassandra.Size,
+	// 	Config.Cassandra.Host,
+	// 	map[string]int{"port": Config.Cassandra.Port},
+	// )
 	//初始化redis
 	redisConfig := Config.Redisaddrs
 	if redisConfig != "" {

src/jfw/modules/subscribepay/src/util/public.go

@@ -0,0 +1,17 @@
+package util
+
+import (
+	"qfw/util/sms"
+	"strings"
+)
+
+//根据模板发送短信,模板是运营商设定的。
+//第三个参数是可变参数，可以传入多个，但要和模板相匹配
+func SendSMS(tplcode /*模板代码*/, mobile /*手机号码*/ string, param map[string]string) {
+	tmp := []string{}
+	for k, v := range param {
+		tmp = append(tmp, "#"+k+"#="+v)
+	}
+	text := strings.Join(tmp, "&")
+	sms.SendSms(mobile, tplcode, text)
+}

src/web/staticres/vipsubscribe/js/common.js

@@ -1,4 +1,14 @@
 $(function() {
     // 解决ios系统click 事件300毫秒的延迟
-    FastClick.attach(document.body);
-});
+    FastClick.attach(document.body); 
+});
+
+function $DoPost(url,param,callback){
+	$.post(url+"?t="+new Date().getTime(),param,function(r){
+		if(r.error=="需要登录！"){
+			alert(r.error)
+		}else{
+			callback(r)
+		}
+    })
+}

src/web/staticres/vipsubscribe/js/personal_info.js

@@ -27,10 +27,10 @@
 }
 /* 验证多项 */
 // 验证多少项，多少个false
-var flags = [false, false, false, false];
+var flags = [false, false, false, false, false];
 function checkAll() {
     for (f in flags) {
-        console.log(f)
+        if (f==2) continue
         if (!flags[f]) {
             isDisabled(false);
             return;
@@ -39,55 +39,88 @@ function checkAll() {
     }
 }
 // 验证姓名
-function check_name(obj) {
-    console.log(obj.val())
+function check_name(obj,toast) {
     let name = obj.val();
     var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;//中英文或加.的少数民族名字
     if(!namereg.test(name)){
         flags[0] = false
-        weui.toast('姓名格式不正确',{
-            duration: 2000,
-            className: 'custom-toast',
-        }) 
+        if(toast){
+        	weui.toast('姓名格式不正确',{
+	            duration: 2000,
+	            className: 'custom-toast',
+        	})
+        }
     }else{
         flags[0] = true
     }
     checkAll()
 }
 // 验证手机号
-function check_tel(obj,btn) {
+function check_tel(obj,btn,toast) {
     let phone = obj.val();
     if(!(/^1[3456789]\d{9}$/.test(phone))){
         flags[1] = false
         // return false; 
-        weui.toast('手机号格式不正确',{
-            duration: 2000,
-            className: 'custom-toast',
-        })
+        if(toast){
+        	weui.toast('手机号格式不正确',{
+	            duration: 2000,
+	            className: 'custom-toast',
+        	})
+        }
+        btn.css('color','#888') 
     }else{
         flags[1] = true
-        btn.css('color','#2CB7CA') 
+        if(flags[2]){
+	        btn.css('color','#2CB7CA') 
+        }
     }
     checkAll()
 }
-// 验证验证码
-function check_code(obj) {
+// 验证图形验证码
+function check_imgcode(obj,btn,toast) {
     let code = obj.val();
-    if(code == ''){
+    if(code.length != 4){
         flags[2] = false
-    
+        if(toast){
+        	weui.toast('图形验证码错误',{
+	            duration: 2000,
+	            className: 'custom-toast',
+        	})
+        }
+        btn.css('color','#888') 
     }else{
         flags[2] = true
+        if(flags[1]){
+	        btn.css('color','#2CB7CA') 
+        }
     }
     checkAll()
 }
+
+// 验证图手机验证码
+function check_phonecode(obj,toast) {
+    let code = obj.val();
+    if(code.length != 6){
+        flags[3] = false
+        if(toast){
+        	weui.toast('手机验证码错误',{
+	            duration: 2000,
+	            className: 'custom-toast',
+        	})
+        }
+    }else{
+        flags[3] = true
+    }
+    checkAll()
+}
+
 // 验证公司名称
 function check_company(obj) {
     let company = obj.val();
     if(company == ''){
-        flags[3] = false
+        flags[4] = false
     }else{
-        flags[3] = true
+        flags[4] = true
     }
     checkAll()
 }

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

@@ -385,8 +385,8 @@
     <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script>
-        var hasCity = {{.T.hasCity}}; //定义已购买的城市数组
-        
+        var hasCity = []; //定义已购买的城市数组
+        var saveObj ;//数据
         // 获取url传参
         function getParam(name) {
             var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
@@ -452,6 +452,7 @@
         }
         /* 选中结果 */
         function getResult() {
+            saveObj = {};
             $('.result_name').empty()
             var data = []; //定义一个总数组
             var cityArr =[]; //定义一个选中城市数组
@@ -502,6 +503,7 @@
             },[]) 
             // 数组筛选
             let result = data.map(v =>{
+            // result = data.map(v =>{
                 let filterArr = v.children.filter(s =>{
                    return s.parent === v.name
                 })
@@ -510,17 +512,19 @@
                     children:filterArr
                 }
             })
-            // console.log(result)
+            //console.log("rrr",result)
             var html = '';
             for (var i = 0; i < result.length; i++) {
                 let children = result[i].children;
                 if( children.length >0){
                     // 判断每个省份下选中的城市长度，当大于等于4的时候 弹出"选择全省更划算的弹窗"
+                    let childrenArr=[];
                     if (children.length >= 4) {
                         $('.tips_btn .tips_d_text').show()
                     } 
                     html += `${result[i].name}(`
                     for(var j = 0;j < children.length;j++){
+                        childrenArr.push(children[j].name)
                         if (j != children.length - 1) {
                             html += `${children[j].name}、`
                         } else {
@@ -532,15 +536,17 @@
                     }else{
                         html += `)`
                     }
-                   
+                    saveObj[result[i].name]=childrenArr.toString();//
                 }else{
                     if(i !=result.length -1){
                         html += `${result[i].name}、`
                     }else{
                         html += `${result[i].name}`
                     }
+                    saveObj[result[i].name]="";//
                 }
             }
+            console.log("saveObj--",saveObj)
             $('.result_name').append(html)
             isOpen()
             
@@ -700,6 +706,9 @@
                 let addCity = $('.result_name').text(); //新增的城市
                 let oldCity = decodeURIComponent(getParam('city'));
                 console.log(`新增城市:${addCity} ----- 已购买过的城市:${oldCity}`)
+                
+                localStorage.setItem("vipsubscribeArea",JSON.stringify(saveObj));
+                history.go(-1);
             })
             $('.reset-btn').click(function () {
                 hasBuyCity();

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

@@ -8,10 +8,10 @@
         content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <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"></script>
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css" />
-    <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css">
+    <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/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/trial_info.css?v=111">
 </head>
 
@@ -31,17 +31,17 @@
                 <div class="form_info">
                     <div class="form_top">
                         <div class="form_item form_item_line">
-                            <input type="text" placeholder="输入姓名" value="" class="name" onchange="check_name($(this))">
+                            <input type="text" placeholder="输入姓名" value="" class="name" onchange="check_name($(this),true)">
                         </div>
                         <div class="form_item form_item_line">
-                            <input type="number" placeholder="输入手机号" value="" class="phone" maxlength="11" onchange="check_tel($(this),$('.code_btn'))">
+                            <input type="number" placeholder="输入手机号" value="" class="phone" maxlength="11" onchange="check_tel($(this),$('.code_btn'),true)">
                         </div>
                         <div class="form_item form_item_line">
-                            <input type="number" placeholder="图形验证码" value="" class="code" maxlength="6" onchange="check_code($(this))">
-                            <img src="/subscribepay/public/captcha" class="checkCode">
+                            <input type="number" placeholder="图形验证码" value="" class="code imgcode" maxlength="4" onchange="check_imgcode($(this),$('.code_btn'),true)">
+                            <img src="/subscribepay/trial/captcha" class="checkCode">
                         </div>
                         <div class="form_item">
-                            <input type="number" placeholder="手机验证码" value="" class="code" maxlength="6" onchange="check_code($(this))">
+                            <input type="number" placeholder="手机验证码" value="" class="code phonecode" maxlength="6" onchange="check_phonecode($(this),true)">
                             <button class="code_btn" type="button">获取验证码</button>
                         </div>
                     </div>
@@ -72,17 +72,35 @@
             
         </form>
     </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    <script src="/vipsubscribe/js/fastclick.js"></script>
-    <script src="/vipsubscribe/js/weui.min.js"></script>
-    <script src="/vipsubscribe/js/personal_info.js"></script>
+    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/vipsubscribe/js/personal_info.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
         $(function () {
-            //
+            //实时校验
+            $('.name').bind("input propertychang",function(event){
+              check_name($(this),false);
+            })
+            $('.phone').bind("input propertychang",function(event){
+              check_tel($(this),$('.code_btn'),false);
+            })
+            $('.imgcode').bind("input propertychang",function(event){
+              check_imgcode($(this),$('.code_btn'),false)
+            })
+            $('.phonecode').bind("input propertychang",function(event){
+              check_phonecode($(this),false)
+            })
+            $('.company').bind("input propertychang",function(event){
+              check_company($(this))
+            })
+            
+            //刷新验证码
             $(".checkCode").on("click",function(){
-                console.log("-----")
-                reLoadCaptcha();
+                $(".checkCode").attr("src","/subscribepay/trial/captcha?rnd="+Math.random());
             });
+            
             // textarea自适应高度
             $(".form-item-textarea textarea")[0].style.height = $(".form-item-textarea textarea")[0].scrollHeight + 'px';
             $(".form-item-textarea textarea").on("input", function () {
@@ -94,9 +112,19 @@
                 e.stopPropagation();
                 let phone = $('.phone').val();
                 if(/^1[3456789]\d{9}$/.test(phone)){
-                    count($(this),"获取验证码");
+                  $DoPost("/subscribepay/trial/sendPhoneCaptcha",{"phoneNum":phone,"imgCancode":$.trim($('.code').val())},function(r){
+                    if(r.success){
+                      count($('.code_btn'),"获取验证码");
+                    }else{
+                      weui.toast(r.errMsg,{
+                        duration: 2000,
+                        className: 'custom-toast',
+                      });
+                    }
+                  })
                 }
             })
+            //提交
             $('#formInfo').submit(function(e) {	
                 var name = $('.name').val();
                 var tel = $('.phone').val();
@@ -111,15 +139,19 @@
                     job:job
                 }
                 // ajax提交成功后跳转至vip购买页
-                // $.ajax({
-                        window.location.href = "vip_purchase.html"
-                // });
+                $DoPost("/subscribepay/trial/submitApply",post_data,function(r){
+                  if(r.success){
+                    alert("ok")
+                  }else{
+                    weui.toast(r.errMsg,{
+                      duration: 2000,
+                      className: 'custom-toast',
+                    });
+                  }
+                })
                 return false;	
             });
         });
-        function reLoadCaptcha(){
-            $(".checkCode").attr("src","/jyapp/free/captcha?rnd="+Math.random());
-        }
     </script>
 </body>
 

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

@@ -21,28 +21,28 @@
                     <a href="/front/vipsubscribe/toChooseArea/new">
                         <span class="label">区域</span>
                         <!-- <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info"> -->
-                        <input type="text" disabled value="郑州市" placeholder="1个市" class="info">
+                        <input type="text" disabled value="" placeholder="1个市" class="info choose_area">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <!-- 无选择时不显示 -->
-                    <p class="add_tips">已选择 0 个省级区域、0 个地市</p>
+                    <p class="add_tips area" style="display:none">已选择 0 个省级区域、0 个地市</p>
                 </li>
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseIndustry/new">
                         <span class="label">行业</span>
                         <!-- <input type="text" disabled value="" placeholder="选择采购单位行业" class="info"> -->
-                        <input type="text" disabled value="安监" placeholder="1个行业" class="info">
+                        <input type="text" disabled value="" placeholder="1个行业" class="info choose_industry">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <!-- 无选择时不显示 -->
-                    <p class="add_tips">已选择 0 个行业</p>
+                    <p class="add_tips industry" style="display:none">已选择 0 个行业</p>
                 </li>
                 <li class="choose_item select_cycle">
                     <!-- 需要选择订阅周期就用a标签，div.class="free-7day"隐藏 -->
                     <!-- 需要选择试用就用div标签，a标签隐藏 -->
                     <a href="javascript:;">
                         <span class="label">订阅周期</span>
-                        <input type="text" disabled value="1年" placeholder="1个月" class="info choose_time">
+                        <input type="text" disabled value="" placeholder="1个月" class="info choose_time">
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
                     <!-- <div class="free-7day" style="display: none">
@@ -245,13 +245,54 @@
     <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
-        // 隐藏dialog选择框
-        function hideDialog() {
-            $('#pay_way').hide(200);
-            $('#time_cycle').hide(200);
+    
+      var EntSearch = {
+        cityArr: [],
+        provinceArr:[],
+        industryArr: [],
+        initData: function(){
+          var vipsubscribeArea = {}
+          try{
+            vipsubscribeArea=JSON.parse(localStorage.getItem("vipsubscribeArea"))
+          }catch(e){
+            console.log(e)
+          }
+          for(var i in vipsubscribeArea) {
+            let citys=vipsubscribeArea[i].split(",")
+            if(citys[0]!=""){
+              this.cityArr = this.cityArr.concat(citys);
+            }else{
+              this.provinceArr.push(i)
+            }
+          }
+          console.log(this.provinceArr)
+          console.log(this.cityArr)
+          
+          if(this.provinceArr.length>0||this.cityArr.length>0){
+            var tipTxt="已选择 "
+            if(this.provinceArr.length>0)tipTxt+=this.provinceArr.length+" 个省级区域";
+            if(this.cityArr.length>0){
+              if(this.provinceArr.length>0) tipTxt+="、"
+              tipTxt+=this.cityArr.length+" 个地市";
+            }
+            $(".choose_area").val(this.provinceArr.join(" ")+" "+this.cityArr.join(" "));
+            $(".add_tips.area").text(tipTxt).css("display","");
+          }
+          
+          return
+          if(chooseIndustry){
+            this.industryArr=chooseIndustry.split(",");
+            $(".choose_industry").val(chooseIndustry);
+          }
+          console.log("chooseCity:",this.chooseCity,"  provinceArr:",this.provinceArr,"  chooseIndustry:",this.chooseIndustry)
         }
+      }
+        
+        
+        
+        
         $(function () {
-
+            EntSearch.initData();
             var time_limit;//定义一个周期变量
 
             /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
@@ -434,8 +475,15 @@
                 // alert("支付成功")
                 window.location.href = "/front/vipsubscribe/toPaySuccessPage"
             })
-
+          
         })
+        // 隐藏dialog选择框
+        function hideDialog() {
+            $('#pay_way').hide(200);
+            $('#time_cycle').hide(200);
+        }
+        //获取筛选数据
+        
     </script>
 </body>