区域行业

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

@@ -362,7 +362,7 @@
         </div>
         <div class="tips_btn">
             <div class="tips_discount">
-                <div class="tips_d_money" style="display: block">&yen;38</div>
+                <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
                 <div class="tips_d_text citys">已选择4个市，建议购买“全省”更划算哦~</div>
                 <div class="tips_d_text all">已选择10个省，建议购买“全国”更划算哦~</div>
             </div>
@@ -558,6 +558,10 @@
                       children:cityArr
                   })
               }
+              if(activeLeng > 0){
+              	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+              	$(".tips_btn .btns .save-btn").removeAttr("disabled");
+              }
           })
           //数组对象去重
           let obj = {};
@@ -646,16 +650,18 @@
           })
           // 如果循环结束仍为true说明 没有全部都被选中
           if (_f) {
-              $('.other').prop('checked', true);
+//            $('.other').prop('checked', true);
+				$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+        		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
           }
         },
         getNationwide:function(){/*默认选中全国 */
-          $('.other').prop('checked', true);
-          $('.tab_content').slideUp(500)
-          $('.tab span i').css({
-              "display":"inline-block",
-              "transform":"rotate(0)"
-          });
+//        $('.other').prop('checked', true);
+//        $('.tab_content').slideUp(500)
+//        $('.tab span i').css({
+//            "display":"inline-block",
+//            "transform":"rotate(0)"
+//        });
         },
         isOpen:function(){
           let pHeight = $('.result_text').height()
@@ -780,6 +786,7 @@
                 $(".other").trigger("click");
               }
             })
+            //
         },
         reset:function(){
            var checked = $(".other").is(':checked');
@@ -840,6 +847,15 @@
 		    return false;
 		}
 	    //
+	    if($(".result_name").text()===""){
+	    	$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+        	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+	    }
+	    
+	    if(sessionStorage.vipSubSelectArea!==undefined && sessionStorage.vipSubSelectArea!==""){
+	    	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+            $(".tips_btn .btns .save-btn").removeAttr("disabled");
+	    }
 
     </script>
 </body>

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

@@ -34,7 +34,7 @@
                         <li class="list_item" id="all">
                             <div class="item_label"></div>
                             <div class="item_industry_list">
-                                <button class="industry_item active">全部行业</button>
+                                <button class="industry_item">全部行业</button>
                             </div>
                         </li>
                         <li class="list_item" id="A">
@@ -241,7 +241,7 @@
             </div>
             <div class="tips_btn">
                 <div class="tips_discount">
-                    <div class="tips_d_money" style="display: block">&yen;38</div>
+                    <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
                     <div class="tips_d_text">已选择4个行业，建议购买“全部行业”更划算哦~</div>
                 </div>
                 <div class="btns">
@@ -251,7 +251,7 @@
             </div>
         </main>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+        <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
         <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script>
@@ -303,9 +303,11 @@
                 $('.result .result_name').text(selectedStr)
 
                 if (selectedArr.length === 0) {
-                    var allButton = $('#all button')
-                    allButton.trigger('click')
-                    $('.result .result_name').text(allButton.text())
+//                  var allButton = $('#all button')
+//                  allButton.trigger('click')
+//                  $('.result .result_name').text(allButton.text())
+					$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+					$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
                 }
                 if (selectedArr.length === buttons.length - 1) {
                     // 除全部行业外所有按钮都被选中了
@@ -320,7 +322,9 @@
                 $($('.industry_item')).each(function (index, dom) {
                 	if(canclick){
                 		if (v!="全部行业"){
-	                      $('#all').children().children('button').removeClass('active');
+	                      	$('#all').children().children('button').removeClass('active');
+	                      	$(".tips_btn .btns .save-btn").removeAttr("disabled","disabled");
+							$(".tips_btn .btns .reset-btn").removeAttr("disabled","disabled");
 	                    }
                 		if (v == $(dom).text()) {
 	                       $(dom).addClass("active").attr({"disabled":!canclick})

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

@@ -55,7 +55,7 @@
             </div>
 		</div>
 		<script src="/vipsubscribe/js/jquery-2.1.4.js"></script>
-    	<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+    	<!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     	<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     	<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script type="text/javascript">
@@ -85,10 +85,10 @@
 			    			}
 			    		}
 			    	}
+			    	areaHtml = areaArr.toString().replace(/,/g, "、");
 			    	if(checkObj(area)){
 						areaHtml = "全国";
 					}
-			    	areaHtml = areaArr.toString().replace(/,/g, "、");
 			    	$('.area-list').text(areaHtml);
 			    }
 			    if(buyerclass !== "" && buyerclass !== undefined){

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

@@ -69,7 +69,7 @@
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
                         <span class="info choose_way">微信支付</span>
-                        <i class="iconfont icon-arrow choose_way"></i>
+                        <!--<i class="iconfont icon-arrow choose_way"></i>-->
                     </a>
                 </div>
             </div>

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

@@ -75,7 +75,7 @@
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
                         <span class="info choose_way">微信支付</span>
-                        <i class="iconfont icon-arrow choose_way"></i>
+                        <!--<i class="iconfont icon-arrow choose_way"></i>-->
                     </a>
                 </div>
                 <div class="vip_rules">
@@ -743,20 +743,6 @@
 //	    	$("#payType").text(payHtml);
 //	    }
 
-//	    if(cycleunit !== "" && cycleunit !== undefined){
-//	    	if(cycleunit === 1){
-//	    		dateName = cyclecount + " 年";
-//	    	}else if(cycleunit === 2){
-//	    		dateName = cyclecount + " 个月";
-//	    	}
-//	    	$(".item_cycle .label_for").text(dateName);
-//	    }
-//	    if(startTime !== "" && endTime !== ""){
-//	    	var start = startTime.replace(/-/g, ".");
-//	    	var end = endTime.replace(/-/g, ".");
-//	    	dateHtml = start + " - " + end;
-//	    	$(".item_validity .label_for").text(dateHtml);
-//	    }
 		if(sessionStorage.upgrade_cyclecount!==undefined&&sessionStorage.upgrade_cycleunit!==undefined){
 	 		var cycleunit = sessionStorage.upgrade_cycleunit;
 	 		var cyclecount = sessionStorage.upgrade_cyclecount;
@@ -786,12 +772,7 @@
 	 		$('.choose_item.lengthen .info').text("不延长");
 	 		$(".computed_price").hide();
 	 	}
-	 	if(sessionStorage.upgrade_price!==""&&sessionStorage.upgrade_price!==undefined){
-	 		$(".computed_price").html(sessionStorage.upgrade_price);
-	 	}
-	 	if(sessionStorage.upgrade_finally_price!==""&&sessionStorage.upgrade_finally_price!==undefined){
-	    	$(".finally_price").html(sessionStorage.renew_finally_price);
-	 	}
+	 	
 //	 	if(sessionStorage.vipSubSelectArea!==""&&sessionStorage.vipSubSelectArea!==undefined&&)
 	 	
 	 	//
@@ -949,6 +930,16 @@
 			    	}
 			    }
 			}
+			
+			for (var x = 0; x < industrysArr.length; x++) {
+	            for (var j =x+1; j <industrysArr.length; ) {
+	                if (industrysArr[x] === industrysArr[j]){
+	                    industrysArr.splice(j, 1);
+	                }
+	                else j++;
+	            }
+	       	}
+			
 			console.log("industrysArr",industrysArr);
 			if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
 				let eff = sessionStorage.effectiveDate;
@@ -1001,9 +992,16 @@
 			if(nowUpgrade == 0){
 				nowUpgrade = 1;
 			}
+			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
+				if(sessionStorage.upgrade_cycleunit === "1"){
+					nowUpgrade = nowUpgrade + 12*Number(sessionStorage.upgrade_cyclecount);
+				}else if(sessionStorage.upgrade_cycleunit === "2"){
+					nowUpgrade = nowUpgrade + Number(sessionStorage.upgrade_cyclecount);
+				}
+			}
 			//
 			var nowUpgradeYear = 0;
-			if(nowUpgrade >= 12){
+			if(nowUpgrade >= 12 && nowUpgrade < 24){
 				nowUpgradeYear = Math.floor(nowUpgrade / 12);
 				nowUpgrade = nowUpgrade - 12;
 			}else if(nowUpgrade >= 24){
@@ -1064,6 +1062,17 @@
 			}
 			console.log("completeMonth",completeMonth)
 			console.log("completeYear",completeYear)
+			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
+				if(sessionStorage.upgrade_cycleunit === "1"){
+					let price = (Number(sessionStorage.upgrade_cyclecount)*completeYear).toFixed(1);
+					sessionStorage.upgrade_price = "￥"+price;
+					sessionStorage.proPrice = price;
+				}else if(sessionStorage.upgrade_cycleunit === "2"){
+					let price = (Number(sessionStorage.upgrade_cyclecount)*completeMonth).toFixed(1);
+					sessionStorage.upgrade_price = "￥"+price;
+					sessionStorage.proPrice = price;
+				}
+			}
 			var cPrice = 0;
   			if(price>0){
   				var cPrice = (price - oldPrice).toFixed(1);
@@ -1074,12 +1083,22 @@
 				console.log("proprice",proPrice);
 				cPrice = (Number(cPrice) + Number(proPrice)).toFixed(1);
 			}
+			if(cPrice < 0){
+				cPrice = 0;
+			}
 			$(".finally_price").html("￥"+cPrice);
 			if (cPrice>0){
 				$(".save_upgrade").removeAttr('disabled');
 			}
         }
         FinallyPrice();
+        //
+        if(sessionStorage.upgrade_price!==""&&sessionStorage.upgrade_price!==undefined){
+	 		$(".computed_price").html(sessionStorage.upgrade_price);
+	 	}
+	 	if(sessionStorage.upgrade_finally_price!==""&&sessionStorage.upgrade_finally_price!==undefined){
+	    	$(".finally_price").html(sessionStorage.renew_finally_price);
+	 	}
         
         //
         $(".save_upgrade").on("click", function(){