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

@@ -47,18 +47,18 @@
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseAreaUpgrade">
                         <span class="label">区域</span>
-                        <input type="text" id="area" value="" disabled placeholder="选择全国、省份、地市" class="info">
+                        <input type="text" id="area" value="" disabled placeholder="选择升级区域" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
-                    <p class="add_tips area-list" style="display: none;">已新增 1 个省级区域、4 个地市</p>
+                    <!--<p class="add_tips area-list" style="display: none;">已新增 1 个省级区域、4 个地市</p>-->
                 </li>
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseIndustryUpgrade">
                         <span class="label">行业</span>
-                        <input type="text" id="buyerclass" disabled value="" placeholder="选择采购单位行业" class="info">
+                        <input type="text" id="buyerclass" disabled value="" placeholder="选择升级行业" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
-                    <p class="add_tips industry-list" style="display: none;">已新增 2 个行业</p>
+                    <!--<p class="add_tips industry-list" style="display: none;">已新增 2 个行业</p>-->
                 </li>
                 <!-- <li class="choose_item select_cycle">
                     <a href="javascript:;">
@@ -785,13 +785,17 @@
 			}
 			var provinceLen = provinceArr.length;
 			var cityLen = cityArr.length;
+			var areaHtml = "";
 			if(isAll === ""){
-				$(".area-list").text("已新增 "+ provinceLen +" 个省级区域、"+ cityLen +" 个地市");
+				areaHtml = "已新增 "+ provinceLen +" 个省级区域、"+ cityLen +" 个地市";
+				$("#area").attr("placeholder", areaHtml);
 			}else{
-				$(".area-list").text("已新增为 : 全国");
+				areaHtml = "已新增全国";
+				$("#area").attr("placeholder", areaHtml);
 			}
 			if(provinceLen === 0 && cityLen === 0){
-				$(".area-list").hide();
+				areaHtml = "选择升级区域";
+				$("#area").attr("placeholder", areaHtml);
 			}
 	    }
 	    //新增行业
@@ -799,7 +803,8 @@
 	    	var vipSubSelectIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
 	    	var industryArr = [];
 	    	var isAll = "";
-	    	$(".industry-list").show();
+	    	var industryHtml = "";
+//	    	$(".industry-list").show();
 	    	for(var i in vipSubSelectIndustry){
 	    		var industry = vipSubSelectIndustry[i];
 	    		industryArr.push(industry);
@@ -809,12 +814,15 @@
 	    	}
 	    	var industryLen = industryArr.length
 	    	if(isAll === ""){
-				$(".industry-list").text("已新增 "+ industryLen +" 个行业");
+	    		industryHtml = "已新增 "+ industryLen +" 个行业";
+				$("#buyerclass").attr("placeholder", industryHtml);
 			}else{
-				$(".industry-list").text("已新增为 : 全部行业");
+				industryHtml = "已新增全行业";
+				$("#buyerclass").attr("placeholder", industryHtml);
 			}
 			if(industryLen === 0){
-				$(".industry-list").hide();
+				industryHtml = "选择升级行业";
+				$("#buyerclass").attr("placeholder", industryHtml);
 			}
 	    }
 	    //生效时间
@@ -905,50 +913,50 @@
 			    ends = data.endtime;
 //			    isvalidOk = data.isvalidOk;
 			    //
-			    var provinceArr = [];
-			    var cityArr = [];
-			    var areaHtml = "";
-			    var buyerclassArr = [];
-			    var buyerclassHtml = "";
+//			    var provinceArr = [];
+//			    var cityArr = [];
+//			    var areaHtml = "";
+//			    var buyerclassArr = [];
+//			    var buyerclassHtml = "";
 		//	    var dateName = "";
 		//	    var dateHtml = "";
-			    if (area !== "" && area !== undefined){
-			    	for(var province in area){
-			    		var citys = area[province]
-		//	    		console.log(citys);
-			    		if(citys.length===0){
-			    			provinceArr.push(province);
-			    		}else{
-			    			for(var i in citys){
-			    				cityArr.push(citys[i]);
-			    			}
-			    		}
-			    	}
-			    	var provinceLen = provinceArr.length;
-			 		var cityLen = cityArr.length;
-			    	areaHtml = "已购买"+provinceLen+"个省级区域/"+cityLen+"个市";
-		//	    	$(".item_area .label_for").text(areaHtml);
-					if(checkObj(area)){
-						areaHtml = "已购买全国";
-					}
-			    	$('#area').attr("placeholder",areaHtml);
-			    }
-			    if(buyerclass !== "" && buyerclass !== undefined){
-			    	for(var i in buyerclass){
-			    		var industry = buyerclass[i];
-			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = "已购买"+buyerclassArr.length+"个行业";
-			    	}
-		//	    	$(".item_industry .label_for").text(buyerclassHtml);
-					if(checkObj(buyerclass)){
-						buyerclassHtml = "已购买全行业";
-					}
-					$('#buyerclass').attr("placeholder",buyerclassHtml);
-			    }
-			    //
-			    var nowDate = data.now.replace(/-/g, ".");
-			    var a = nowDate+ " - " +endTime;
-			    $(".nownow").text(nowDate+ " - " +endTime.replace(/-/g, "."))
+//			    if (area !== "" && area !== undefined){
+//			    	for(var province in area){
+//			    		var citys = area[province]
+//		//	    		console.log(citys);
+//			    		if(citys.length===0){
+//			    			provinceArr.push(province);
+//			    		}else{
+//			    			for(var i in citys){
+//			    				cityArr.push(citys[i]);
+//			    			}
+//			    		}
+//			    	}
+//			    	var provinceLen = provinceArr.length;
+//			 		var cityLen = cityArr.length;
+//			    	areaHtml = "已购买"+provinceLen+"个省级区域/"+cityLen+"个市";
+//		//	    	$(".item_area .label_for").text(areaHtml);
+//					if(checkObj(area)){
+//						areaHtml = "已购买全国";
+//					}
+//			    	$('#area').attr("placeholder",areaHtml);
+//			    }
+//			    if(buyerclass !== "" && buyerclass !== undefined){
+//			    	for(var i in buyerclass){
+//			    		var industry = buyerclass[i];
+//			    		buyerclassArr.push(industry);
+//			    		buyerclassHtml = "已购买"+buyerclassArr.length+"个行业";
+//			    	}
+//		//	    	$(".item_industry .label_for").text(buyerclassHtml);
+//					if(checkObj(buyerclass)){
+//						buyerclassHtml = "已购买全行业";
+//					}
+//					$('#buyerclass').attr("placeholder",buyerclassHtml);
+//			    }
+//			    //
+//			    var nowDate = data.now.replace(/-/g, ".");
+//			    var a = nowDate+ " - " +endTime;
+//			    $(".nownow").text(nowDate+ " - " +endTime.replace(/-/g, "."))
 			    //
 //			    if(!isvalidOk){
 //			    	var effectiveName = new Date().getMonth()+2;
@@ -1130,12 +1138,12 @@
 			nowRenew = nowUpgrade;
 			console.log("monthold",nowUpgrade)
 			//
-			if(effect === "notnow"){
-				nowUpgrade = nowUpgrade -1;
-			}
-			if(nowUpgrade == 0){
-				nowUpgrade = 1;
-			}
+//			if(effect === "notnow"){
+//				nowUpgrade = nowUpgrade -1;
+//			}
+//			if(nowUpgrade == 0){
+//				nowUpgrade = 1;
+//			}
 			
 			//
 			var nowUpgradeYear = 0;