فهرست منبع

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

wangkaiyue 5 سال پیش
والد
کامیت
cdb7ab4e9d

+ 2 - 2
src/jfw/front/swordfish.go

@@ -906,8 +906,8 @@ func (m *Front) WxsearchlistPaging() {
 				}
 			}
 			arrs = append(arrs, searchvalue)
-			if len(arrs) > 5 {
-				arrs = arrs[1:6]
+			if len(arrs) > 10 {
+				arrs = arrs[1:11]
 			}
 			redis.Del("other", "s_"+userid.(string))
 			redis.Put("other", "s_"+userid.(string), strings.Join(arrs, ","), -1)

+ 47 - 47
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -133,12 +133,12 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		flag = JyVipSubStruct.RenewSubVip(userid, qutil.ObjToString((*orderdata)["vip_endtime"]))
 	} else if vmsg.OrderType == 3 { //立即升级
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), true, "no")
-	} else if vmsg.OrderType == 4 { //下月升级
-		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "no")
+		//	} else if vmsg.OrderType == 4 { //下月升级
+		//		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "no")
 	} else if vmsg.OrderType == 5 {
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "exprie")
-	} else if vmsg.OrderType == 6 { //下月升级未生效再次升级
-		flag = JyVipSubStruct.UpgradeSubVipTwo(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
+		//	} else if vmsg.OrderType == 6 { //下月升级未生效再次升级
+		//		flag = JyVipSubStruct.UpgradeSubVipTwo(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
 	}
 	//支付成功后 其他未支付vip订阅订单 变为已取消
 	if flag {
@@ -216,12 +216,12 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 			log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 			return false
 		}
-		var effectTime time.Time
-		if isExprie != "no" {
-			effectTime = startTime
-		} else {
-			effectTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
-		}
+		//		var effectTime time.Time
+		//		if isExprie != "no" {
+		effectTime := startTime
+		//		} else {
+		//			effectTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
+		//		}
 
 		return util.MQFW.Save("vip_upgrade",
 			bson.M{
@@ -238,43 +238,43 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 }
 
 //升级未生效再次升级
-func (this *vipSubscribeStruct) UpgradeSubVipTwo(userId string, vmsg VipSimpleMsg, end string, isNow bool) bool {
-	endTime, err := time.ParseInLocation(qutil.Date_Full_Layout, end, time.Local)
-	if err != nil {
-		log.Println("%s格式化日期出错%s\n", userId, endTime)
-		return false
-	}
-	buyset := JyVipSubStruct.NewBuySet(vmsg.Area, vmsg.Industry)
-
-	if !util.MQFW.UpdateById("user", userId,
-		bson.M{"$set": bson.M{
-			"l_vip_endtime":    endTime.Unix(),
-			"i_vip_expire_tip": 0,
-		}}) {
-		log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
-		return false
-	}
-
-	if util.MQFW.Update("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0},
-		bson.M{"$set": bson.M{
-			"i_isvalid": 1,
-		}}, false, false,
-	) {
-		effectTime := time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
-		return util.MQFW.Save("vip_upgrade",
-			bson.M{
-				"s_userid":     userId,            //试用设置地区
-				"a_buyerclass": vmsg.Industry,     //试用设置行业
-				"o_area":       vmsg.Area,         //购买内容 城市、省份、行业数量
-				"l_validtime":  effectTime.Unix(), //生效时间
-				"l_createtime": time.Now().Unix(), //入库时间
-				"o_buyset":     buyset,            //购买内容数量
-				"i_isvalid":    0,                 //是否已经生效 0-未生效
-			}) != ""
-	} else {
-		return false
-	}
-}
+//func (this *vipSubscribeStruct) UpgradeSubVipTwo(userId string, vmsg VipSimpleMsg, end string, isNow bool) bool {
+//	endTime, err := time.ParseInLocation(qutil.Date_Full_Layout, end, time.Local)
+//	if err != nil {
+//		log.Println("%s格式化日期出错%s\n", userId, endTime)
+//		return false
+//	}
+//	buyset := JyVipSubStruct.NewBuySet(vmsg.Area, vmsg.Industry)
+
+//	if !util.MQFW.UpdateById("user", userId,
+//		bson.M{"$set": bson.M{
+//			"l_vip_endtime":    endTime.Unix(),
+//			"i_vip_expire_tip": 0,
+//		}}) {
+//		log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
+//		return false
+//	}
+
+//	if util.MQFW.Update("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0},
+//		bson.M{"$set": bson.M{
+//			"i_isvalid": 1,
+//		}}, false, false,
+//	) {
+//		effectTime := time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
+//		return util.MQFW.Save("vip_upgrade",
+//			bson.M{
+//				"s_userid":     userId,            //试用设置地区
+//				"a_buyerclass": vmsg.Industry,     //试用设置行业
+//				"o_area":       vmsg.Area,         //购买内容 城市、省份、行业数量
+//				"l_validtime":  effectTime.Unix(), //生效时间
+//				"l_createtime": time.Now().Unix(), //入库时间
+//				"o_buyset":     buyset,            //购买内容数量
+//				"i_isvalid":    0,                 //是否已经生效 0-未生效
+//			}) != ""
+//	} else {
+//		return false
+//	}
+//}
 
 //根据行业和地区 返回*SubvipBuySet
 func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry []string) *SubvipBuySet {

+ 1 - 1
src/web/staticres/css/wxsearch.css

@@ -1826,7 +1826,7 @@ body{
 .resbm{
 	display: table;
 	position: fixed;
-	z-index: 2000;
+	z-index: 9999;
 	bottom: 0px;
 	width: 100%;
 	height: 50px;

+ 26 - 26
src/web/staticres/js/wxSupersearch.js

@@ -231,7 +231,7 @@ var SuperSearch = {
 					success:function(rt){
 						$("#supersearchPage .inputDiv .history").find("li").remove();
 						$("#supersearchPage .inputDiv .inpTitle_history").addClass("hidden");
-						$("#supersearchPage .inputDiv .inpTitle_msgset").css("border-top-right-radius","5px").css("border-top-left-radius","5px");
+						//$("#supersearchPage .inputDiv .inpTitle_msgset").css("border-top-right-radius","5px").css("border-top-left-radius","5px");
 					}
 				});
 			}
@@ -1307,37 +1307,37 @@ var SuperSearch = {
 			$("#supersearchPage .inputDiv .inpTitle_history").removeClass("hidden");
 		}
 		//订阅信息
-		msgsetHtml="";
-		if(msgset != null){
-			for(var n=0;n<msgset.length;n++){
-				var  mymsgset="";
-				for(var m=0;m<msgset[n].length;m++){
-					mymsgset+=msgset[n][m]+" "
-				}
-				var mt = $.trim(mymsgset);
-				if(mt == ""){
-					continue
-				}
-				msgsetHtml+="<li>"+mt+"</li>";
-			}
-		}
-		$("#supersearchPage .inputDiv .myMsgset").html(msgsetHtml);
-		if(msgsetHtml == ""){
-			$("#supersearchPage .inputDiv .inpTitle_msgset").addClass("hidden");
-		}else{
-			$("#supersearchPage .inputDiv .inpTitle_msgset").removeClass("hidden");
-		}
+//		msgsetHtml="";
+//		if(msgset != null){
+//			for(var n=0;n<msgset.length;n++){
+//				var  mymsgset="";
+//				for(var m=0;m<msgset[n].length;m++){
+//					mymsgset+=msgset[n][m]+" "
+//				}
+//				var mt = $.trim(mymsgset);
+//				if(mt == ""){
+//					continue
+//				}
+//				msgsetHtml+="<li>"+mt+"</li>";
+//			}
+//		}
+//		$("#supersearchPage .inputDiv .myMsgset").html(msgsetHtml);
+//		if(msgsetHtml == ""){
+//			$("#supersearchPage .inputDiv .inpTitle_msgset").addClass("hidden");
+//		}else{
+//			$("#supersearchPage .inputDiv .inpTitle_msgset").removeClass("hidden");
+//		}
 		//样式控制
 		if(historyHtml != ""){
 			$("#supersearchPage .inputDiv .inpTitle_history").css({"border-top-right-radius":"5px","border-top-left-radius":"5px"});
-		}else if(historyHtml == "" && msgsetHtml != ""){
-			$("#supersearchPage .inputDiv .inpTitle_msgset").css({"border-top-right-radius":"5px","border-top-left-radius":"5px"});
+//		}else if(historyHtml == "" && msgsetHtml != ""){
+//			$("#supersearchPage .inputDiv .inpTitle_msgset").css({"border-top-right-radius":"5px","border-top-left-radius":"5px"});
 		}
 		//
-		if(historyHtml == "" && msgsetHtml == ""){
+		if(historyHtml == ""){
 			$("#supersearchPage .inputDiv").css("border-top-width","0px");
-		}else{
-			$("#supersearchPage .inputDiv").css("border-top-width","1px");
+//		}else{
+//			$("#supersearchPage .inputDiv").css("border-top-width","1px");
 		}
 		//		
 		var len=$("#supersearchPage .inputDiv ul li").length;

+ 3 - 3
src/web/templates/weixin/search/mainSearch.html

@@ -9,7 +9,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}1" rel="stylesheet" type="text/css" >
+<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}11" rel="stylesheet" type="text/css" >
 <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -322,10 +322,10 @@
 					<ul class="history"></ul>
 				</div>
 				<div style="clear: both"></div>
-				<div class="inpTitle_msgset"><img src="{{Msg "seo" "cdn"}}/images/search/msgset.png"><span>我订阅的关键词</span></div>
+<!--				<div class="inpTitle_msgset"><img src="{{Msg "seo" "cdn"}}/images/search/msgset.png"><span>我订阅的关键词</span></div>
 				<div>
 					<ul class="myMsgset"></ul>
-				</div>
+				</div>-->
 			</div>
 			<span class="screen text-center">筛选</span>
 			<span class="query hidden"><img src="{{Msg "seo" "cdn"}}/images/wx/jywxjs.png"></span>

+ 4 - 4
src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -365,8 +365,8 @@
         <div class="tips_btn">
             <div class="tips_discount">
                 <!--<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 class="tips_d_text citys">已选择4个市,建议购买“全省”</div>
+                <div class="tips_d_text all">已选择10个省,建议购买“全国”</div>
             </div>
             <div class="btns">
                 <button class="reset-btn">重置</button>
@@ -591,7 +591,7 @@
                   // 判断每个省份下选中的城市长度,当大于等于4的时候 弹出"选择全省更划算的弹窗"
                   let childrenArr=[];
                   if (children.length >= 4 && !this.vipSubisTrial) {
-                      $('.tips_btn .tips_d_text.citys').text("已选择"+children.length+"个市,建议购买“全省”更划算哦~");
+                      $('.tips_btn .tips_d_text.citys').text("已选择"+children.length+"个市,建议购买“全省”");
                       $('.tips_btn .tips_d_text.citys').show();
                   } 
                   html += `${result[i].name}(`
@@ -627,7 +627,7 @@
 	            }
 	        }
           	if(provincesArr.length > 9){
-          		$('.tips_d_text.all').text("已选择"+provincesArr.length+"个省,建议购买“全国”更划算哦~");
+          		$('.tips_d_text.all').text("已选择"+provincesArr.length+"个省,建议购买“全国”");
           		$('.tips_d_text.all').show();
           		$('.tips_d_text.citys').hide();
           	}else{

+ 2 - 2
src/web/templates/weixin/vipsubscribe/choose_industry_upgrade.html

@@ -243,7 +243,7 @@
             <div class="tips_btn">
                 <div class="tips_discount">
                     <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
-                    <div class="tips_d_text">已选择4个行业,建议购买“全部行业”更划算哦~</div>
+                    <div class="tips_d_text">已选择4个行业,建议购买“全部行业”~</div>
                 </div>
                 <div class="btns">
                     <button class="reset-btn">重置</button>
@@ -292,7 +292,7 @@
                 
                 // 显示隐藏优惠tips
                 if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业,建议购买“全部行业”更划算哦~");
+                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业,建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

+ 13 - 3
src/web/templates/weixin/vipsubscribe/renew_notice.html

@@ -17,6 +17,13 @@
 		body,html {
 			height: 100%;
 		}
+		.aginBuy{
+			height: 0.94rem;
+		    font-size: .34rem;
+		    color: #fff;
+		    background-color: #2cb7ca;
+		    border-radius: .08rem;
+		}
 	</style>
 	<body>
 		<script type="text/javascript">
@@ -53,6 +60,7 @@
             </div>
 			<div class="renew_box">
                 <button style="display: none;" class="renew_service" onclick="window.location.href='/weixin/pay/renewPayPage'">续费</button>
+                <button style="display: none;" class="aginBuy" onclick="window.location.href='/weixin/pay/vipsubscribe_willExpire'">再次购买</button>
                 <button style="display: none;" class="free_service" onclick="window.location.href='/swordfish/historypush'">使用免费订阅</button>
             </div>
 		</div>
@@ -129,8 +137,9 @@
 						    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止,为了不影响您的使用,请立即续费!")
 					    	}
 					    }else{
-					    	$(".renew_service").show();
-					    	$(".free_service").show();
+//					    	$(".renew_service").show();
+					    	$(".aginBuy").show();
+					  	  	$(".free_service").show();
 					    }
 					}
 				});
@@ -198,7 +207,8 @@
 					    	$("#exprie").text("VIP订阅服务即将到期,请及时续费")
 					    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止,为了不影响您的使用,请立即续费!")
 					    }else{
-					    	$(".renew_service").show();
+//					    	$(".renew_service").show();
+							$(".aginBuy").show();
 					    	$(".free_service").show();
 					    }
 					}

+ 4 - 8
src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -596,7 +596,6 @@
 			    monthPrice = getsubVipOrderPrice(area, buyerclass, [1, 2]);
 			    yearPrice = getsubVipOrderPrice(area, buyerclass, [1, 1]);
 			    //
-			    var areaArr = [];
 			    var areaHtml = "";
 			    var provinceArr = [];
 			    var cityArr = [];
@@ -609,17 +608,17 @@
 			    		var citys = area[province]
 		//	    		console.log(citys);
 			    		if(citys.length===0){
-			    			areaArr.push(province);
 			    			provinceArr.push(province);
 			    		}else{
 			    			for(var i in citys){
 			    				var city = citys[i];
-			    				areaArr.push(city);
 			    				cityArr.push(city);
 			    			}
 			    		}
 			    	}
-			    	areaHtml = areaArr.toString().replace(/,/g, "、");
+			    	var provinceLen = provinceArr.length;
+			 		var cityLen = cityArr.length;
+			    	areaHtml = provinceLen+"个省级区域/"+cityLen+"个市";
 			    	
 					if(checkObj(area)){
 						areaHtml = "全国";
@@ -630,7 +629,7 @@
 			    	for(var i in buyerclass){
 			    		var industry = buyerclass[i];
 			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = buyerclassArr.toString().replace(/,/g, "、");
+			    		buyerclassHtml = buyerclassArr.length+"个行业";
 			    	}
 			    	if(checkObj(buyerclass)){
 			    		buyerclassHtml = "全行业";
@@ -698,9 +697,6 @@
 			 		$(".renew_update").hide();
 			 		$(".renew_upgrade").show();
 			 	}
-			 	//
-			 	var provinceLen = provinceArr.length;
-			 	var cityLen = cityArr.length;
 		    }
         }, false);
         //

+ 124 - 122
src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -67,13 +67,13 @@
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
                 </li> -->
-                <li class="choose_item choose_effect_date">
+                <!--<li class="choose_item choose_effect_date">
                     <a href="javascript:;">
                         <span class="label">生效日期</span>
                         <span class="info" id="effect_date_name">立即生效,需支付当月费用差价</span>
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
-                </li>
+                </li>-->
             </ul>
             <ul class="chooseList">
                 <li class="choose_item lengthen">
@@ -131,8 +131,7 @@
                         </table>
                         <dl class="tips">
                             <dt>购买须知:</dt>
-                            <dd>套餐周期内,不支持套餐降级,续费可降级;</dd>
-                            <dd>用户最多购买/续费3年套餐;</dd>
+                            <dd>套餐周期内,不支持套餐降级,即将到期时续费可降级;</dd>
                             <dd>支持套餐升级,补差价(按月进行补差价,不足一个月按一个月计算)。</dd>
                         </dl>
                     </div>
@@ -240,7 +239,7 @@
             </div>
         </div>
         <!-- 选择生效日期 -->
-        <div class="js_dialog effective_date" id="effective_date" style="display: none;">
+        <!--<div class="js_dialog effective_date" id="effective_date" style="display: none;">
             <div class="weui-mask"></div>
             <div class="box">
                 <div class="box_hd">
@@ -273,7 +272,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>-->
         <!-- 选择支付方式 -->
         <div class="js_dialog pay_way" id="pay_way" style="display: none;">
             <div class="weui-mask"></div>
@@ -443,62 +442,62 @@
 //          $('.pay_mode .select_payment .choose_way.info').html(checkValue);
 //      });
          // 选择生效日期
-        $('.choose_effect_date > a').click(function () {
-            $('#effective_date').show(200);
-			var nowMonths = new Date().getMonth()+1;
-			var nowYears = new Date().getFullYear();
-			var as = nowMonths +1;
-			if(as > 12){
-				as = as-12;
-				nowYears = nowYears +1;
-			}
-			var bs = nowYears+"/"+as+"/1";
-			var effects = new Date(bs).getTime() /1000;
-			var a = nowYears+"."+as+".01";
-			$(".notnownow").text(a + " - " + endTime.replace(/-/g, "."))
-			if(ends < effects){
-				$(".effect_next").hide();
-//				$(".box").css("height", "2.7rem");
-			}
-			if(!isvalidOk){
-				console.log(isvalidOk)
-				$(".effect_one").hide();
-				$(".effective_name").each(function(){
-		    		if($(this).text() === effectiveNames){
-		    			$(this).parent().next().find("input").prop("checked", true);
-		    		}
-		    	})
-			}
-        })
+//      $('.choose_effect_date > a').click(function () {
+//          $('#effective_date').show(200);
+//			var nowMonths = new Date().getMonth()+1;
+//			var nowYears = new Date().getFullYear();
+//			var as = nowMonths +1;
+//			if(as > 12){
+//				as = as-12;
+//				nowYears = nowYears +1;
+//			}
+//			var bs = nowYears+"/"+as+"/1";
+//			var effects = new Date(bs).getTime() /1000;
+//			var a = nowYears+"."+as+".01";
+//			$(".notnownow").text(a + " - " + endTime.replace(/-/g, "."))
+//			if(ends < effects){
+//				$(".effect_next").hide();
+////				$(".box").css("height", "2.7rem");
+//			}
+//			if(!isvalidOk){
+//				console.log(isvalidOk)
+//				$(".effect_one").hide();
+//				$(".effective_name").each(function(){
+//		    		if($(this).text() === effectiveNames){
+//		    			$(this).parent().next().find("input").prop("checked", true);
+//		    		}
+//		    	})
+//			}
+//      })
         //
-		var effectiveName = new Date().getMonth()+2;
-		if(effectiveName > 12){
-	    	effectiveName = effectiveName - 12
-	   	}
-		var effectiveNames = effectiveName+"月1日生效"
-		$(".effective_name.notnow").text(effectiveNames);
-		$('#nextMonth').val(effectiveNames);
+//		var effectiveName = new Date().getMonth()+2;
+//		if(effectiveName > 12){
+//	    	effectiveName = effectiveName - 12
+//	   	}
+//		var effectiveNames = effectiveName+"月1日生效"
+//		$(".effective_name.notnow").text(effectiveNames);
+//		$('#nextMonth').val(effectiveNames);
 		
         // 对生效日期方式选择的input绑定点击事件
-        $('#effective_date input:radio[name="date"]').click(function () {
-            var checkValue = $('input:radio[name="date"]:checked').val();
-//          console.log(checkValue);
-            $('#effective_date').hide(200);
-            var effective = "";
-            var effectiveName = new Date().getMonth()+2;
-            if(effectiveName > 12){
-	    		effectiveName = effectiveName - 12
-	    	}
-            var effectiveNames = effectiveName+"月1日生效"
-            if(checkValue === "立即生效,需支付当月费用差价"){
-            	effective = "now";
-            }else if(checkValue === effectiveNames){
-            	effective = "notnow";
-            }
-            sessionStorage.effectiveDate = effective;
-            $('#effect_date_name').html(checkValue);
-            FinallyPrice();
-        });
+//      $('#effective_date input:radio[name="date"]').click(function () {
+//          var checkValue = $('input:radio[name="date"]:checked').val();
+////          console.log(checkValue);
+//          $('#effective_date').hide(200);
+//          var effective = "";
+//          var effectiveName = new Date().getMonth()+2;
+//          if(effectiveName > 12){
+//	    		effectiveName = effectiveName - 12
+//	    	}
+//          var effectiveNames = effectiveName+"月1日生效"
+//          if(checkValue === "立即生效,需支付当月费用差价"){
+//          	effective = "now";
+//          }else if(checkValue === effectiveNames){
+//          	effective = "notnow";
+//          }
+//          sessionStorage.effectiveDate = effective;
+//          $('#effect_date_name').html(checkValue);
+//          FinallyPrice();
+//      });
         
         
         // 选择周期
@@ -819,25 +818,25 @@
 			}
 	    }
 	    //生效时间
-	    if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
-	    	var effective = sessionStorage.effectiveDate;
-	    	var effectiveHtml = "";
-	    	if(effective === "now"){
-	    		effectiveHtml = "立即生效,需支付当月费用差价";
-	    	}else if(effective === "notnow"){
-	    		var effectiveName = new Date().getMonth()+2;
-	    		if(effectiveName > 12){
-	    			effectiveName = effectiveName - 12
-	    		}
-	    		effectiveHtml = effectiveName+"月1日生效";
-	    	}
-	    	$(".effective_name").each(function(){
-	    		if($(this).text() === effectiveHtml){
-	    			$(this).parent().next().find("input").prop("checked", true);
-	    		}
-	    	})
-	    	$('#effect_date_name').html(effectiveHtml);
-	    }
+//	    if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
+//	    	var effective = sessionStorage.effectiveDate;
+//	    	var effectiveHtml = "";
+//	    	if(effective === "now"){
+//	    		effectiveHtml = "立即生效,需支付当月费用差价";
+//	    	}else if(effective === "notnow"){
+//	    		var effectiveName = new Date().getMonth()+2;
+//	    		if(effectiveName > 12){
+//	    			effectiveName = effectiveName - 12
+//	    		}
+//	    		effectiveHtml = effectiveName+"月1日生效";
+//	    	}
+//	    	$(".effective_name").each(function(){
+//	    		if($(this).text() === effectiveHtml){
+//	    			$(this).parent().next().find("input").prop("checked", true);
+//	    		}
+//	    	})
+//	    	$('#effect_date_name').html(effectiveHtml);
+//	    }
 //	    //支付方式
 //	    if(sessionStorage.payType!==""&&sessionStorage.payType!==undefined){
 //	    	var payType = sessionStorage.payType;
@@ -893,7 +892,7 @@
 	    var starts = "";
 	    var endTime = "";
 	    var ends = "";
-	    var isvalidOk = "";
+//	    var isvalidOk = "";
 	 	$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             if (data) {
                 area = data.area;
@@ -904,9 +903,10 @@
 			    starts = data.starttime;
 			    endTime = data.end;
 			    ends = data.endtime;
-			    isvalidOk = data.isvalidOk;
+//			    isvalidOk = data.isvalidOk;
 			    //
-			    var areaArr = [];
+			    var provinceArr = [];
+			    var cityArr = [];
 			    var areaHtml = "";
 			    var buyerclassArr = [];
 			    var buyerclassHtml = "";
@@ -917,17 +917,19 @@
 			    		var citys = area[province]
 		//	    		console.log(citys);
 			    		if(citys.length===0){
-			    			areaArr.push(province);
+			    			provinceArr.push(province);
 			    		}else{
 			    			for(var i in citys){
-			    				areaArr.push(citys[i]);
+			    				cityArr.push(citys[i]);
 			    			}
 			    		}
 			    	}
-			    	areaHtml = areaArr.toString().replace(/,/g, " ");
+			    	var provinceLen = provinceArr.length;
+			 		var cityLen = cityArr.length;
+			    	areaHtml = "已购买"+provinceLen+"个省级区域/"+cityLen+"个市";
 		//	    	$(".item_area .label_for").text(areaHtml);
 					if(checkObj(area)){
-						areaHtml = "全国";
+						areaHtml = "已购买全国";
 					}
 			    	$('#area').attr("placeholder",areaHtml);
 			    }
@@ -935,11 +937,11 @@
 			    	for(var i in buyerclass){
 			    		var industry = buyerclass[i];
 			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = buyerclassArr.toString().replace(/,/g, " ");
+			    		buyerclassHtml = "已购买"+buyerclassArr.length+"个行业";
 			    	}
 		//	    	$(".item_industry .label_for").text(buyerclassHtml);
 					if(checkObj(buyerclass)){
-						buyerclassHtml = "全行业";
+						buyerclassHtml = "已购买全行业";
 					}
 					$('#buyerclass').attr("placeholder",buyerclassHtml);
 			    }
@@ -948,14 +950,14 @@
 			    var a = nowDate+ " - " +endTime;
 			    $(".nownow").text(nowDate+ " - " +endTime.replace(/-/g, "."))
 			    //
-			    if(!isvalidOk){
-			    	var effectiveName = new Date().getMonth()+2;
-		    		if(effectiveName > 12){
-		    			effectiveName = effectiveName - 12
-		    		}
-		    		effectiveHtml = effectiveName+"月1日生效";
-		    		$("#effect_date_name").text(effectiveHtml);
-			    }
+//			    if(!isvalidOk){
+//			    	var effectiveName = new Date().getMonth()+2;
+//		    		if(effectiveName > 12){
+//		    			effectiveName = effectiveName - 12
+//		    		}
+//		    		effectiveHtml = effectiveName+"月1日生效";
+//		    		$("#effect_date_name").text(effectiveHtml);
+//			    }
 			}
         },false);
         //
@@ -979,7 +981,7 @@
 			var endDay = new Date(endTime).getDate();
 			var oldPrice = "";
 			var price = "";
-			var effect = "";
+//			var effect = "";
 			var buyCheck = true;
 			if(sessionStorage.buyCheck!==undefined&&sessionStorage.buyCheck!==""){
 				let bcheck = sessionStorage.buyCheck;
@@ -1083,16 +1085,16 @@
 	       	}
 			
 			console.log("industrysArr",industrysArr);
-			if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
-				let eff = sessionStorage.effectiveDate;
-				if(eff === "now"){
-					effect = "now";
-				}else{
-					effect = "notnow";
-				}
-			}else{
-				effect = "now";
-			}
+//			if(sessionStorage.effectiveDate !== ""&&sessionStorage.effectiveDate!==undefined){
+//				let eff = sessionStorage.effectiveDate;
+//				if(eff === "now"){
+//					effect = "now";
+//				}else{
+//					effect = "notnow";
+//				}
+//			}else{
+//				effect = "now";
+//			}
 			//
 			if(endYear === nowYear){
 				if(endMonth === nowMonth){
@@ -1246,19 +1248,19 @@
         //
         $(".save_upgrade").on("click", function(){
         	$(".save_upgrade").attr("disabled","disabled")
-        	let effective = $("#effect_date_name").text();
-        	var effect = "now";
-        	if(effective !== "立即生效,需支付当月费用差价"){
-				let nowMonth = new Date().getMonth()+1;
-				let nowYear = new Date().getFullYear();
-				let a = nowMonth +1;
-        		if(a > 12){
-        			a = a-12;
-        			nowYear = nowYear +1;
-        		}
-        		let b = nowYear+"/"+a+"/1";
-        		effect = new Date(b).getTime() /1000;
-        	}
+//      	let effective = $("#effect_date_name").text();
+//      	var effect = "now";
+//      	if(effective !== "立即生效,需支付当月费用差价"){
+//				let nowMonth = new Date().getMonth()+1;
+//				let nowYear = new Date().getFullYear();
+//				let a = nowMonth +1;
+//      		if(a > 12){
+//      			a = a-12;
+//      			nowYear = nowYear +1;
+//      		}
+//      		let b = nowYear+"/"+a+"/1";
+//      		effect = new Date(b).getTime() /1000;
+//      	}
         	//
         	let areas = areasArr;
         	let industrys = industrysArr;
@@ -1285,11 +1287,11 @@
 	    		"areas": JSON.stringify(areaarr),
 	    		"industryarr": industryarr.join(","),
 	    		"payWay": "wx_js",
-	    		"effect": effect,
+//	    		"effect": effect,
 	    		"pay_source" : "Upgrade",
 	    		"time": times,
 	    		"nowUp": Number(nowRenew),
-	    		"isvalidOk" : isvalidOk,
+//	    		"isvalidOk" : isvalidOk,
 	    	}
 	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder",param,function(r){
@@ -1308,7 +1310,7 @@
 	    	sessionStorage.removeItem("proPrice");
 	    	sessionStorage.removeItem("vipSubSelectAreaUpgrade");
 	    	sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
-	    	sessionStorage.removeItem("effectiveDate");
+//	    	sessionStorage.removeItem("effectiveDate");
 	    	sessionStorage.removeItem("buyCheck");
 	    }