Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

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

@@ -23,20 +23,20 @@
             <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期!</p>
             <ul class="chooseList">
                 <li class="choose_item">
-                    <a href="/front/vipsubscribe/toChooseArea/upgrade">
+                    <a href="/front/vipsubscribe/toChooseArea">
                         <span class="label">区域</span>
                         <input type="text" disabled value="" placeholder="选择全国、省份、地市" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
-                    <p class="add_tips">已新增 1 个省级区域、4 个地市</p>
+                    <p class="add_tips area-list">已新增 1 个省级区域、4 个地市</p>
                 </li>
                 <li class="choose_item">
-                    <a href="/front/vipsubscribe/toChooseIndustry/upgrade">
+                    <a href="/front/vipsubscribe/toChooseIndustry">
                         <span class="label">行业</span>
                         <input type="text" disabled value="" placeholder="选择采购单位行业" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
-                    <p class="add_tips">已新增 2 个行业</p>
+                    <p class="add_tips industry-list">已新增 2 个行业</p>
                 </li>
                 <!-- <li class="choose_item select_cycle">
                     <a href="javascript:;">
@@ -57,7 +57,7 @@
                 <div class="select_payment choose_item">
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
-                        <span class="info choose_way">微信支付</span>
+                        <span class="info choose_way" id="payType">微信支付</span>
                         <i class="iconfont icon-arrow choose_way"></i>
                     </a>
                 </div>
@@ -128,8 +128,8 @@
             <div class="price">
                 <label>需补差价：</label>
                 <p>
-                    <span>&yen;610.80</span>
-                    <strong>&yen;0.00</strong>
+                    <span id="oldPrice">&yen;610.80</span>
+                    <strong id="newPrice">&yen;0.00</strong>
                 </p> 
             </div>
             <div class="form-btn">
@@ -289,9 +289,15 @@
         // 对支付方式选择的input绑定点击事件
         $('#pay_way input:radio[name="way"]').click(function () {
             var checkValue = $('input:radio[name="way"]:checked').val();
-            console.log(checkValue);
             $('.pay_way').hide(200);
             $('.pay_mode .select_payment .choose_way.info').html(checkValue);
+            var payType = "";
+            if(checkValue === "微信支付"){
+            	payType = "wx";
+            }else if(checkValue === "支付宝支付"){
+            	payType = "alipy";
+            }
+            sessionStorage.payType = payType
         });
          // 选择生效日期
         $('.choose_effect_date > a').click(function () {
@@ -300,9 +306,15 @@
         // 对生效日期方式选择的input绑定点击事件
         $('#effective_date input:radio[name="date"]').click(function () {
             var checkValue = $('input:radio[name="date"]:checked').val();
-            console.log(checkValue);
             $('#effective_date').hide(200);
             $('#effect_date_name').html(checkValue);
+            var effective = "";
+            if(checkValue === "立即生效，需支付本月费用"){
+            	effective = "now";
+            }else if(checkValue === "9月1日生效"){
+            	effective = "notnow";
+            }
+            sessionStorage.effectiveDate = effective;
         });
         
 
@@ -408,6 +420,79 @@
                 }
             })
         })*/
+        //新增区域
+	    if(sessionStorage.vipSubSelectArea!==""&&sessionStorage.vipSubSelectArea!==undefined){
+			var vipSubSelectArea = JSON.parse(sessionStorage.vipSubSelectArea);
+			var provinceArr = [];
+			var cityArr = [];
+			var isAll = "";
+			for (var province in vipSubSelectArea){
+				provinceArr.push(province);
+				if(vipSubSelectArea[province].length > 0){
+					var citys = vipSubSelectArea[province];
+					for (var i in citys){
+						var city = citys[i];
+						cityArr.push(city);
+					}
+				}
+				if(province === "全国"){
+					isAll = "all";
+				}
+			}
+			var provinceLen = provinceArr.length;
+			var cityLen = cityArr.length;
+			if(isAll === ""){
+				$(".area-list").text("已新增 "+ provinceLen +" 个省级区域、"+ cityLen +" 个地市");
+			}else{
+				$(".area-list").text("已新增为 : 全国");
+			}
+	    }
+	    //新增行业
+	    if(sessionStorage.vipSubSelectIndustry!==""&&sessionStorage.vipSubSelectIndustry!==undefined){
+	    	var vipSubSelectIndustry = JSON.parse(sessionStorage.vipSubSelectIndustry);
+	    	industryArr = [];
+	    	var isAll = "";
+	    	for(var i in vipSubSelectIndustry){
+	    		var industry = vipSubSelectIndustry[i];
+	    		industryArr.push(industry);
+	    		if(industry === "全部行业"){
+	    			isAll = "all";
+	    		}
+	    	}
+	    	var industryLen = industryArr.length
+	    	if(isAll === ""){
+				$(".industry-list").text("已新增 "+ industryLen +" 个行业");
+			}else{
+				$(".industry-list").text("已新增为 : 全部行业");
+			}
+	    }
+	    //生效时间
+	    if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
+	    	var effective = sessionStorage.effectiveDate;
+	    	var effectiveHtml = "";
+	    	if(effective === "now"){
+	    		effectiveHtml = "立即生效，需支付本月费用";
+	    	}else if(effective === "notnow"){
+	    		effectiveHtml = "9月1日生效";
+	    	}
+	    	$('#effective_date input:radio[name="date"]').val(effectiveHtml);
+	    	$('#effective_date input:radio[name="date"]').prop("checked", true);
+	    	$("#effect_date_name").text(effectiveHtml);
+	    }
+	    //支付方式
+	    if(sessionStorage.payType!==""&&sessionStorage.payType!==undefined){
+	    	var payType = sessionStorage.payType;
+	    	var payHtml = "";
+	    	if(payType === "wx"){
+	    		payHtml = "微信支付";
+	    	}else if(payType === "alipy"){
+	    		payHtml = "支付宝支付";
+	    	}
+	    	$('input:radio[name="way"]').val(payHtml);
+	    	$('input:radio[name="way"]').prop("checked", true);
+	    	$("#payType").text(payHtml);
+	    }
+	    
     </script>
 </body>