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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/updateArea.js

@@ -566,8 +566,8 @@ $(function () {
             $(this).prop('checked',false);
             $(this).parents('li').find('.city').removeClass('active');
         }
-        showOther();
         getResult();
+        showOther();
     })
     // 4.点击半选按钮触发的事件
 //  $('.checkbox.half').on('change', function () {
@@ -597,8 +597,8 @@ $(function () {
         } else {//半选
             oInput.prop("checked",false).addClass('half')
         }
-        showCityTips(this)
         getResult();
+        showCityTips(this)
     })
     // 6. 重置按钮点击事件
     $('.reset-btn').on('click', function() {
@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -674,20 +678,20 @@ $(function () {
 		}
 		let showCount = selectedCityLength - dataCount;
 		if(showCount > 2){
-			$(".tips_d_text").text("已选择"+selectedCityLength+"个市，建议购买“全省”");
+			$(".tips_d_text").text("已选择"+showCount+"个市，建议购买“全省”");
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();
 		}
-		if(selectedCityLength === cityLength){
+		if(showCount === cityLength){
 			showOther();
 		}
 	}
 	
 	function showOther(){
-		let provinceLength = $(".area-list .checkbox:not(.other):not([disabled]):checked").length;
-		if(provinceLength > 9){
-			$(".tips_d_text").text("已选择"+provinceLength+"个省，建议购买“全国”")
+		let showCounts = newlyAdded.province;
+		if(showCounts > 9){
+			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();

src/jfw/modules/app/src/web/templates/vipsubscribe/choose_industry_upgrade.html

@@ -336,8 +336,11 @@
                 	}
                 }
                 // 显示隐藏优惠tips
-                if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”");
+                let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
+                let showCount = buyset - disabledCount;
+                let showCounts = selectedArr.length - showCount;
+                if (showCounts > 3) {
+                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

src/jfw/modules/subscribepay/src/message.json

@@ -2,7 +2,8 @@
 	"WxTpl_OnTrial_SoonExpire": {
 		"id": "_2qGuk_KkOQtiO8oV_7ZOCWfjX2FQjs6pUDYBHkpygI",
 		"first":{
-			"value":"您试用的VIP订阅服务即将到期，如需获取更多精准招标信息，请及时购买。"
+			"value":"您试用的VIP订阅服务即将到期，如需获取更多精准招标信息，请及时购买。",
+			"color":"#FE737A"
 		},
 		"remark": {
 			"value":"感谢您的试用，如已购买，请忽略此信息。"
@@ -11,7 +12,8 @@
 	"WxTpl_OnTrial_Expired": {
 		"id": "_2qGuk_KkOQtiO8oV_7ZOCWfjX2FQjs6pUDYBHkpygI",
 		"first":{
-			"value":"您试用的VIP订阅服务已到期，如需获取更多精准招标信息，请及时购买。"
+			"value":"您试用的VIP订阅服务已到期，如需获取更多精准招标信息，请及时购买。",
+			"color":"#FE737A"
 		},
 		"remark": {
 			"value":"感谢您的试用，如已购买，请忽略此信息。"
@@ -20,7 +22,8 @@
 	"WxTpl_SoonExpire": {
 		"id": "3_VPNbD7fmfd8BsdjLW-a7FOP4wIhEGV7Jx-11-9c7g",
 		"first":{
-			"value":"您的VIP订阅服务即将到期，为了不影响您所获取更全面的招标信息，请您及时续费。"
+			"value":"您的VIP订阅服务即将到期，为了不影响您所获取更全面的招标信息，请您及时续费。",
+			"color":"#FE737A"
 		},
 		"keyword2": {
 			"value":"-"
@@ -35,7 +38,8 @@
 	"WxTpl_Expired": {
 		"id": "3_VPNbD7fmfd8BsdjLW-a7FOP4wIhEGV7Jx-11-9c7g",
 		"first":{
-			"value":"您的VIP订阅服务已到期，如需获取更多精准招标信息，请再次购买。"
+			"value":"您的VIP订阅服务已到期，如需获取更多精准招标信息，请再次购买。",
+			"color":"#FE737A"
 		},
 		"keyword2": {
 			"value":"-"
@@ -50,7 +54,8 @@
 	"WxTpl_Unpaid": {
 		"id": "9oRmG95lUQZMH-ZVTryoKpAuZTDQWVEsJBhZmJp_41c",
 		"first":{
-			"value":"您的订单 %s 处于未支付状态，为了使您获取更多招标信息，请您及时付款。"
+			"value":"您的订单 %s 处于未支付状态，为了使您获取更多招标信息，请您及时付款。",
+			"color":"#FE737A"
 		},
 		"keyword3": {
 			"value":"%s元"

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

@@ -22,23 +22,13 @@ const (
 	search_type  = "bidding"
 	search_field = `"_id","title","publishtime","toptype","subtype","type","city","s_subscopeclass","budget"`
 
-	query               = `{"query":{"bool":{"should":[%s]}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
+	query               = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match": 1}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
 	multi_match         = `{"multi_match": {"query": %s,"type": "phrase", "fields": ["title"]}}`
 	query_bool_must     = `{"terms":{"%s":[%s]}}`
-	query_bool_must_and = `{"bool":{"must":[%s]%s}}`
+	query_bool_must_and = `{"bool":{"must":[%s],"must_not":[%s]}}`
 	query_bool_should   = `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 )
 
-/* p1获取信息
-  return
-	  success : true or false
-	  errMsh : 错误信息
-	  data  :{
-		isVip: true or false,
-		weekNullData:true or false,
-		list:[{},{},{}]
-	 }
-*/
 func (this *IndexSearch) GetIndexMessage() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	areaCity := this.GetString("city")
@@ -87,17 +77,22 @@ func (this *IndexSearch) GetIndexMessage() {
 				history := strings.Split(h, ",")
 				//拼接查询语句-普通用户订阅词
 				doSearchStr = getSimpleSql(areaCity, history)
+				log.Println("getSimpleSql with history SearchStr===", doSearchStr)
 				log.Println(history)
 			}
 		}
 		//无订阅无搜索历史
 		if SearchType == 2 {
 			doSearchStr = getSimpleSql(areaCity, []string{})
+			log.Println("getSimpleSql SearchStr===", doSearchStr)
 		}
 		list := elastic.Get(search_index, search_type, doSearchStr)
 		return &entity.FuncResult{true, nil, map[string]interface{}{
-			"isVip": isVip,
-			"list":  list,
+			"isVip":        isVip,           //是否是vip用户
+			"hasSubscribe": SearchType == 0, //是否有订阅词
+			"hasHistory":   SearchType < 2,  //是否有搜索历史
+			"listLength":   len(*list),      //数据长度
+			"list":         list,            //数据
 		}}
 	}()
 	if r.Err != nil {
@@ -140,11 +135,7 @@ func getVipSubscribeSql(vipSets *map[string]interface{}) string {
 			}
 
 			if len(musts) > 0 {
-				notStr := ""
-				if len(must_not) > 0 {
-					notStr = fmt.Sprintf(`,"must_not":[%s]`, strings.Join(must_not, ","))
-				}
-				bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), notStr))
+				bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), strings.Join(must_not, ",")))
 			}
 		}
 	}
@@ -179,7 +170,7 @@ func getVipSubscribeSql(vipSets *map[string]interface{}) string {
 	//行业
 	buyerclasses := qutil.ObjArrToStringArr((*vipSets)["a_buyerclass"].([]interface{}))
 	if len(buyerclasses) > 0 {
-		musts = append(musts, fmt.Sprintf(query_bool_must, "buyerclass", `"`+strings.Join(infotypes, `","`)+`"`))
+		musts = append(musts, fmt.Sprintf(query_bool_must, "buyerclass", `"`+strings.Join(buyerclasses, `","`)+`"`))
 	}
 	return fmt.Sprintf(query, strings.Join(musts, ","), strings.Join(bools, ","))
 }
@@ -229,27 +220,27 @@ func getNormalSubscribeSql(keySets []interface{}) string {
 
 		//添加
 		if len(musts) > 0 {
-			notStr := ""
-			if len(must_not) > 0 {
-				notStr = fmt.Sprintf(`,"must_not":[%s]`, strings.Join(must_not, ","))
-			}
-			bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), notStr))
+			bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), strings.Join(must_not, ",")))
 		}
 	}
-	return fmt.Sprintf(query, strings.Join(bools, ","))
+	return fmt.Sprintf(query, "", strings.Join(bools, ","))
 }
 
 func getSimpleSql(city string, history []string) string {
-	musts := []string{}
+	var musts, bools []string
 	if len(history) > 0 {
-		for _, key := range history {
-			musts = append(musts, fmt.Sprintf(multi_match, "\""+key+"\""))
+		for _, v := range history {
+			keys := strings.Split(v, " ") //历史搜索 空格划分
+			must_tmp := []string{}
+			for _, key := range keys {
+				must_tmp = append(must_tmp, fmt.Sprintf(multi_match, "\""+key+"\""))
+			}
+			bools = append(bools, fmt.Sprintf(query_bool_must_and, strings.Join(must_tmp, ","), ""))
 		}
 
 	}
 	if city != "" {
 		musts = append(musts, fmt.Sprintf(query_bool_must, "area", `"`+city+`"`))
 	}
-	bools := fmt.Sprintf(query_bool_must_and, strings.Join(musts, ","), "")
-	return fmt.Sprintf(query, bools)
+	return fmt.Sprintf(query, strings.Join(musts, ","), strings.Join(bools, ","))
 }

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -165,18 +165,20 @@ func expireRemind() {
 			s_appponetype := qutil.ObjToString(m["s_appponetype"])
 			log.Println("到期提醒，推送消息", _id, "i_vip_status", i_vip_status, "l_vip_starttime", l_vip_starttime, "l_vip_endtime", l_vip_endtime, "i_vip_expire_tip", i_vip_expire_tip, "s_m_openid", s_m_openid, "isPushWx", isPushWx, "s_appponetype", s_appponetype, "s_jpushid", s_jpushid, "s_opushid", s_opushid)
 			tp := ""
-			tplId, first_value, keyword1_value, keyword2_value, keyword3_value, keyword4_value, remark := "", "", "", "", "", "", ""
+			tplId, first_value, first_color, keyword1_value, keyword2_value, keyword3_value, keyword4_value, remark := "", "", "", "", "", "", "", ""
 			switch i_vip_status {
 			case 1, -1:
 				if i_vip_expire_tip == 1 {
 					tp = "ontrial_soonexprie"
 					tplId = MessageConfig.WxTpl_OnTrial_SoonExpire.Id
 					first_value = MessageConfig.WxTpl_OnTrial_SoonExpire.First.Value
+					first_color = MessageConfig.WxTpl_OnTrial_SoonExpire.First.Color
 					remark = MessageConfig.WxTpl_OnTrial_SoonExpire.Remark.Value
 				} else if i_vip_expire_tip == 2 {
 					tp = "ontrial_expried"
 					tplId = MessageConfig.WxTpl_OnTrial_Expired.Id
 					first_value = MessageConfig.WxTpl_OnTrial_Expired.First.Value
+					first_color = MessageConfig.WxTpl_OnTrial_Expired.First.Color
 					remark = MessageConfig.WxTpl_OnTrial_Expired.Remark.Value
 				}
 				keyword1_value = qutil.ObjToString(m["s_nickname"])
@@ -187,6 +189,7 @@ func expireRemind() {
 					tp = "soonexprie"
 					tplId = MessageConfig.WxTpl_SoonExpire.Id
 					first_value = MessageConfig.WxTpl_SoonExpire.First.Value
+					first_color = MessageConfig.WxTpl_SoonExpire.First.Color
 					keyword2_value = MessageConfig.WxTpl_SoonExpire.Keyword2.Value
 					keyword3_value = MessageConfig.WxTpl_SoonExpire.Keyword3.Value
 					remark = MessageConfig.WxTpl_SoonExpire.Remark.Value
@@ -194,6 +197,7 @@ func expireRemind() {
 					tp = "expried"
 					tplId = MessageConfig.WxTpl_Expired.Id
 					first_value = MessageConfig.WxTpl_Expired.First.Value
+					first_color = MessageConfig.WxTpl_Expired.First.Color
 					keyword2_value = MessageConfig.WxTpl_Expired.Keyword2.Value
 					keyword3_value = MessageConfig.WxTpl_Expired.Keyword3.Value
 					remark = MessageConfig.WxTpl_Expired.Remark.Value
@@ -206,6 +210,7 @@ func expireRemind() {
 				tmplData := map[string]*qrpc.TmplItem{
 					"first": &qrpc.TmplItem{
 						Value: first_value,
+						Color: first_color,
 					},
 					"keyword1": &qrpc.TmplItem{
 						Value: keyword1_value,

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

@@ -167,6 +167,7 @@ func (m *msgRemind) run() {
 				tmplData := map[string]*qrpc.TmplItem{
 					"first": &qrpc.TmplItem{
 						Value: fmt.Sprintf(MessageConfig.WxTpl_Unpaid.First.Value, unpaidOrder.orderCode),
+						Color: MessageConfig.WxTpl_Unpaid.First.Color,
 					},
 					"keyword1": &qrpc.TmplItem{
 						Value: util.FormatDateByInt64(&unpaidOrder.prepayTime, util.Date_Short_Layout),

src/web/staticres/vipsubscribe/js/updateArea.js

@@ -565,9 +565,9 @@ $(function () {
         }else{
             $(this).prop('checked',false);
             $(this).parents('li').find('.city').removeClass('active');
-        }
-        showOther();
+        };
         getResult();
+        showOther();
     })
     // 4.点击半选按钮触发的事件
 //  $('.checkbox.half').on('change', function () {
@@ -597,8 +597,8 @@ $(function () {
         } else {//半选
             oInput.prop("checked",false).addClass('half')
         }
-        showCityTips(this)
         getResult();
+        showCityTips(this)
     })
     // 6. 重置按钮点击事件
     $('.reset-btn').on('click', function() {
@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -674,20 +678,20 @@ $(function () {
 		}
 		let showCount = selectedCityLength - dataCount;
 		if(showCount > 2){
-			$(".tips_d_text").text("已选择"+selectedCityLength+"个市，建议购买“全省”");
+			$(".tips_d_text").text("已新增"+showCount+"个市，建议新增“全省”");
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();
 		}
-		if(selectedCityLength === cityLength){
+		if(showCount === cityLength){
 			showOther();
 		}
 	}
 	
 	function showOther(){
-		let provinceLength = $(".area-list .checkbox:not(.other):not([disabled]):checked").length;
-		if(provinceLength > 9){
-			$(".tips_d_text").text("已选择"+provinceLength+"个省，建议购买“全国”")
+		let showCounts = newlyAdded.province;
+		if(showCounts > 9){
+			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();

src/web/templates/weixin/historypush.html

@@ -18,7 +18,8 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css">
 	<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 	<!-- 2.8.5 -->
-	<script src="/vipsubscribe/js/rem.js"></script>
+	<script src="/vipsubscribe/js/rem.js"></script>    
+	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 	<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css"/>
 	<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css" />
 	<link rel="stylesheet" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
@@ -278,19 +279,21 @@
 					$('.free7days_pic').append("<style>.free7days_pic:after{display:none}</style>");
 					if(parseInt(isExpire)>1){
 						$(".renew_toast .isExpire").text(parseInt(isExpire));
+						$(".renew_toast").show();
 					}else if (parseInt(isExpire)>0){
 						$(".renew_toast").find(".other").hide();
 						$(".renew_toast").find(".today").show();
+						$(".renew_toast").show();
 					}
-					$(".renew_toast").show();
 				}else{
 					if(parseInt(isExpire)>1){
 						$("._renew_toast .isExpire").text(parseInt(isExpire));
+						$("._renew_toast").show();
 					}else if (parseInt(isExpire)>0){
 						$("._renew_toast").find(".other").hide();
 						$("._renew_toast").find(".today").show();
+						$("._renew_toast").show();
 					}
-					$("._renew_toast").show();
 				}
 				$(".vip_set").show();
 				$(".tab_left .area").show();
@@ -665,8 +668,10 @@
 		}
 		//续费
 		function torepay(){
-			setSessionStorage();
-			window.location.href="/weixin/pay/renewPayPage";
+			if(!checkOrder()){
+				setSessionStorage();
+				window.location.href="/weixin/pay/renewPayPage";
+			}
 		}
 		//购买
 		function topay(){
@@ -912,8 +917,8 @@
       	<div class="_renew_toast" style="display: none;">
       		<div>
       			<i class="icon iconfont" id="_close_renew">&#xe61a;</i>
-      			<span class="other">VIP订阅服务试用还有<span class="isExpire"></span>天到期，请及时购买！</span>
-      			<span class="today" style="display:none;">VIP订阅服务试用今天到期，请及时购买！</span>
+      			<span class="other">VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时购买！</span>
+      			<span class="today" style="display:none;">VIP订阅服务今天到期，请及时购买！</span>
       			<a onclick="topay()">去购买</a>
       		</div>
       	</div>
@@ -985,11 +990,15 @@
   						cityHtml +='<div class="province_city" data-id="'+i+'" style="display:'+shwohide+'">'
   					}
   					var cityArr = thisArea[i]//每个省份下的地市
+					var allSH = "";
+					if(cityArr.length==1){
+						allSH = "hide";
+					}
 					var _cityMap = _provinceArr[i]
 					if(_cityMap!=undefined&&_cityMap[0]=="全部"){
-						cityHtml +='<p class="c_item cityAll"><input type="checkbox" class="checkbox" checked><span class="city-name">全部</span></p>';
+						cityHtml +='<p class="c_item cityAll '+allSH+'"><input type="checkbox" class="checkbox" checked><span class="city-name">全部</span></p>';
 					}else{
-						cityHtml +='<p class="c_item cityAll"><input type="checkbox" class="checkbox"><span class="city-name">全部</span></p>';
+						cityHtml +='<p class="c_item cityAll '+allSH+'"><input type="checkbox" class="checkbox"><span class="city-name">全部</span></p>';
 					}
   					for(var m = 0;m < cityArr.length;m++){
   						var cityFlag = true;

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

@@ -335,8 +335,11 @@
                 	}
                 }
                 // 显示隐藏优惠tips
-                if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”");
+                let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
+                let showCount = buyset - disabledCount;
+                let showCounts = selectedArr.length - showCount;
+                if (showCounts > 3) {
+                	$('.tips_btn .tips_d_text').text("已选择"+showCounts+"个行业，建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()

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

@@ -128,15 +128,17 @@
             <div class="renew_toast" style="display: none;">
                 <div>
                     <i class="icon iconfont" id="close_renew">&#xe61a;</i>
-                    <span>VIP订阅服务还有 <span class="renew_day"></span> 天到期，请及时续费！</span>
-                    <a href="/weixin/pay/renewPayPage">去续费</a>
+                    <span class="other">VIP订阅服务还有 <span class="renew_day"></span> 天到期，请及时续费！</span>
+      				<span class="today" style="display:none;">VIP订阅服务今天到期，请及时续费！</span>
+                    <a onclick="rebuy()">去续费</a>
                 </div>
             </div>
             <!-- 试用用户-去购买提醒 -->
             <div class="nv_renew_toast" style="display: none;">
                 <div>
                     <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
-                    <span>VIP订阅服务试用还有<span class="renew_day"></span>天到期，请及时购买！</span>
+	      			<span class="other">VIP订阅服务还有 <span class="renew_day"></span> 天到期，请及时购买！</span>
+	      			<span class="today" style="display:none;">VIP订阅服务今天到期，请及时购买！</span>
                     <a href="/weixin/pay/vipsubscribe_new">去购买</a>
                 </div>
             </div>
@@ -261,10 +263,16 @@
                    		var _vipstatus = _userData["i_vip_status"];
                    		// console.log(_userData)
 	                   if(_vipstatus&&_vipstatus=="1"){
-							if(parseInt(_vipData["expRemind"])>0){
+							if(parseInt(_vipData["expRemind"])>1){
 	                            $(".to_expired").show();
-	                            $(".nv_renew_toast").show();
 								$(".renew_day").text(_vipData["expRemind"]);
+	                            $(".nv_renew_toast").show();
+								$(".tabbar").hide();
+	                        }else if(parseInt(_vipData["expRemind"])>0){
+	                            $(".to_expired").show();
+								$(".nv_renew_toast").find(".other").hide();
+								$(".nv_renew_toast").find(".today").show();
+	                            $(".nv_renew_toast").show();
 								$(".tabbar").hide();
 	                        }else{
 	                            $(".to_expired").hide();
@@ -273,10 +281,15 @@
 							$('.free7days_pic').text("VIP订阅服务");
 	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
 	                   }else{
-							if(parseInt(_vipData["expRemind"])>0){
+							if(parseInt(_vipData["expRemind"])>1){
 	                            $(".to_expired").show();
 	                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
 	                            $(".renew_toast").show();
+	                        }else if(parseInt(_vipData["expRemind"])>0){
+	                            $(".to_expired").show();
+								$(".renew_toast").find(".other").hide();
+								$(".renew_toast").find(".today").show();
+	                            $(".renew_toast").show();
 	                        }else{
 	                            $(".to_expired").hide();
 	                        }