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

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

@@ -55,7 +55,7 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			"order_code": orderCode,
 			//"order_status": 1,
 		}
-		oData := util.Mysql.FindOne(tableName_order, query, "prepay_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime", "")
+		oData := util.Mysql.FindOne(tableName_order, query, "prepay_time,create_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime", "")
 		log.Println("odata:", oData)
 		//查询订单信息
 		if oData == nil || len(*oData) == 0 {

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

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"entity"
 	"errors"
+	"pay"
+	"regexp"
+
 	"github.com/dchest/captcha"
 	"github.com/go-xweb/httpsession"
 	"gopkg.in/mgo.v2/bson"
-	"pay"
-	"regexp"
 
 	"log"
 
@@ -38,6 +39,7 @@ var (
 	phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")
 	nameReg  = regexp.MustCompile("^[\u4E00-\u9FA5A-Za-z\\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$")
 )
+
 //首页试用弹框是否展示
 func (t *TrialOrder) ShowTrailTip() {
 	userId := qutil.ObjToString(t.GetSession("userId"))
@@ -59,7 +61,7 @@ func (t *TrialOrder) CloseTrailTip() {
 	ok := false
 	if util.MQFW.UpdateById("user", userId,
 		bson.M{"$set": bson.M{
-			"o_vipjy.i_trial": 2,}}) {
+			"o_vipjy.i_trial": 2}}) {
 		ok = true
 	} //已激活试用
 	t.ServeJson(map[string]interface{}{
@@ -188,7 +190,7 @@ func (t *TrialOrder) SubmitApply() {
 			if res != nil && len(*res) > 0 && ok {
 				o_vipjy := qutil.ObjToMap((*res)["o_vipjy"])
 				i_trial, ok := (*o_vipjy)["i_trial"]
-				if !ok || qutil.IntAll(i_trial) == 2 {  //2为不提示状态
+				if !ok || qutil.IntAll(i_trial) == 2 { //2为不提示状态
 					if !util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"o_vipjy.i_trial": 1}}) {
 						log.Println("更新使用状态出错", userId)
 					}
@@ -287,7 +289,14 @@ func (this *TrialOrder) TrialPay() {
 			0,
 		}
 		filterStr, _ := json.Marshal(filter)
-		endTime := now.AddDate(0, 0, 7)
+		//结束日期 按照 自然周 算 （例:11.11开通 11.17 23.59.59结束）
+		//endTime := now.AddDate(0, 0, 7)
+		endTime_format := now.AddDate(0, 0, 7).Format(qutil.Date_Short_Layout)
+		stamp, _ := time.ParseInLocation(qutil.Date_Short_Layout, endTime_format, time.Local)
+		stamp_time := stamp.Unix() - 1 //23.59.59
+		endt := time.Unix(stamp_time, 0).Format(qutil.Date_Full_Layout)
+		endTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, endt, time.Local)
+
 		orderid := util.Mysql.Insert("dataexport_order", map[string]interface{}{
 			"order_money":    totalfee,
 			"order_status":   1,

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

@@ -234,34 +234,19 @@ func getKeyWordArrFromDbResult(a_items []interface{}) (arr []ViewKeyWord) {
 //初始化vip订阅关键词
 func MergeKws(userId string) {
 	defer qutil.Catch()
-	if userId == "" {
+	if userId == "" { //11-11 取消此操作
 		return
 	}
 	data, ok := MQFW.FindById("user", userId, `{"o_jy":1,"o_vipjy":1}`)
-	var o_jy map[string]interface{}
 	var o_vipjy map[string]interface{}
 	if ok && data != nil && len(*data) > 0 {
 		o_vipjy, _ = (*data)["o_vipjy"].(map[string]interface{})
 		a_items, _ := o_vipjy["a_items"].([]interface{})
-		o_jy, _ = (*data)["o_jy"].(map[string]interface{})
-		a_key, _ := o_jy["a_key"].([]interface{})
-		if a_items == nil && len(a_key) > 0 { //首次
-			var o_kws = make(map[string]interface{})
-			var _key = make([]map[string]interface{}, len(a_key))
-			o_kws["s_item"] = "未分类"
-			for k, v := range a_key {
-				keyarr := v.(map[string]interface{})
-				_key[k] = map[string]interface{}{"key": keyarr["key"].([]interface{})}
-			}
-			o_kws["a_key"] = _key
-			o_kws["i_tips"] = 0
-			if o_kws != nil && len(o_kws) > 0 {
-				a := MQFW.UpdateById("user", userId, bson.M{
-					"$push": bson.M{"o_vipjy.a_items": o_kws},
-					"$set":  bson.M{"o_vipjy.i_matchway": 1, "o_vipjy.i_ratemode": 1, "o_vipjy.i_wxpush": 1, "o_vipjy.i_projectmatch": 0, "o_vipjy.l_modifydate": time.Now().Unix()},
-				})
-				log.Println(a)
-			}
+		if a_items == nil { //首次
+			a := MQFW.UpdateById("user", userId, bson.M{
+				"$set": bson.M{"o_vipjy.i_matchway": 1, "o_vipjy.i_ratemode": 1, "o_vipjy.i_wxpush": 1, "o_vipjy.i_projectmatch": 0, "o_vipjy.a_infotype": []string{}, "o_vipjy.a_items": []string{}, "o_vipjy.l_modifydate": time.Now().Unix()},
+			})
+			log.Println(a)
 		}
 	}
 }

src/web/staticres/css/wxkeyset.css

@@ -66,7 +66,8 @@ html.hidden,body.hidden,.keysetpage .keyWordContent.adjustment{
 	position: absolute;
     left: 0px;
     right: 0px;
-    top: 0px;
+/*    top: 0px;*/
+    top: 47px;
 	z-index: 1;
 }
 .keysetpage .keyWordContent.adjustment{

src/web/staticres/vipsubscribe/css/messageType.css

@@ -118,3 +118,14 @@ body .industry .resetOne button:first-child {
   background: #fff;
   color: #2cb7ca;
 }
+/*----*/
+.result {
+    position: fixed;
+    padding: .2rem .3rem;
+    font-size: .26rem;
+    text-align: justify;
+    width: 100%;
+    background: rgba(245,244,249,1);
+    z-index: 999;
+	    top: 0px;
+}

src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -6,7 +6,7 @@
   align-items: center;
 }
 
-.flex_alginC_justB, .vip_banner .box, .filter_tab, .filter_tab .area_container .area_wrap .handle_menu, .set_keyword > div, .renew_toast > div, .open_remind .remind_box {
+.flex_alginC_justB, .vip_banner .box, .filter_tab, .filter_tab .area_container .area_wrap .handle_menu, .set_keyword > div, .renew_toast > div,.nv_renew_toast > div, .open_remind .remind_box {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -498,3 +498,27 @@ text-decoration: none;
   border-radius: .32rem;
   text-align: center;
 }
+
+.nv_renew_toast > div {
+  padding: .15rem .3rem;
+  color: #fff;
+  font-size: .26rem;
+}
+
+.nv_renew_toast > div i {
+  font-size: .32rem;
+}
+
+.nv_renew_toast > div a {
+  width: 1.24rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #fff;
+  text-align: center;
+  background: transparent;
+  border: 1px solid white;
+  border-radius: .32rem;
+}
+.nv_renew_toast > div {
+  background-color: #FE737A;
+}

src/web/staticres/vipsubscribe/css/vip_index.css

@@ -246,8 +246,8 @@
 }
 
 .custom-dialog .weui-dialog__hd {
-  background: #F5F4F9;
-  padding: .17rem 0;
+  background: #fff;
+  padding:  0.38rem 0 0;
   color: #000;
   font-size: .34rem;
   text-align: center;
@@ -726,4 +726,33 @@ i.icon-wenhao{
     color: #2CB7CA;
 /*    padding-top: .05rem;*/
     margin-left: .2rem;
+}
+
+.vip_index .footer .nv_renew_toast {
+  width: 100%;
+}
+
+.vip_index .footer .nv_renew_toast div {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: .15rem .3rem;
+  color: #fff;
+  font-size: .26rem;
+  background-color: #FE737A;
+}
+
+.vip_index .footer .nv_renew_toast div i {
+  font-size: .32rem;
+}
+
+.vip_index .footer .nv_renew_toast div a {
+  width: 1.24rem;
+  height: .64rem;
+  line-height: .64rem;
+  color: #fff;
+  text-align: center;
+  background: transparent;
+  border: 1px solid white;
+  border-radius: .32rem;
 }

src/web/staticres/vipsubscribe/css/vip_service_expire.css

@@ -232,11 +232,12 @@
   justify-content: space-between;
   align-items: center;
   padding: 0 .3rem;
-  padding-top: 1.3rem;
+  /*padding-top: 1.3rem;*/
 }
 
 .vip_service_expire .service_expire_tip {
   width: 100%;
+  padding-top: 1.3rem;
 }
 
 .vip_service_expire .service_expire_tip .tip_title_box {

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -66,6 +66,10 @@ var reloadFunc = function(){
                 callback: function () { console.log('close') }
             });
         }else if (saveData("SK")){
+            // 设置状态 首次添加关键词
+            if(a_items.length==0){
+                setEmptyHistory();
+            }
             //
             doSessionData();
             $(".add-keyword-container .addNewKeyword").show();
@@ -112,10 +116,6 @@ var reloadFunc = function(){
             var buttonDOM = $('.enter.addkeyWord .btn button')[0]
             buttonDOM.style.opacity = .5
             buttonDOM.setAttribute("disabled", true)
-            // 设置状态 首次添加关键词
-            if(a_items.length==0){
-                setEmptyHistory();
-            }
             //保存关键词 查看关键词数量 未分类 超过20 100提示
             if(classify_name.indexOf("未分类")>-1){
                 if((kws_tips==0&&$(".showKeyWord li").length>=20)||(kws_tips==20&&$(".showKeyWord li").length>=100)){

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -551,13 +551,23 @@
 			                                   					 var self = $(obj).parent(".card-footer").prev(".card-content").prev(".card-header").children(".notpay");
 			                                   					 self.text("已取消");
 			                                   					 self.css("color","black");
-			                                   					 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+			                                   					 var isVipOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isvipOrder");
+			                                   					 console.log(isVipOrder)
+			                                   					 //vip订单取消了没有再次购买
+			                                   					 if (isVipOrder!="true"){
+			                                   					 	 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+			                                   					 }else{
+			                                   					 	$(obj).parent().parent().remove();
+																	$(".card_lists").empty();
+			                                   					 	queryOrder($("ul .active").index());
+			                                   					 }
+			                                   					
 			                                                }
 			                                            }
 			                                        }
 			                                    });
 			                                }else{
-			                                    alertS("删除失败，请联系管理员！");
+			                                    alertS("取消失败，请联系管理员！");
 			                                }
 		                            });
 			                    }
@@ -844,14 +854,6 @@
 	                        var region_vip=""
 	                        var province_length=0;
 	                        var city_length=0;
-//	                        for( i in region_vipArr){
-//	                        	var region_vipArr_i =region_vipArr[i];
-//                      		if(region_vipArr_i.count==undefined){
-//                      			province_length++;
-//                      		}else{
-//                      			city_length+=region_vipArr_i.count;
-//                      		}
-//	                        }
 							if(JSON.stringify(region_vipArr) != JSON.stringify({})){
 								for(i in region_vipArr){
 									if(region_vipArr[i].length==0){
@@ -1031,7 +1033,7 @@
 															+'</div>'
 															+'<div class="media-info">'
 																+'<p class="item-ifo ellipsis">区域：'+ region_vip+'</p>'
-																+'<p class="item-ifo ellipsis">行业：'+ industry_vip +'个行业</p>'
+																+'<p class="item-ifo ellipsis">行业：'+ industry_vip +'行业</p>'
 																+'<p class="item-ifo ellipsis">订阅周期：'+effectiveduration_vip+'</p>'
 																+'<p class="item-ifo ellipsis">有效日期：'+effectivetime_vip+'</p>'
 															+'</div>'

src/web/templates/weixin/email/bind_email.html

@@ -24,6 +24,9 @@
 			    background: transparent;
 			    display: none;
 			}
+			.email_input,.code_input{
+				line-height: 20px !important;
+			}
 		</style>
 		<div class="bind_email">
			<div class="input mgT26">
				<input type="email" placeholder="输入邮箱" name="" id="" value="" class="email_input" />
				<input type="text" placeholder="输入验证码" name="" id="" value="" class="code_input" />
				<button class="sendcode" >获取验证码</button>
 				<button class="code_true"><i class="icon iconfont email_check_ok" style="display: inline;"></i></button>
@@ -77,7 +80,10 @@
 								promptbox(data.errMsg);
 							}
 						});
-						//验证码校验
						$('.code_input').bind('input propertychange',()=>{
+
					}
				})
+				
+										//验证码校验
+						$('.code_input').bind('input propertychange',()=>{
 							var verity=$(".code_input").val();
 							var email=$(".email_input").val().replace(/\s*/g,"");
 							if(verity.length==6){
@@ -96,7 +102,8 @@
 										promptbox("邮箱验证码错误");
 									}
 								});
-							}
						}).on("blur",()=>{
+							}
+						}).on("blur",()=>{
 							var code_input_len=$(".code_input").val().length
 							if((code_input_len!=6)&&(code_input_len!=0)){
 								$(".code_true").hide();
@@ -118,14 +125,14 @@
 									}else{
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 										if((param="invoice")&&(orderCode!=null)){
-											window.location.replace("/jyapp/front/myorder/setSuccess?name=invoice&orderCode="+orderCode); 
+											window.location.replace("/front/wxMyOrder/setSuccess?name=invoice&orderCode="+orderCode); 
 										}else{
-											window.location.replace("/jyapp/front/myorder/setSuccess?name=bindEmail"); 
+											window.location.replace("/front/wxMyOrder/setSuccess?name=bindEmail"); 
 										}
 									}
 								}
 							})
-						})
					}
				})
			})
+						})
			})
 			
 			//提示框
 			function promptbox(str){

src/web/templates/weixin/email/bind_success.html

@@ -27,8 +27,7 @@
 				
 				let param = getParam('name');//获取url传来的参数 判断显示成功的字幕
 				var orderCode=getParam("orderCode"); //开发票的订单
-				console.log(param)
-				var time = 6;
+				var time = 3;
 				function countDown(){
 					if(time == 0){
 						$('.time').html('');
@@ -66,7 +65,7 @@
 				}
 				/* 返回 */
 				$('.back').on('click',() =>{
-					if((param="invoice")&&(orderCode!="")){
+					if((param=="invoice")&&(orderCode!=null)){
 							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
 						}else{
 							window.location.replace('/front/wxMyOrder/myEmail');

src/web/templates/weixin/historypush.html

@@ -125,10 +125,14 @@
 						}
 						if(parseInt(data.isOnTail)!=1){
 							$('.free7days_pic').append("<style>.free7days_pic:after{display:none}</style>");
-						}
-						if(parseInt(data.isExpire)!=0){
-							$(".isExpire").text(parseInt(data.isExpire));
-							$(".renew_toast").show();
+							if(parseInt(data.isExpire)!=0){
+								$(".isExpire").text(parseInt(data.isExpire));
+								$(".renew_toast").show();
+							}
+						}else{
+							if(parseInt(data.isExpire)!=0){
+								$(".nv_renew_toast").show();
+							}
 						}
 						$(".vip_set").show();
 						$(".tab_left .area").show();
@@ -611,6 +615,11 @@
 			setSessionStorage();
 			window.location.href="/weixin/pay/renewPayPage";
 		}
+		//购买
+		function topay(){
+			setSessionStorage();
+			window.location.href="/weixin/pay/vipsubscribe_new";
+		}
 	</script>
 	<style type="text/css">
 		.findnull{
@@ -851,6 +860,14 @@
       			<a onclick="torepay()">去续费</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>
+      			<a onclick="topay()">去购买</a>
+      		</div>
+      	</div>
       	<!-- 设置关键词 -->
       	<div class="set_keyword" style="display: none;">
       		<div>
@@ -1135,6 +1152,9 @@
             $('#close_renew').on('click',() =>{
             	$('.renew_toast').hide()
             })
+            $('#nv_close_renew').on('click',() =>{
+            	$('.nv_renew_toast').hide()
+            })
             
         })
     </script>

src/web/templates/weixin/my.html

@@ -35,7 +35,7 @@
 				margin-right: 5px;
 			}
 			.myorderDiv{
-				font:16px/43px "微软雅黑" ;
+				font:16px/50px "微软雅黑" ;
 				background-color:#FFFFFF ;
 			}
 			.fl{
@@ -65,11 +65,11 @@
 			}
 			.vip{
 				margin-bottom: 10px;
-				font:16px/43px "微软雅黑" ;
+				font:16px/50px "微软雅黑" ;
 				background-color:#FFFFFF ;
 			}
 			.email{
-				border-top: 1px #F5F4F9 solid;
+				border-top:0px #F5F4F9 solid;
 			}
 			.setEmail{
 				float:right;
@@ -146,38 +146,54 @@
 	<body>
 		<div id="" class="vip lineTop">
 			<img src="/images/wx/vip.svg"/>
-			VIP订阅
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;">
+				VIP订阅
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 		
 		<div class="myorderDiv myorder">
 			<i class="iconfont myorderIcon myorder_margin">&#xe60f;</i>
-			我的订单
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				我的订单
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 		<div class="myorderDiv email">
 			<img src="/images/wx/email.svg"/>
-			邮箱地址
-			<i class="iconfont fr rightIcon">&#xe642;</i>
-			<span class="setEmail"></span>
+			<div style="width:87%;display:inline-block;">
+				邮箱地址
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+				<span class="setEmail"></span>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom lineTop feedback">
-			<i class="iconfont threeIcon">&#xe613;</i>
-			意见反馈
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+		<div class="myorderDiv  lineTop feedback" >
+			<i class="iconfont threeIcon" style="">&#xe613;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				<div style="display:inline-block;">
+					意见反馈
+				</div>
+				<i class="iconfont fr rightIcon ">&#xe642;</i>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom useHelp">
+		<div class="myorderDiv  useHelp">
 			<i class="iconfont threeIcon ">&#xe60c;</i>
-			使用帮助
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;" class="lineBottom">
+				<div style="display:inline-block;">
+					使用帮助
+				</div>
+				<i class="iconfont fr rightIcon ">&#xe642;</i>
+			</div>
 		</div>
 		
-		<div class="myorderDiv lineBottom aboutJy">
+		<div class="myorderDiv  aboutJy">
 			<i class="iconfont threeIcon">&#xe601;</i>
-			关于剑鱼标讯
-			<i class="iconfont fr rightIcon">&#xe642;</i>
+			<div style="width:87%;display:inline-block;">
+				关于剑鱼标讯
+				<i class="iconfont fr rightIcon">&#xe642;</i>
+			</div>
 		</div>
 
 <!--百度统计end-->

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/keyWord.html

@@ -279,7 +279,7 @@
 					if(a_items.length==0){
 		                window.history.go(-1)
 		            }
-		            var loading = weui.loading('loading...', {
+		            var loading = weui.loading('', {
 		                className: 'custom-classname'
 		            })
 		            $('.classify-show-pop').hide();
@@ -539,7 +539,6 @@
                         kwsHtml +='<div class="modify" style="display: none;">'
                     }
 					var p = kws_arr[_keyArr[i]["key"].join(" ")].split("-")[0]
-					console.log("p:"+p)
                     kwsHtml +='<textarea name="" rows="1" placeholder="" maxlength="20">'+_keyArr[i]["key"].join(" ")+'</textarea>'
                                 +'<button class="addAdjunctWord" onclick="toappendkey(this)">'+ak_remark+' 附加词 <i class="appendkey '+ak_showClass+'">('+appendkeylth+')</i></button>'
                                 +'<button class="addExclusion" onclick="tonotkey(this)">'+nk_remark+' 排除词 <i class="notkey '+nk_showClass+'">('+notkeylth+')</i></button>'
@@ -694,7 +693,6 @@
             //删除关键词
             if(t!="DK"){
 				kws_arr[kws_name] = kws_index+"-"+classify_index
-				console.log(kws_index,"----",$(".showKeyWord li").length)
                 if(kws_index == $(".showKeyWord li").length){
                     //新加
                     var karr = {"key":kws_name.split(" "),"appendkey":addition_kws,"notkey":not_kws}
@@ -794,11 +792,11 @@
             })
 
             // 点击分类目录的每一项，进入对应列表
-            $('.classify-list').on('click', '.classify-item-r', function() {
+            $('.classify-list').on('click', '.classify-item', function() {
                 // 添加一条空历史记录
                 history.pushState({id:1}, "","");
-                classify_name = $(this).parent('div').find('.classify-item-l').text();
-                classify_index = $(this).parent().parent("li.classify-item").index()
+                classify_name = $(this).find('.classify-item-l').text();
+                classify_index = $(this).index()
                 //展示此关键词信息
                 toSetKws();
             })

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

@@ -5,11 +5,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>信息类型</title>
-    <link rel="stylesheet" href="/vipsubscribe/css/base.css">
-    <link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css">
-    <link rel="stylesheet" href="/vipsubscribe/css/messageType.css">
-    <link rel="stylesheet" href="/css/common.css">
-    <script src="/vipsubscribe/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/messageType.css?v={{Msg "seo" "version"}}">    
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <style type="text/css">
         body .industry .resetOne{
             position: fixed;
@@ -25,7 +26,11 @@
     </style>
 </head>
 <body>
-
+	<div class="result">
+        <p class="result_text line_two">
+          已选择：<span class="result_name"></span>
+        </p>
+    </div>
     <div class="easypopup" id="nijianTip">
         <div class="easypopup-alert">
             <div class="easypopup-content">
@@ -89,19 +94,52 @@
         </div>
 
     </div>
-    <script src="/js/jquery-3.2.1.min.js?v=1412"></script>
-    <script src="/js/common.js"></script>
-    <script>           
+    <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v=1412"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <script>      
+		var hasZBGG = ""
+		var hasZBJG = ""
+		var hasZBXYXX = ""
+		var hasStr = ""     
         function hasActive(){
             var arr = "";
+			hasZBGG = ""
+			hasZBJG = ""
+			hasZBXYXX = ""
+			hasStr = ""  
             $(".list ul li dl dd").each(function(index){
                 if($(this).hasClass('active')){
                     arr = arr + "," + $(this).text()
+					if($(this).prevAll("dt").text()=="招标公告"){
+						if(hasZBGG!=""){
+							hasZBGG+="、"
+						}
+						hasZBGG += $(this).text()
+					}
+					if($(this).prevAll("dt").text()=="招标结果"){
+						if(hasZBJG!=""){
+							hasZBJG+="、"
+						}
+						hasZBJG += $(this).text()
+					}
+					if($(this).prevAll("dt").text()=="招标信用信息"){
+						if(hasZBXYXX!=""){
+							hasZBXYXX+="、"
+						}
+						hasZBXYXX += $(this).text()
+					}
                 }
             })
             $(".list ul li dl dt").each(function(index){
                 if($(this).hasClass('active')&&($(this).text()=="招标预告"||$(this).text()=="拟建项目")){
                     arr = arr + "," + $(this).attr("dataValue")
+					if($(this).text()=="招标预告"||$(this).text()=="拟建项目"){
+						if (hasStr!=""){
+							hasStr += " "
+						}
+						hasStr += $(this).text();
+					}
                 }
             })
             return arr.substr(1)
@@ -127,6 +165,34 @@
                 })
             }
         }
+		//
+		function getChecked(){
+			hasActive();
+			if (hasZBGG!=""||hasZBJG!=""|hasZBXYXX!=""){
+				if(hasStr != ""){
+					hasStr +=" "
+				}
+				if(hasZBGG!=""){
+					hasStr+=" 招标公告 ("+hasZBGG+")"
+				}
+				if(hasZBJG!=""){
+					hasStr+=" 招标结果 ("+hasZBJG+")"
+				}
+				if(hasZBXYXX!=""){
+					hasStr+=" 招标信用信息 ("+hasZBXYXX+")"
+				}
+			}
+			if(hasStr!=""){
+				$(".result_name").text(hasStr);
+			}else{
+				$(".result_name").text("全部");
+			}
+			
+	        weui.loading().hide();
+			$(".result").css("visibility","");
+          	$(".industry").css("margin-top",$('.result_text').height()+25);
+			$(".industry").css("visibility","");
+		}
         //
         isLockButton (false);
         // 传入false为锁定确认按钮
@@ -134,16 +200,19 @@
             var button = $('.reset').siblings()[0]
             if (flag) {
                 // true，解锁button
-                $(button).css({ opacity: 1}).removeAttr('disabled')
+                $(button).css({"background": "#2cb7ca"}).removeAttr('disabled')
             } else {
                 // false, 锁定button
-                $(button).css({ opacity: 0.5 }).attr('disabled', true)
+                $(button).css({"background": "#95DBE4"}).attr('disabled', true)
             }
         }
         //
         var njTipEasyPopup = null;
         //是否 修改
         $(function(){
+	        weui.loading();
+			$(".result").css("visibility","hidden");
+			$(".industry").css("visibility","hidden");
             //获取用户设置信息类型
             $.post("/subscribepay/afterPay/getUserInfo",{},function(r){
                 if(r.userData){
@@ -159,6 +228,7 @@
                 }else{
                     $('.all span').addClass('active');
                 }
+				getChecked();
             })
             //
             $(".sure").on("click",function(){
@@ -183,6 +253,7 @@
                     $('.list ul li dl dt').removeClass('active')
                     $('.list ul li dl dd').removeClass('active')
                 }
+				getChecked();
             })
             $(".list ul li dl dt").on("click", function(){
                 isLockButton (true);
@@ -195,6 +266,7 @@
                     $('.all span').removeClass('active')
                 }
                 isAllSelected ()
+				getChecked();
             })
             $(".list ul li dl dd").on('click',function(){
                 isLockButton (true);
@@ -209,6 +281,7 @@
                 // 决定dt是否被选中
                 isDtSelected (this)
                 isAllSelected ()
+				getChecked();
             })
 
             $('.reset').on('click',function(){
@@ -216,6 +289,7 @@
                 $('.all span').addClass('active')
                 $('.list ul li dl dt').removeClass('active')
                 $('.list ul li dl dd').removeClass('active')
+				getChecked();
             })
         })
 

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

@@ -8,7 +8,7 @@
 		<link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
 		<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
 		{{include "/common/weixin.html"}}
 	</head>
 	<style type="text/css">
@@ -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_index.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_index.css?v={{Msg "seo" "version"}}1">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_index.css?v={{Msg "seo" "version"}}2">
 </head>
 
 <body style="visibility:hidden;">
@@ -123,6 +123,14 @@
                     <a href="/weixin/pay/renewPayPage">去续费</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>
+                    <a href="/weixin/pay/vipsubscribe_new">去购买</a>
+                </div>
+            </div>
             <!-- 升级 续费 -->
             <div class="tabbar">
                 <a href="/weixin/pay/toUpgradePage" class="update_btn">升级</a>
@@ -134,7 +142,7 @@
             <div class="weui-mask weui-animate-fade-in"></div>
             <div class="weui-dialog weui-animate-fade-in">
                 <div class="weui-dialog__hd"><strong class="weui-dialog__title" style="font-weight: bold;">项目匹配</strong></div>
-                <div class="weui-dialog__bd" style="line-height: .4rem;padding: .37rem .3rem;font-size: 14px;text-align: left;color: #686868;">开启后，系统将根据你订阅的关键词自动匹配出相关联的项目，并将相关联项目的后续动态在VIP订阅内一并推送。</div>
+                <div class="weui-dialog__bd" style="line-height: .4rem;padding: .37rem .45rem;font-size: 14px;text-align: left;color: #686868;">开启后，系统将根据你订阅的关键词自动匹配出相关联的项目，并将相关联项目的后续动态在VIP订阅内一并推送。</div>
                 <div class="weui-dialog__ft" style="border-top: 1px solid #eee;padding-bottom: .2rem;padding-top: .2rem;"> 
                     <a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary" style="background: #fff;color: #2CB7CA;text-align: center;margin-right: unset;">我知道了</a>
                 </div>
@@ -142,7 +150,7 @@
         </div>
     </div>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<!--    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/weixin.html"}}
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}11"></script>
@@ -158,7 +166,6 @@
 				}
 			});
 			//
-			let isChecked = false; //是否开通项目匹配
 			if(!isinitpage){
             	getuserinfo();
 			}
@@ -169,17 +176,11 @@
                     $('.custom-dialog').hide()
                 })
 			})
-            if (isChecked === true) {
-                $('.switch').addClass('checked')
-            } else {
-                $('.switch').removeClass('checked')
-            }
             $('.switch').on('click', function (e) {
                 console.log($(this).hasClass('checked'))
                 let that = this;
                 let hasChecked = $(this).hasClass('checked');
                 if (hasChecked == false) {
-                    isChecked = true;
                     $(that).addClass('checked');
                     weui.toast('项目匹配已开启',{
                         duration: 3000,
@@ -187,7 +188,6 @@
                     })
 					setprojectmatch(1);
                 } else {
-                    isChecked = false;
                     $(that).removeClass('checked');
                     $('.custom-dialog').hide()
                     // $('#auto_renew').hide(500);
@@ -202,6 +202,11 @@
             $('#close_renew').on('click', () => {
                 $('.renew_toast').hide()
             })
+            $('#nv_close_renew').on('click', () => {
+                $('.nv_renew_toast').hide();
+				$(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/weixin/pay/vipsubscribe_new" class="update_btn">去购买</a>');
+				$(".tabbar").show();
+            })
         })
 		//
 		function getuserinfo(){
@@ -220,29 +225,38 @@
                    		var _vipstatus = _userData["i_vip_status"];
                    		// console.log(_userData)
 	                   if(_vipstatus&&_vipstatus=="1"){
-							$(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/weixin/pay/vipsubscribe_new" class="update_btn">去购买</a>')
+							if(parseInt(_vipData["expRemind"])>0){
+	                            $(".to_expired").show();
+	                            $(".nv_renew_toast").show();
+								$(".tabbar").hide();
+	                        }else{
+	                            $(".to_expired").hide();
+								$(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/weixin/pay/vipsubscribe_new" class="update_btn">去购买</a>')
+	                        }
 							$('.free7days_pic').text("VIP订阅服务");
 	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:inline-block}</style>");
 	                   }else{
+							if(parseInt(_vipData["expRemind"])>0){
+	                            $(".to_expired").show();
+	                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
+	                            $(".renew_toast").show();
+	                        }else{
+	                            $(".to_expired").hide();
+	                        }
 							$(".tabbar").html('<a href="/weixin/pay/toUpgradePage" class="update_btn">升级</a><a href="/weixin/pay/renewPayPage" class="renew_btn">续费</a>')
 							$('.free7days_pic').text("已开通VIP订阅服务");
 	                        $('.free7days_pic').append("<style>.free7days_pic::after{display:none}</style>");
 	                   }
 	                   if(_vipData){
 	                   		if(Number(_vipData["i_projectmatch"])==1){
-								isChecked = true;
-							}
+								$('.switch').addClass('checked')
+							}else{
+				                $('.switch').removeClass('checked')
+				            }
 	                        $("._area").text(_vipData["o_area"]);
 	                        $("._buyerClass").text(_vipData["a_buyerclass"]);
 	                        $("._cycleCount").text(_vipData["cycle"]);
 	                        $("._activeDate").text(_userData["l_vip_starttime"]+" - "+_userData["l_vip_endtime"]);
-	                        if(parseInt(_vipData["expRemind"])>0){
-	                            $(".to_expired").show();
-	                            $(".renew_day").text(parseInt(_vipData["expRemind"]))
-	                            $(".renew_toast").show();
-	                        }else{
-	                            $(".to_expired").hide();
-	                        }
 	                        if(_vipData["a_infotype"]==""){
 	                            _vipData["a_infotype"]="全部类型"
 	                        }

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

@@ -80,6 +80,10 @@
   margin-right: .3rem;
   background-color: #BFBFC3;
 }
+.cancel_time{
+	font-size: 16px;
+	margin-left: 20px;
+}
 </style>
 <body>
     <div class="vip_order_detail">
@@ -157,12 +161,12 @@
         </main>
         <!-- 当状态为待付款时显示去支付按钮 -->
         <!--当状态为已取消时显示再次购买按钮-->
-        <a href="#" class="button align" style="display:none">去支付</a>
+        <a href="#" class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
     </div>
 </body>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<!--<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
 <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script>
 try{
@@ -209,6 +213,7 @@ try{
     $(".orderCode").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
       if(r.success){
+      	
         //下单时间
         if(r.data.order.prepay_time) {
         	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));
@@ -288,6 +293,8 @@ try{
 	    		$(".cyclecount").text(year+"年");
 	    	}else if(year === 0&& month !==0){
 	    		$(".cyclecount").text(month+"个月");
+	    	}else {
+	    		$(".cyclecount").text("7天");
 	    	}
        }else{
        		//未支付
@@ -300,7 +307,7 @@ try{
 	      }
        }
         
-        if(r.data.order.order_status==0){
+        if(r.data.order.order_status==0){       	
           //未支付
           $("#pageTitle").text("待付款");
           $(".invoice").css("display","none");//隐藏开发票
@@ -388,8 +395,18 @@ try{
 //         		$(".align").css("display","").html("再次购买");
 //        	}
         }
-                
+       
       }
+      
+    	//倒计时 未购买
+		var create_time=r.data.order.create_time;
+		//create_time="2019-11-09 11:17:55";
+		var clock_end = +new Date(create_time) + 172800000;
+		setTimeFunc(clock_end); 
+		setInterval(function(){
+			setTimeFunc(clock_end);
+		},1000)
+		
       //调用微信支付接口
   		function onBridgeReady(res,ordercode){
   		   	WeixinJSBridge.invoke('getBrandWCPayRequest',{
@@ -457,6 +474,28 @@ try{
 	        ]
 	    });
 	}
+
+
+	// 参数为结束时间戳
+	function setTimeFunc (endtime){
+  		var t = endtime - +new Date();
+  		if (t <= 0) {
+  			$(".button").hide();
+  			$(".cancel_time").hide();
+  			$("#pageTitle").html("已取消");
+  		}
+  		//天时分秒
+		var days = parseInt(t / 1000 / 60 / 60 / 24 , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var hours = parseInt(t / 1000 / 60 / 60 % 24 , 10).toString().padStart(2, '0');; //计算剩余的小时 
+		var minutes = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		var seconds = parseInt(t / 1000 % 60, 10).toString().padStart(2, '0');;//计算剩余的秒数
+		//时分秒
+		var days_ = parseInt(t / 1000 / 60 / 60   , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var minutes_ = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		
+		//$(".cancel_time").text("（"+days+"天" + hours+"小时" + minutes+"分"+seconds+"秒）");
+		$(".cancel_time").text("剩余"+days_+":" + minutes_+":"+seconds+" ");
+	  }
   })
       
 </script>

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

@@ -356,6 +356,28 @@
                 },false)
               }
             {{end}}
+            
+             {{if eq .T.again 1 }}
+              //即将到期 回显已购买
+              if(!sessionStorage.getItem("vipSubSelectArea")||!sessionStorage.getItem("vipSubSelectIndustry")){
+                $DoPost("/subscribepay/editSub/getSubBuyMsg",{},function(r){
+                  if(r.success){
+                    if(!$.isEmptyObject(r.data.area)){
+                      purchase.areaSelect=r.data.area
+                    }else{
+                      purchase.areaSelect={"全国":[]}
+                    }
+                    if(r.data.industry.length!=0){
+                      purchase.industrySelect=r.data.industry
+                    }else{
+                      purchase.industrySelect=["全部行业"]
+                    }
+                    sessionStorage.setItem("vipSubSelectArea",JSON.stringify(purchase.areaSelect));
+                    sessionStorage.setItem("vipSubSelectIndustry",JSON.stringify(purchase.industrySelect));
+                  }
+                },false)
+              }
+            {{end}}
             if(sessionStorage.getItem("vipSubSelectTime")){
               this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
             }

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(){

src/web/templates/weixin/wxinfocontent.html

@@ -580,7 +580,7 @@ pre {
 					}
 			</script>
 		
-		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow_vip" >{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
+		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		</div>
 		{{else}}
 		<!--非VIP-->

src/web/templates/weixin/wxkeyset/index.html

@@ -138,6 +138,11 @@ $(function(){
 		if(!r || !r["a_key"]){
 			return;
 		}
+		if (r["a_key"].length>=10){
+			$(".open_remind").show();
+		}else{
+			$(".open_remind").hide();
+		}
 		for(var i=0;i<r["a_key"].length;i++){
 			var a_key = r["a_key"][i];
 			var key = a_key["key"];
@@ -194,8 +199,9 @@ $(function(){
 	}).on('compositionend', function(){
 	    $(this).prop('comStart', false);
 	}).blur(function(){
-		$("#ten").css("margin-bottom","1rem");
-		$(".vip_banner").show();
+		if(myArray.length>=10){
+			$("#ten").css("margin-bottom","1rem");
+		}
 		isfocusing = false;
 		var thisClass = $(this);
 		$(".keyword").attr("readonly",false);
@@ -218,13 +224,17 @@ $(function(){
 			$(".keyWordContent").removeClass('adjustment');
 			$(".keyWordGroup").show();
 			var valueArray = getKeyWords();
+			if (valueArray.length>=10){
+				$(".open_remind").show();
+			}else{
+				$(".open_remind").hide();
+			}
 			if(valueArray.length >= 1&&!disflag&&surpriseflag==""){
 				surswitch();
 			}
 		},300);
 	}).focus(function(){
 		$("#ten").css("margin-bottom","");
-		$(".vip_banner").hide();
 		$(".header,.keyWordContent").addClass("absolute");
 		if(focusinputindex != $(this).parents(".keyWordGroup").index()){
 			istiped = false;
@@ -292,7 +302,9 @@ $(function(){
     }
 	//
 	if(isIOS){
-		$("#ten").css("margin-bottom","1rem");
+		if(myArray.length>=10){
+			$("#ten").css("margin-bottom","1rem");
+		}
 	}
 });
 //
@@ -844,7 +856,7 @@ function tointroducepage(){
 		<span>您订阅的关键词包含特殊符号，可能会收不到推送信息。查看<a href="http://mp.weixin.qq.com/s/2u1rBaTZ7T_o8k7TbuM_fw">订阅帮助页面</a></span>
 	</div>
 	<div  class="msg_alert">
-		<div class="open_remind">
+		<div class="open_remind" style="display:none;">
             <div class="remind_box">
 				<i class="icon iconfont" id="close_set"></i>
                 <div class="remind_text">