Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

src/jfw/front/shorturl.go

@@ -6,7 +6,6 @@ import (
 	"jfw/jyutil"
 	"jfw/public"
 	"jfw/wx"
-	"log"
 	"math/rand"
 	"net/url"
 	"qfw/util"
@@ -35,7 +34,6 @@ var Map_stype = map[string]bool{
 }
 
 func (s *Short) Article(stype, id string) error {
-	log.Println("into Article..")
 	//先判断是否有session
 	source := s.GetString("source")
 	aboutUrl := "/swordfish/about"
@@ -92,7 +90,6 @@ func (s *Short) Article(stype, id string) error {
 		data1, _ := mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid}, `{"_id":1}`)
 		userId = util.BsonIdToSId((*data1)["_id"])
 	}
-	log.Println("bm---", bm)
 	if bm {
 		//判断有没有取关，取关的话，跳转到关于剑鱼标讯页面
 		if ssOpenid != nil && ssOpenid != "" {
@@ -138,7 +135,6 @@ func (s *Short) Article(stype, id string) error {
 		if util.IntAll((*res)["i_vip_status"]) == 1 || util.IntAll((*res)["i_vip_status"]) == 2 {
 			isVip = true
 		}
-		log.Println("isVip:----", isVip)
 		s.T["isVip"] = isVip
 		mynickname, _ := s.GetSession("s_nickname").(string)
 		myavatar, _ := s.GetSession("s_avatar").(string)

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)

src/jfw/front/vipsubscribe.go

@@ -226,12 +226,6 @@ func (s *Subscribepay) SubmitEditSubFinish() {
 
 //升级订阅服务
 func (s *Subscribepay) ToUpgradePage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
-	s.T["nickname"] = mynickname
-	s.T["avatar"] = myavatar
-	s.T["openid"] = se.EncodeString(myopenid)
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/vip_upgrade.html")
 }
@@ -283,12 +277,6 @@ func (s *Subscribepay) RenewPage(sign string) {
 
 //服务续费(will：即将到期，exprie：已到期)
 func (s *Subscribepay) RenewPayPage() {
-	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
-	s.T["nickname"] = mynickname
-	s.T["avatar"] = myavatar
-	s.T["openid"] = se.EncodeString(myopenid)
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url()) //微信支付准备参数
 	s.Render("/weixin/vipsubscribe/renew_pay.html")
 }

src/jfw/modules/app/src/app/front/myorder.go

@@ -24,7 +24,6 @@ type MyOrder struct {
 	paySuccess    xweb.Mapper `xweb:"/jyapp/front/myorder/paySuccess/(\\w+)"`          //支付成功发票
 	deleteOrder   xweb.Mapper `xweb:"/jyapp/front/myorder/deleteOrder"`                //删除订单
 	getOneMore    xweb.Mapper `xweb:"/jyapp/front/myorder/getOneMore"`                 //获取额外一条数据
-	//	testPay       xweb.Mapper `xweb:"/jyapp/front/myorder/testPay"`                    //模拟去支付
 	//我的邮箱
 	myEmail    xweb.Mapper `xweb:"/jyapp/front/myorder/myEmail"`    //我的邮箱
 	setSuccess xweb.Mapper `xweb:"/jyapp/front/myorder/setSuccess"` //查询订单
@@ -46,35 +45,6 @@ var (
 	order_pageSize          = 10
 )
 
-/*
-func (m *MyOrder) TestPay() error {
-	userId := m.Session().Get("userId")
-	order_code := m.GetString("orderCode")
-	testBl := false
-	queryMap := map[string]interface{}{}
-	if userId != nil {
-		log.Println("usid:", userId)
-		queryMap["order_code"] = order_code
-		queryMap["user_id"] = userId
-		now := time.Now()
-		testBl = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{
-			"pay_money":    1 * 100,
-			"order_status": 1,
-			"pay_time":     util.FormatDate(&now, util.Date_Full_Layout),
-			"download_url": "download_url",
-			"service_time": util.FormatDate(&now, util.Date_Full_Layout),
-		})
-
-	} else {
-		log.Println("userid为空")
-	}
-	log.Println("-----------", testBl, "-------------")
-	m.ServeJson(map[string]interface{}{
-		"testBl": testBl,
-	})
-	return nil
-}
-*/
 func (m *MyOrder) GetOneMore() error {
 	defer util.Catch()
 	pageNum, _ := m.GetInteger("pageNum")

src/jfw/modules/app/src/app/front/shorturl.go

@@ -38,6 +38,13 @@ func (s *Short) Article(stype, id string) error {
 	if b {
 		return s.Redirect("/jyapp/free/mob/err")
 	}
+	//判断用户是否是vip用户
+	isVip := false
+	vip_status, _ := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(userId), "i_vip_status": bson.M{"$in": []int{1, 2}}}) //获取vip标志
+	if len(*vip_status) == 1 {
+		isVip = true
+	}
+	s.T["isVip"] = isVip
 	surl := s.GetString("url")
 	kds := s.GetString("keywords")
 	industry := s.GetString("industry")
@@ -48,6 +55,7 @@ func (s *Short) Article(stype, id string) error {
 	} else {
 		sid = sid_openid[0]
 	}
+
 	s.T["keywords"] = kds
 	var obj map[string]interface{}
 	obj = wxvisitD(sid, userId)

src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -17,7 +17,7 @@ type Subscribepay struct {
 	toChooseArea      xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseArea"`      //订阅收费地区筛选
 	toChooseIndustry  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseIndustry"`  //订阅收费行业筛选
 	toPaySuccessPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toPaySuccessPage"`  //订阅支付完成页面
-	toOrderDetailPage xweb.Mapper `xweb:"/weixin/pay/toOrderDetailPage"`         //订阅收费支付订单详情页面
+	toOrderDetailPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toOrderDetailPage"` //订阅收费支付订单详情页面
 	toSetKeyWordPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
 	toSetPage         xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPage"`         //订阅收费设置
 	toSetInfoTypePage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetInfoTypePage"` //订阅收费设置信息类型

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_update.css

@@ -532,7 +532,7 @@
   float: left;
   width: 5rem;
   height: 100%;
-  color: #686868;
+  color: #000;
   font-size: 0.28rem;
   text-align: right;
   overflow: hidden;
@@ -541,6 +541,15 @@
   background-color: transparent;
 }
 
+.vip_update .choose_condition .chooseList .choose_item a .info::placeholder,
+.vip_update .choose_condition .pay_mode .choose_item a .info::placeholder {
+  color: #000;
+}
+
+.choose_item input:disabled, .choose_item input[disabled]{
+  opacity: 1;
+}
+
 .vip_update .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_update .choose_condition .pay_mode .choose_item a i.iconfont, .vip_renew .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_renew .choose_condition .pay_mode .choose_item a i.iconfont {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -459,7 +459,7 @@
 			function beforeJump(eid,isVipOrder){
 				setSessionStorage();
 				if (isVipOrder=="true"){
-					window.location.href="/weixin/pay/toOrderDetailPage?orderCode="+eid;
+					window.location.href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode="+eid;
 				}else{
 					window.location.href="/jyapp/front/myOrder/toOrderDetail?orderCode="+eid;
 				}
@@ -786,14 +786,14 @@
 		        		pay_way="ali_app";
 		        	}
 				});
-				
+				var canpay=true;
 				//确认支付
 				$(".surePay").on("click", function() {
 					$(".loading_").show();
 					let isvip_order=$(".media").attr("isviporder");
 					//vip支付；
 					if (isvip_order=="true"){
-						var orderCode =$(e).attr("orderCode");
+						var orderCode =$(".media").attr("orderCode");
 						if(!canpay)return  
 		            	canpay=false;
 			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode},function(r){

src/jfw/modules/app/src/web/templates/me/index.html

@@ -384,9 +384,9 @@
 		$(".vip_").click(function(){
 			$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
 				if (data.isvip){
-					window.location.href="/front/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
+					window.location.href="/jyapp/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
 				}else{
-					window.location.href="/front/vipsubscribe/introducePage";		//vip订阅入口  非vip
+					window.location.href="/jyapp/vipsubscribe/introducePage";		//vip订阅入口  非vip
 				}
 			})
 		})

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

@@ -800,8 +800,8 @@
             	let areas = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade);
             	for(var province in areas){
             		if(province === "全国"){
-            			console.log("23123")
-              			$(".other").trigger("click");
+            			$(".other").prop("checked",true);
+              			AreaChoose.reset();
             		}
             	}
             }

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

@@ -21,15 +21,15 @@
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.vip_update .fixed-bottom-box, .vip_renew .fixed-bottom-box {
 	    width: 100%;
 	    position: static;
 	    bottom: 0;
 	    left: 0;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 </style>
 <body class="no-touch">
 	<div class="app-layout-header">
@@ -70,7 +70,7 @@
                 <li class="choose_item select_cycle">
                     <a href="javascript:;">
                         <span class="label">延长订阅周期</span>
-                        <input type="text" value="" onfocus="this.blur();" placeholder="选择年、月" class="info choose_time">
+                        <input type="text" value="" disabled placeholder="选择年、月" class="info choose_time">
                         <!-- <span class="info choose_time">选择年、月</span> -->
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
@@ -750,19 +750,17 @@
 	        	times = 12 * Number(times.replace("年",""));
 	        }
 	    	//
-	    	let payTypes = sessionStorage.payTypes;
-            let payType = "";
-            if(payTypes === "wx"){
-            	payType = "wx_app";
-            }else if(payTypes === "alipy"){
-            	payType = "alipy_app";
+	    	let payTypes = $(".weixin_pay").text();
+            let payType = "wx_app";
+            if(payTypes === "支付宝支付"){
+            	payType = "ali_app";
             }
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
 	    		"area": JSON.stringify(area),
 	    		"industry": buyerclass.toString(),
 	    		"time": $('.choose_item.select_cycle .info').val(),
-	    		"payWay":payType,
+	    		"payWay": payType,
 	    		"pay_source": "Renew",
 	    		"endtime": ends,
 	    	}

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

@@ -0,0 +1,635 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>我的订单</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/weui/1.1.2/style/weui.css" />
+    <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/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_order_detail.css?v={{Msg "seo" "version"}}1">
+	
+	<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />   
+	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+</head>
+<style>
+	.person > p >span , .unit > p >span{
+		margin-bottom: .12rem;
+	}
+	
+	.jymobile-setting-dialog {
+  font-size: .32rem;
+}
+
+.jymobile-setting-dialog .weui-dialog__hd {
+  padding: 0;
+  height: 0.82rem;
+  line-height: .82rem;
+  text-align: center;
+  background-color: #F5F4F9;
+}
+
+.jymobile-setting-dialog .weui-dialog__hd .weui-dialog__title {
+  font-size: .36rem;
+}
+
+.jymobile-setting-dialog .weui-dialog__bd {
+  padding: .37rem .1rem .38rem;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft {
+  display: flex;
+  padding: 0 0 .38rem 0;
+  text-align: center;
+  justify-content: space-around;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft:after {
+  border: none;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn {
+  display: flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  width: 1.72rem;
+  height: .72rem;
+  color: #fff;
+  font-size: .32rem;
+  vertical-align: center;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn_primary {
+  margin: 0;
+  margin-left: .3rem;
+  background-color: #2CB7CA;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn_default {
+  margin: 0;
+  margin-right: .3rem;
+  background-color: #BFBFC3;
+}
+.cancel_time{
+	font-size: 16px;
+	margin-left: 20px;
+}
+
+.pay_way .box {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #fff;
+    height: 4.9rem;
+    z-index: 9999;
+}
+.pay_way .box .box_hd {
+    padding: 0 .4rem;
+    height: .88rem;
+    line-height: .88rem;
+    background: #F4F4F9;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    border-bottom: 1px solid #eee;
+}
+
+ .pay_way .box .box_bd p {
+    font-size: .32rem;
+}
+.pay_way .box .box_bd .zfb_label{
+	margin-bottom:.38rem;
+}
+ .pay_way .box .box_hd>h3 {
+    color: #1D1D1D;
+    font-size: .32rem;
+}
+.pay_way .box .box_hd .cancel {
+    color: #2cb7ca;
+    font-size: .32rem;
+}
+.pay_way .box .box_bd img {
+    width: .8rem;
+    height: .8rem;
+    margin-right: .3rem;
+}
+.pay_way .box .box_bd .wx_label, .pay_way .box .box_bd .zfb_label {
+    margin-top: .38rem;
+    padding: 0 .3rem;
+}
+.zfje{
+	font-size: .32rem;
+	margin: 0 auto;
+	
+}
+.money_pay{
+    font-size: .50rem;
+    text-align: center;
+    height: 1rem;
+    line-height: 1rem;
+}
+.surePay{
+	font-size: .40rem;
+    text-align: center;
+    height: 1rem;
+    line-height: 1rem;
+    background-color: #2CB7CA;
+    color: #fff;
+    margin-top:  0.28rem;
+}
+
+.weui-cells {
+    margin-top: 0px !important;
+    background-color: 
+	#fff;
+	line-height: 1.47058824;
+	font-size: 17px;
+	overflow: hidden;
+	position: relative;
+}
+
+.weui-cell::before {
+    content: " ";
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    height: 1px;
+    border-top: 0px solid #e5e5e5 !important;
+    border-top-color: 
+    rgb(229, 229, 229);
+    border-top-style: solid;
+    border-top-width: 5px;
+	color:#e5e5e5;
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    left: 15px;
+    z-index: 2;
+}
+</style>
+<body>
+ 	<div class="app-layout-header">
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+		订单详情
+	</div>
+	<div class="app-layout-content-b">
+	<div class="vip_order_detail">
+	        <main class="main">
+	            <div class="lists">
+	                <div class="card">
+	                    <div class="card-header">
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                        <h3 id="pageTitle"></h3>
+	                        <!-- <h3>待付款</h3> -->
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                    </div>
+	                    <div class="card-content">
+	                        <p class="text ellipsis">订单编号：<span class="orderCode"></span></p>
+	                        <p class="text ellipsis">下单时间：<span class="prepayTime"></span></p>
+	                        <!-- 订单状态为已完成时显示支付时间、支付方式和订单号，状态为待付款时不显示 -->
+	                        <p class="text ellipsis line_paytime" id="paytime" style="display:none">支付时间：<span class="payTime"></span></p>
+	                        <p class="text ellipsis line_payway"  style="display:none">支付方式：<span class="payWay"></span></p>
+	                        <p class="text ellipsis line_transaction"  style="display:none">支付单号：<span class="transaction_id"></span></p>
+	                        <p class="text ellipsis">产品类型：<span class="productType"></span></p>
+	                        <p class="text ellipsis" id="price">价格：￥<span class="price"></span></p>
+	                        <!----- 未开发票状态 ----->
+	                        <p class="text ellipsis invoice">发票：<a class="invoicing" style="display:none">开发票</a></p>
+	                        <!----- 已开发飘状态 ----->
+	                        <!--  单位发票-->
+	                        <div class="unit" style="display: none;">
+	                            <p><span>发票类型：</span><span>普通发票（电子发票）</span></p>
+	                            <p><span>发票内容：</span><span>明细</span></p>
+	                            <p><span>发票抬头：</span><span>单位</span></p>
+	                            <p><span>单位名称：</span><span class="company_name"></span></p>
+	                            <p><span>纳税人识别号：</span><span class="taxpayer_number"></span></p>
+	                        </div>
+	                        <!-- 个人发票 -->
+	                        <div class="person" style="display: none;">
+	                            <p><span>发票类型：</span><span>普通发票（电子发票）</span></p>
+	                            <p><span>发票内容：</span><span>明细</span></p>
+	                            <p><span>发票抬头：</span><span>个人</span></p>
+	                        </div>
+	                    </div>
+	                </div>
+	                <div class="card">
+	                    <div class="card-header">
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                        <h3>订阅条件</h3>
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                    </div>
+	                    <div class="card-content">
+	                        <div class="item-list">
+	                            <label>订阅区域：</label>
+	                            <ul class="item-list-parents">
+	                                <li class="areaNum"></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list">
+	                            <label>订阅行业：</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="industryNum"></span></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list">
+	                            <label>订阅周期：</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="cyclecount"></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list line_cycle" style="display:none">
+	                            <label>有效日期：</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="serviceTime"></span></li>
+	                            </ul>
+	                        </div>
+	                    </div>
+	                </div>
+	            </div>
+	        </main>
+			<div class="js_dialog pay_way" id="pay_way" style="display: none;">
+	            <div class="weui-mask"></div>
+	            <div class="box">
+	                <div class="box_hd">
+	                    <span  class="zfje">支付方式</span>
+	                    <div></div>
+	                    <span class="cancel">取消</span>
+	                </div>
+	               <!-- <div class="money_pay">
+	                	
+	                </div>-->
+	                <div class="box_bd">
+	                    <div class="weui-cells weui-cells_checkbox choose-form">
+	                        <label class="weui-cell weui-check__label wx_label" for="wx">
+	                            <div class="weui-cell__bd read">
+	                                <p><img src="/jyapp/dataExport/images/weixin.png">微信支付</p>
+	                            </div>
+	                            <div class="weui-cell__hd">
+	                                <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
+	                                <i class="weui-icon-checked"></i>
+	                            </div>
+	                        </label>
+	                        <label class="weui-cell weui-check__label zfb_label" for="zfb">
+	                            <div class="weui-cell__bd read">
+	                                <p><img src="/jyapp/dataExport/images/zhifubao.png">支付宝支付</p>
+	                            </div>
+	                            <div class="weui-cell__hd">
+	                                <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
+	                                <i class="weui-icon-checked"></i>
+	                            </div>
+	                        </label>
+	                    </div>
+	                    <div style="display: none;" class="param_dataType"></div>
+	                    <div style="display: none;" class="param_id"></div>
+	                    <div style="display: none;" class="this"></div>
+	                    <div style="display: none;" class="order_code_vip"></div>
+	                </div>
+	                <!--确认支付 --> 
+                    	<div class="surePay">
+                    		确认支付
+                    	</div>
+	            </div>
+	        </div>
+	        <!-- 当状态为待付款时显示去支付按钮 -->
+	        <!--当状态为已取消时显示再次购买按钮-->
+	        <a href="#" class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
+	    </div>
+	</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/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
+
+<script>
+  $(function(){
+    var canpay=true;
+    var orderCode=decodeURIComponent(getParam("orderCode"));
+    if(!orderCode){
+      weui.toast("订单号异常",{
+        duration: 2000,
+        className: 'custom-toast',
+	    });
+    }
+    $(".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("-","."));
+        }
+        //产品类型
+        if(r.data.order.product_type) $(".productType").text(r.data.order.product_type);
+        if(r.data.order.original_price==0){
+        	$(".productType").text(r.data.order.product_type+"（试用）");
+        }
+        //1 续费 2升级
+        if(r.data.order.vip_type==1){
+        	$(".productType").text(r.data.order.product_type+"（续费）");
+        }else if(r.data.order.vip_type==2){
+        	$(".productType").text(r.data.order.product_type+"（升级）");
+        }
+        //价格
+        $(".price").text(r.data.order.original_price/100);
+        
+        //订单条件        
+        if(r.data.order.filter){
+            var filterObj=JSON.parse(r.data.order.filter);
+            //省份数 城市数
+            if(!$.isEmptyObject(filterObj.area)){
+              var cityNum=0;
+              var provinceNum=0;
+              for(var i in filterObj.area) {
+                let citys=filterObj.area[i];
+                if(citys.length>0){
+                  cityNum+=citys.length;
+                }else{
+                  provinceNum++;
+                }
+              }
+              var areaText="";//1个省级区域、4个地市
+              if(provinceNum>0) areaText= areaText + provinceNum+"个省级区域";
+              if(cityNum>0){
+                if(provinceNum>0) areaText= areaText+"、"
+                areaText = areaText+ cityNum+"个地市";
+              }
+              $(".areaNum").text(areaText);
+            }else{
+              $(".areaNum").text("全国");
+            }
+         
+          
+          //行业数
+          if(filterObj.industry.length!=0){
+            $(".industryNum").text(filterObj.industry.length+"个行业");
+          }else{
+            $(".industryNum").text("全行业");
+          }
+          
+        }
+        
+        //周期
+       if((r.data.order.vip_starttime!=undefined)&&(r.data.order.vip_endtime!=undefined)){
+       		var start_time_vip = r.data.order.vip_starttime;
+       		var end_time_vip = r.data.order.vip_endtime;
+       		var start_time_arr = start_time_vip.split(" ")[0].split("-")
+       		var end_time_arr = end_time_vip.split(" ")[0].split("-")
+       		var start_year=start_time_arr[0];
+       		var start_month=start_time_arr[1];
+       		var end_year=end_time_arr[0];
+       		var end_month=end_time_arr[1];
+       		
+       		var year = 0;
+			var month = 0;
+			if(end_year > start_year){
+	    		if(end_month > start_month){
+    				year = end_year - start_year;
+    				month = end_month - start_month;
+	    		}else{
+    				year = end_year - start_year-1;
+    				month = 12+Number(end_month)-start_month;
+    				if (month==12){
+    					year=Number(year)+1;
+    					month=0;
+    				}
+	    		}
+	    	}else if(end_year === start_year){
+    			month = end_month - start_month;
+	    	}
+	    	
+	    	if(year != 0 && month !=0){
+	    		$(".cyclecount").text(year+"年"+month+"个月");
+	    	}else if(year !== 0&& month ===0){
+	    		$(".cyclecount").text(year+"年");
+	    	}else if(year === 0&& month !==0){
+	    		$(".cyclecount").text(month+"个月");
+	    	}else {
+	    		$(".cyclecount").text("7天");
+	    	}
+       }else{
+       		//未支付
+	      if(filterObj.cycleunit==1){
+	        $(".cyclecount").text(filterObj.cyclecount+"年")
+	      }else if(filterObj.cycleunit==2){
+	       $(".cyclecount").text(filterObj.cyclecount+"个月")
+	      }else if(filterObj.cycleunit==3){
+	           $(".cyclecount").text(filterObj.cyclecount+"天")
+	      }
+       }
+        
+        if(r.data.order.order_status==0){       	
+          //未支付
+	        $("#pageTitle").text("待付款");
+	        $(".invoice").css("display","none");//隐藏开发票
+	        $(".button.align").css("display","").on("click",function(){//显示去支付按钮
+	         	$("#pay_way").show();
+	        })
+        }else if (r.data.order.order_status==1){
+          $("#pageTitle").text("已完成");
+          //支付时间
+          $(".line_paytime").css("display","");
+          if(r.data.order.pay_time) $(".payTime").text(r.data.order.pay_time.replace("-",".").replace("-","."));
+          if (r.data.order.original_price==0){
+         	 $(".line_paytime").css("display","none");
+          }
+          
+          //有效周期
+          $(".line_cycle").css("display","");
+          //有效日期  
+          if(r.data.time.vip_starttime&&r.data.time.vip_endtime){
+            	var vip_starttime=r.data.time.vip_starttime+"";
+           		var vip_endtime=r.data.time.vip_endtime+"";
+           		vip_starttime=vip_starttime.split(" ")[0].replace(/-/g,".");
+           		vip_endtime=vip_endtime.split(" ")[0].replace(/-/g,".");
+           		var serviceTime=vip_starttime+" - "+vip_endtime;
+           	  	$(".serviceTime").text(serviceTime)
+          }
+          
+          //支付方式
+          if(r.data.order.pay_way.indexOf("wx")>-1){
+            $(".line_payway").css("display","");
+            $(".payWay").text("微信支付");
+          }else if(r.data.order.pay_way.indexOf("ali")>-1){
+            $(".payWay").text("支付宝支付");
+            $(".line_payway").css("display","");
+          }else{//试用用户
+            $(".invoice").css("display","none");
+            return
+          }
+			
+		//确认支付
+		$(".surePay").on("click", function() {
+			$(".loading_").show();
+			canpay = false;
+			var param = {};
+			var dataType=$(".param_dataType").text();
+			param.pay_way = pay_way;
+			param.data_spec = dataType == "高级字段包" ? "senior" : "standard";
+			param.id = $(".param_id").text();
+			param.sourcePage = "weixin"
+			//支付已经创建订单
+			$.post("/jypay/dataExport/app/createOrder", param, function(data) {
+				if (data.success){
+					try {
+		                if(pay_way=="wx_app"){
+		                  JyObj.wxPay(data.data)
+		                }else{
+		                  JyObj.aliPay(data.data)
+		                }
+		                $('.pay_way').hide(200);
+		                checkPaySuccess(data.order);
+					} catch (e) {
+						alert(e)
+					}
+				}
+	            $(".loading_").hide();
+	            canpay = true;
+			})
+		})
+
+          $(".line_transaction").css("display","");
+          if(r.data.transaction_id) $(".transaction_id").text(r.data.transaction_id);
+          //发票
+          if(r.data.order.applybill_status==0){ 
+            //已支付未申请发票
+            $(".invoice .invoicing").css("display","");
+            $(".invoicing").on("click",function(){
+            	var nowTimestamp= (new Date()).valueOf();
+            	$.post("/subscribepay/orderListDetails/emailOperation?v="+nowTimestamp,{},function(r){
+					if (r.success){
+						//没有绑定邮箱
+						weuiDialog();
+					}else{
+						//绑定了邮箱
+						window.location.href="/front/vipsubscribe/openInvoice/"+orderCode;
+					}
+				})
+            });
+          }else{
+            //已支付已申请发票
+			      $(".invoice").css("display","none");
+            switch (r.data.order.applybill_type){
+            	case 0:
+            	$(".person").css("display","");
+            	break;
+            	case 1:
+            	$(".unit").css("display","");
+            	$(".company_name").html(r.data.order.applybill_company);
+            	$(".taxpayer_number").html(r.data.order.applybill_taxnum);
+            	break;
+            }
+
+          } 
+        }else if(r.data.order.order_status==-2){
+    		$("#pageTitle").text("已取消");
+     		$(".invoice").css("display","none");//隐藏开发票
+        }
+       
+      }
+      	
+      	if (r.data.order.order_status==0){
+	    	//倒计时 未购买
+			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 formatEffectiveDate(strat,end){
+        var startDate = new Date(strat*1000);
+        var endDate = new Date(end*1000);
+        return formatDate(startDate)+" - "+formatDate(endDate)
+    }
+    function formatDate(d){
+	    return (d.getFullYear()) + "." + 
+	    (Array(2).join(0)+(d.getMonth() + 1)).slice(-2) + "." +
+	    (Array(2).join(0)+(d.getDate())).slice(-2);
+    }
+    
+	function weuiDialog(){
+		weui.dialog({
+			title: '提示信息',
+			content: '您未绑定邮箱<br/>请绑定后再开发票',
+	        className: 'jymobile-setting-dialog',// 设置弹框的类名
+	        buttons: [
+	        {
+	        	label: '去设置',
+	        	type: 'primary',
+	        	onClick: function () {
+	        		window.location.href="/front/wxMyOrder/myEmail?name=invoice&orderCode="+orderCode;
+	        	}
+	        },
+	        {
+	        	label: '取消',
+	        	type: 'default',
+	        	onClick: function () {
+	        		console.log('取消')
+	        	}
+	        }
+	        ]
+	    });
+	}
+
+
+	// 参数为结束时间戳
+	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+" ");
+	  }
+  })
+      
+  //苹果端  刷新js
+  $(function () {    
+		var isPageHide = false;   
+		window.addEventListener('pageshow', function () {      
+		    if (isPageHide) {
+                location.reload();
+		    }    
+		});    
+		window.addEventListener('pagehide', function () {
+		    isPageHide = true;
+		});  
+	});
+</script>
+	{{include "/common/baiducc.html"}}
+</html>	

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

@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/jyapp/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}4">
+    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
 </head>
@@ -22,15 +22,15 @@
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.vip_update .fixed-bottom-box, .vip_renew .fixed-bottom-box {
 	    width: 100%;
 	    position: static;
 	    bottom: 0;
 	    left: 0;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 </style>
 <body class="no-touch">
 	<div class="app-layout-header">
@@ -45,7 +45,7 @@
                 <li class="choose_item">
                     <a href="/jyapp/vipsubscribe/toChooseAreaUpgrade">
                         <span class="label">区域</span>
-                        <input type="text" id="area" value="" onfocus="this.blur();" placeholder="选择全国、省份、地市" class="info">
+                        <input type="text" id="area" value="" disabled placeholder="选择全国、省份、地市" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips area-list" style="display: none;">已新增 1 个省级区域、4 个地市</p>
@@ -53,7 +53,7 @@
                 <li class="choose_item">
                     <a href="/jyapp/vipsubscribe/toChooseIndustryUpgrade">
                         <span class="label">行业</span>
-                        <input type="text" id="buyerclass" onfocus="this.blur();" value="" placeholder="选择采购单位行业" class="info">
+                        <input type="text" id="buyerclass" disabled value="" placeholder="选择采购单位行业" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips industry-list" style="display: none;">已新增 2 个行业</p>
@@ -863,7 +863,7 @@
 					if(checkObj(area)){
 						areaHtml = "全国";
 					}
-			    	$('#area').val(areaHtml);
+			    	$('#area').attr("placeholder",areaHtml);
 			    }
 			    if(buyerclass !== "" && buyerclass !== undefined){
 			    	for(var i in buyerclass){
@@ -875,7 +875,7 @@
 					if(checkObj(buyerclass)){
 						buyerclassHtml = "全行业";
 					}
-					$('#buyerclass').val(buyerclassHtml);
+					$('#buyerclass').attr("placeholder",buyerclassHtml);
 			    }
 			    //
 			    var nowDate = data.now.replace(/-/g, ".");
@@ -1205,12 +1205,10 @@
             	times = $('.choose_item.lengthen .info').text();
             }
             //
-            let payTypes = sessionStorage.payType;
-            let payType = "";
-            if(payTypes === "wx"){
-            	payType = "wx_app";
-            }else if(payTypes === "alipy"){
-            	payType = "alipy_app";
+            let payTypes = $(".weixin_pay").text();
+            let payType = "wx_app";
+            if(payTypes === "支付宝支付"){
+            	payType = "ali_app";
             }
             //
 	    	var param = {

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 {

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

@@ -186,17 +186,23 @@ func (a *AfterPay) SetUserInfo() error {
 				_kws := strings.Split(kws_name, " ")
 				if actionType == "SK" { //保存关键词
 					if len(addtion_kws) > 0 {
-						for _, addval := range addtion_kws {
+						for i, addval := range addtion_kws {
 							if len([]rune(addval)) > 20 {
 								addval = qutil.SubString(addval, 0, 20)
 							}
+							if addval == "" {
+								addtion_kws = append(addtion_kws[:i], addtion_kws[i+1:]...)
+							}
 						}
 					}
 					if len(not_kws) > 0 {
-						for _, notval := range not_kws {
+						for i, notval := range not_kws {
 							if len([]rune(notval)) > 20 {
 								notval = qutil.SubString(notval, 0, 20)
 							}
+							if notval == "" {
+								not_kws = append(not_kws[:i], not_kws[i+1:]...)
+							}
 						}
 					}
 					if kwscount != "0" {

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;

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;

src/web/staticres/vipsubscribe/css/trial_info.css

@@ -1,22 +1,21 @@
 
 .trial_info {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
   width: 100%;
   height: 100%;
-  overflow: hidden;
-  padding-bottom: .94rem;
+  overflow-x: hidden;
 }
 
 .trial_info .form {
+  flex: 1;
   width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  flex-direction: column;
+  overflow-y: scroll;
 }
 
 .trial_info .trial_body {
-  overflow-y: scroll;
-  flex: 1;
   background: #34355A;
 }
 
@@ -183,8 +182,8 @@
 }
 
 .trial_info .trial_btn{
-	position: fixed;
-	bottom: 0;
+	/*position: fixed;*/
+	/*bottom: 0;*/
 	width: 100%;
 	background: #fff;
 }

src/web/staticres/vipsubscribe/css/vip_update.css

@@ -532,7 +532,7 @@
   float: left;
   width: 5rem;
   height: 100%;
-  color: #686868;
+  color: #000;
   font-size: 0.28rem;
   text-align: right;
   overflow: hidden;
@@ -541,6 +541,15 @@
   background-color: transparent;
 }
 
+.vip_update .choose_condition .chooseList .choose_item a .info::placeholder,
+.vip_update .choose_condition .pay_mode .choose_item a .info::placeholder {
+  color: #000;
+}
+
+.choose_item input:disabled, .choose_item input[disabled]{
+  opacity: 1;
+}
+
 .vip_update .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_update .choose_condition .pay_mode .choose_item a i.iconfont, .vip_renew .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_renew .choose_condition .pay_mode .choose_item a i.iconfont {

src/web/staticres/vipsubscribe/js/additionWord.js

@@ -39,7 +39,7 @@ $(function(){
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.addkeyWord input.enterOne').on('input', function() {
         var buttonDOM = $(this).siblings().find('button')[1]
-        if ($(this).val().length >= 1) {
+        if ($.trim($(this).val()).length >= 1) {
             buttonDOM.style.opacity = 1
             buttonDOM.removeAttribute("disabled")
         } else {
@@ -51,8 +51,13 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn button:nth-child(2)').on('click', function(){
         var timestamp = new Date().getTime();//动态生成不同的id，因为id唯一不能重复，所以 用时间戳 代替  防止重复
-        var keyWord = $('.addkeyWord input.enterOne').val();
-		if(keyWord==""){
+        var keyWord = $.trim($('.addkeyWord input.enterOne').val());
+		if(keyWord==""&&keyWord.length==0){
+            weui.toast('附加词不能为空', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
 			return
 		}
 		_addindex = 0;
@@ -114,7 +119,7 @@ $(function(){
     // 编辑 删除
     $('.showKeyWord').on('click', '.deleteKey', function(e) {
         var jQueryDOM = $(this).parents('li');
-        _addkws = $(this).siblings('textarea').val();
+        _addkws = $.trim($(this).siblings('textarea').val());
 		var _index =  $('.showKeyWord li').length - $(this).parent().parent("li").index() -1;
         weui.confirm('确定要删除附加词？', {
             buttons: [{
@@ -134,9 +139,15 @@ $(function(){
     })
     // 编辑 确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-        var keyWord = $(this).siblings('textarea').val();
+        var keyWord = $.trim($(this).siblings('textarea').val());
 		var _index =  $('.showKeyWord li').length - $(this).parent().parent("li").index() -1;
-        if(keyWord.length > 20){
+		if(keyWord.length==0){
+            weui.toast('附加词不能为空', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
+		}else if(keyWord.length > 20){
             weui.toast('每组附加词不能超过20字', {
                 duration: 2000,
                 className: 'custom-toast',

src/web/staticres/vipsubscribe/js/exclusiveWord.js

@@ -43,7 +43,7 @@ $(function(){
         }
 
         var buttonDOM = $(this).siblings().find('button')[1]
-        if ($(this).val().length >= 1) {
+        if ($.trim($(this).val()).length >= 1) {
             buttonDOM.style.opacity = 1
             buttonDOM.removeAttribute("disabled")
         } else {
@@ -63,7 +63,15 @@ $(function(){
     // 添加 按钮的点击事件
    
     $('.addkeyWord .btn button:nth-child(2)').on('click', function(){
-        var keyWord = $('.addkeyWord input.enterOne').val()
+        var keyWord = $.trim($('.addkeyWord input.enterOne').val());
+		if (keyWord==""){
+            weui.toast('排除词不能为空', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
+			return
+		}
 		_notindex = 0;
 		if($(".showKeyWord li").length>0){
         	_notindex = Number($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex")) + Number(1);
@@ -123,7 +131,7 @@ $(function(){
     // 编辑 删除
     $('.showKeyWord').on('click', '.deleteKey', function(e) {
         var jQueryDOM = $(this).parents('li');
-        _notkws = $(this).siblings('textarea').val();
+        _notkws = $.trim($(this).siblings('textarea').val());
 		var _index =  $('.showKeyWord li').length - $(this).parent().parent("li").index() -1;
         weui.confirm('确定要删除排除词？', {
             buttons: [{
@@ -145,9 +153,15 @@ $(function(){
     // 编辑 确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var $this = $(this);
-        var keyWord = $(this).siblings('textarea').val();
+        var keyWord = $.trim($(this).siblings('textarea').val());
 		var _index =  $('.showKeyWord li').length - $(this).parent().parent("li").index() -1;
-        if(keyWord.length > 20){
+		if(keyWord.length ==0){
+            weui.toast('排除词不能为空', {
+                duration: 2000,
+                className: 'custom-toast',
+                callback: function () { console.log('close') }
+            });
+        }else if(keyWord.length > 20){
             weui.toast('每组排除词不能超过20字', {
                 duration: 2000,
                 className: 'custom-toast',

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

@@ -177,7 +177,7 @@ var reloadFunc = function(){
         }
         $('.enter.addkeyWord').hide()
         let oSpan = $(this).parent().siblings().children('textarea');
-        let val = $(oSpan).val()
+        let val =  $.trim($(oSpan).val());
         $(this).parent().hide()
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
         $(oSpan).val('').focus().val(val) 
@@ -306,7 +306,9 @@ var reloadFunc = function(){
         $('.classify-edit-pop').hide();
         $('input.classify-keyword').val('');
         if($(".showKeyWord li").length>0){
+			kws_name = classify_name;
             saveData('SC')
+			kws_name = "";
             a_items[classify_index]["s_item"] = classify_name;
         }
     })

src/web/templates/weixin/historypush.html

@@ -161,6 +161,7 @@
 					}
 				});
 				if(firstPage!=null&&firstPage.length>0){
+					$(".findnull_").hide();
 					$("#list").css("visibility","hidden");
 					dataCache = dataCache.concat(firstPage);
 					structureHtml(firstPage,true);
@@ -571,6 +572,7 @@
 				$(".loading_").css("display","none");
 				return;
 			}
+			$(".findnull_").hide();
 			$("#list").css("visibility","hidden");
 			//dataCache = firstPage;
 			$("#list").html("");
@@ -779,6 +781,7 @@
 			/**/
 			overflow: hidden;
 			height:100vh;
+			overflow-y:scroll;
 		}
 		.buyerclass {
 		    border: 1px solid #CFAD89;
@@ -1017,6 +1020,16 @@
         		ajaxFun("",selectCity);
         	}
         }
+		//
+		var _scrollTop = 0;
+		function scrollHtml(){
+			if($(".subscribe").hasClass('overClass')){
+				$(".subscribe").scrollTop(_scrollTop);
+			}else{
+				$("body").scrollTop(_scrollTop);
+				_scrollTop =0;
+			}
+		}
 		//禁止默认行为方法
 		function stopScroll(e) {
 		    e.preventDefault()
@@ -1084,12 +1097,16 @@
             });
             // 选择地区
             $('#showArea').on('click', function (){
+				if(_scrollTop==0){
+					_scrollTop = scrollTop;
+				}
+            	$(".subscribe").toggleClass('overClass');
+				scrollHtml();
 				if(sessionStorage.getItem(userId+"_selectCityName")==""||sessionStorage.getItem(userId+"_selectCityName")==undefined){
 					$(this).find("span").toggleClass("current");
 				}
             	$('.area_container').slideToggle();
             	$('.screen').toggle();
-            	$(".subscribe").toggleClass('overClass');
             })
             // 地区省份选择的操作
             $('.province .p_item').click(function(){
@@ -1117,9 +1134,10 @@
             })
             //
             $('.screen').click(function(){
-				 $('#showArea').find("span").toggleClass("current");
-            	$('.area_container').slideUp();
             	$(".subscribe").toggleClass('overClass');
+				scrollHtml();
+				$('#showArea').find("span").toggleClass("current");
+            	$('.area_container').slideUp();
             	$('.screen').hide();
             })
             // 地区选择确认按钮

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>

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

@@ -14,6 +14,8 @@
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
 	{{include "/common/weixin.html"}}
+	<!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style type="text/css">
 	body,html {
@@ -363,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>
@@ -589,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}(`
@@ -625,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{
@@ -795,8 +797,8 @@
             	let areas = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade);
             	for(var province in areas){
             		if(province === "全国"){
-            			console.log("23123")
-              			$(".other").trigger("click");
+              			$(".other").prop("checked",true);
+              			AreaChoose.reset();
             		}
             	}
             }

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

@@ -12,7 +12,8 @@
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
         <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         {{include "/common/weixin.html"}}
-        
+        <!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+    	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style type="text/css">
     	body,html {
@@ -242,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>
@@ -291,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()

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

@@ -16,28 +16,44 @@
         <div class="edit_success">
             <div><i class="icon iconfont success">&#xe612;</i></div>
             <p>修改成功</p>
-            <button class="public_btn" id="back">返回(<em class="time">3</em>)</button>
+            <button class="public_btn" id="back">返回<em class="time"></em></button>
         </div>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
         <script>
-            function timer(obj,callback) { 
+
+            $(function(){
+//              timer($('.time'),()=>{
+//                  window.history.go(-1); 
+//              })
+				countDown();
+                $('#back').click(function () {  
+                    window.history.go(-1); 
+                })
+            })
+       		var time =3;
+        	function countDown(){
+				if(time == 0){
+					$('.time').html('');
+					  window.history.go(-1); 
+				}else{
+					 $('.time').html('(' + time + ')');
+					time--;
+					setTimeout(()=>{
+						countDown()
+					},1000)
+				}
+			}
+        	
+        	function timer(obj,callback) { 
                 let t = 3; 
                 let timer = setInterval(() => {
                     t--;
                     obj.html(t)
-                    if(t == 0){
+                    if(t == 1){
                         callback()
                     }
                 }, 1000);
             }
-            $(function(){
-                timer($('.time'),()=>{
-                    window.history.go(-1); 
-                })
-                $('#back').click(function () {  
-                    window.history.go(-1); 
-                })
-            })
         </script>
     </body>
 </html>

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

@@ -417,7 +417,7 @@
                     if(keystr!=""){
                         keystr += "、"
                     }
-                    keystr += a_key[j]["key"].join('、');
+                    keystr += a_key[j]["key"].join(' ');
 					kws_arr[a_key[j]["key"].join(' ')]=j+"-"+i
                 } 
                 classifyHtml +='<li class="classify-item">'
@@ -448,7 +448,6 @@
         }
         //修改关键词内容
         function toSetKws(){
-			console.log(kws_index)
             //分类列表进入
             if(kws_index==-1){
                 var edhtml = '<input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20">'
@@ -571,13 +570,13 @@
         //跳转附加词
         function toappendkey(th){
             if(!$('.enter.addkeyWord').is(':hidden')){
-                if($('.addkeyWord input.enterOne').val()==""){
+                if($.trim($('.addkeyWord input.enterOne').val())==""){
                     return
                 }
                 kws_index = -1
                 kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
-               if($(th).parent(".modify").find("textarea").val()==""){
+               if($.trim($(th).parent(".modify").find("textarea").val())==""){
                  return
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
@@ -589,13 +588,13 @@
         //
         function tonotkey(th){
             if(!$('.enter.addkeyWord').is(':hidden')){
-                if($('.addkeyWord input.enterOne').val()==""){
+                if($.trim($('.addkeyWord input.enterOne').val())==""){
                     return
                 }
                 kws_index = -1
                 kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
-               if($(th).parent(".modify").find("textarea").val()==""){
+               if($.trim($(th).parent(".modify").find("textarea").val())==""){
                  return
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
@@ -840,7 +839,11 @@
                 $(".add-keyword-container .addNewKeyword i").hide();
                 $('.add-keyword-container').show();
                 $('.all-classify-column').hide();
-                
+                //
+				kws_index = 0;
+				modifyFlag = false;
+				addition_kws = [];
+				not_kws = [];
                 // 显示添加关键词的输入框
                 $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
                 $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 排除词');

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

@@ -4,17 +4,26 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>VIP订阅</title>
-		<script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<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"}}1">
+		<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.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"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}1">
 		{{include "/common/weixin.html"}}
+		<!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
+		<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	<style type="text/css">
 		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">
@@ -51,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>
@@ -127,8 +137,9 @@
 						    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
 					    	}
 					    }else{
-					    	$(".renew_service").show();
-					    	$(".free_service").show();
+//					    	$(".renew_service").show();
+					    	$(".aginBuy").show();
+					  	  	$(".free_service").show();
 					    }
 					}
 				});
@@ -196,7 +207,8 @@
 					    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
 					    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
 					    }else{
-					    	$(".renew_service").show();
+//					    	$(".renew_service").show();
+							$(".aginBuy").show();
 					    	$(".free_service").show();
 					    }
 					}

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

@@ -13,16 +13,13 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}5">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.weixin_pay{
 		padding-right: 3px;
 	}
@@ -36,12 +33,12 @@
 	    -webkit-overflow-scrolling: touch;
 	    height: 100%;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 	
 </style>
 <body class="no-touch">
-	<script type="text/javascript">
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
     <div class="vip_renew">
         <div class="choose_condition">
              <!-- 正常点击vip首页续费进入显示下列提示 -->
@@ -75,7 +72,7 @@
                 <li class="choose_item select_cycle">
                     <a href="javascript:;">
                         <span class="label">延长订阅周期</span>
-                        <input type="text" value="" onfocus="this.blur();" placeholder="选择年、月" class="info choose_time">
+                        <input type="text" value="" disabled placeholder="选择年、月" class="info choose_time">
                         <!-- <span class="info choose_time">选择年、月</span> -->
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
@@ -599,7 +596,6 @@
 			    monthPrice = getsubVipOrderPrice(area, buyerclass, [1, 2]);
 			    yearPrice = getsubVipOrderPrice(area, buyerclass, [1, 1]);
 			    //
-			    var areaArr = [];
 			    var areaHtml = "";
 			    var provinceArr = [];
 			    var cityArr = [];
@@ -612,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 = "全国";
@@ -633,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 = "全行业";
@@ -701,9 +697,6 @@
 			 		$(".renew_update").hide();
 			 		$(".renew_upgrade").show();
 			 	}
-			 	//
-			 	var provinceLen = provinceArr.length;
-			 	var cityLen = cityArr.length;
 		    }
         }, false);
         //

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

@@ -15,9 +15,9 @@
     <link rel="stylesheet" href="/vipsubscribe/css/trial_info.css?v={{Msg "seo" "version"}}">
 </head>
 
-<body style="height: 100vh">
+<body style="height: 100vh; background: #34355A;">
 <div class="trial_info">
-    <form class="form" id="formInfo">
+    <form class="form">
         <div class="trial_body">
             <div class="banner">
                 <div class="shadow"></div>
@@ -70,13 +70,12 @@
                 <p class="explain_item">3、如用户在试用期间购买付费套餐，则试用权限在购买支付后自动失效。</p>
             </div>
         </div>
-        <div class="trial_btn">
-            <!-- 未完善个人信息展示的按钮 type类型为submit-->
-            <button class="btn" type="submit">立即免费试用</button>
-            <!-- 已完善过个人信息 展示的按钮 type类型为button -->
-        </div>
-
     </form>
+    <div class="trial_btn">
+        <!-- 未完善个人信息展示的按钮 type类型为submit-->
+        <button class="btn" type="submit">立即免费试用</button>
+        <!-- 已完善过个人信息 展示的按钮 type类型为button -->
+    </div>
 </div>
 {{include "/common/weixin.html"}}
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
@@ -162,7 +161,7 @@
             }
         });
         //提交
-        $('#formInfo').submit(function (e) {
+        $(".btn").on("click",function (e) {
             var name = $('.name').val();
             var tel = $('.phone').val();
             var code = $('.phonecode').val();
@@ -181,41 +180,59 @@
                     window.location.replace("/weixin/pay/vipsubscribe_trial");
                 }
             });
-            return false;
         });
     });
 
     // 解决移动端软键盘弹起遮挡输入框及ios下软键盘关闭后底部留白问题
     function scrollView(obj) {
-        var view_height = $(document.body).height()
+        let u = navigator.userAgent, app = navigator.appVersion;
+        let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
 
+        var view_height = $(document.body).height()
         function change() {
             $(document.body).height(view_height)
         }
+        // 给所有input绑定一个focus事件，用来判断键盘弹起。执行完成就解绑该事件
+        function focusOnce() {
+            $('.' + obj).on('focus', function(e) {
+                e.target.scrollIntoView({"block": "center"})
+                $('.' + obj).off('focus')
+            })
+        }
 
-        change();
-        window.addEventListener('resize', change);
+
+        if (isAndroid) {
+            // 在安卓中键盘弹起会触发window.resize事件
+            // ios中则不会触发window.resize事件
+            change();
+            window.addEventListener('resize', change);
+        } else {
+            // 进入页面绑定，触发一次就解绑
+            focusOnce()
+        }
+        
+        
         $('.' + obj).on('blur', function (e) {
             setTimeout(() => {
                 let dom = document.activeElement;
-                // console.dir(dom);
                 if (dom.className.includes(obj)) {
-                    let u = navigator.userAgent, app = navigator.appVersion;
-                    let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
                     if (isAndroid) {
                         dom.scrollIntoView({"block": "center"})
+                    } else {
+                        // dom.scrollIntoView({"block": "bottom"})
                     }
-
                 } else {
                     window.scroll(0, 0)
+                    // 当页面上没有获得焦点的input时候就说明键盘收起来了。
+                    // 给input绑定focus事件用来监听其弹起
+                    focusOnce()
                 }
             }, 50)
         })
     }
     {{else}}
-    $('#formInfo').submit(function (e) {
+    $(".btn").on("click",function (e) {
         window.location.replace("/weixin/pay/vipsubscribe_trial");
-        return false;
     });
     {{end}}
 

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

@@ -292,10 +292,18 @@
 							//地区
 							var area = _vipData["o_area"];
 							var _area = getAreaClassArr_index(area)
-	                        $("._area").text(_area.join("、"));
+							if (_area.length>0){
+	                        	$("._area").text(_area.join("、"));
+							}else{
+	                        	$("._area").text("全国");
+							}
 							//行业
 							var buyerclass =  SortArr(_vipData["a_buyerclass"]);
-	                        $("._buyerClass").text(buyerclass.join("、"));
+							if (buyerclass.length>0){
+	                        	$("._buyerClass").text(buyerclass.join("、"));
+							}else{
+	                        	$("._buyerClass").text("全部行业");
+							}
 	                        $("._cycleCount").text(_vipData["cycle"]);
 	                        $("._activeDate").text(_userData["l_vip_starttime"]+" - "+_userData["l_vip_endtime"]);
 	                        if(_vipData["a_infotype"]==""){

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

@@ -14,16 +14,13 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}4">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.weixin_pay{
 		padding-right: 3px;
 	}
@@ -37,12 +34,12 @@
 	    -webkit-overflow-scrolling: touch;
 	    height: 100%;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 	
 </style>
 <body class="no-touch">
-	<script type="text/javascript">
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
     <div class="vip_update">
         <div class="choose_condition">
             <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期!</p>
@@ -50,7 +47,7 @@
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseAreaUpgrade">
                         <span class="label">区域</span>
-                        <input type="text" id="area" value="" onfocus="this.blur();" placeholder="选择全国、省份、地市" class="info">
+                        <input type="text" id="area" value="" disabled placeholder="选择全国、省份、地市" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips area-list" style="display: none;">已新增 1 个省级区域、4 个地市</p>
@@ -58,7 +55,7 @@
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseIndustryUpgrade">
                         <span class="label">行业</span>
-                        <input type="text" id="buyerclass" onfocus="this.blur();" value="" placeholder="选择采购单位行业" class="info">
+                        <input type="text" id="buyerclass" disabled value="" placeholder="选择采购单位行业" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips industry-list" style="display: none;">已新增 2 个行业</p>
@@ -70,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">
@@ -134,8 +131,7 @@
                         </table>
                         <dl class="tips">
                             <dt>购买须知：</dt>
-                            <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
-                            <dd>用户最多购买/续费3年套餐；</dd>
+                            <dd>套餐周期内，不支持套餐降级，即将到期时续费可降级；</dd>
                             <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
                         </dl>
                     </div>
@@ -243,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">
@@ -276,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>
@@ -446,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();
+//      });
         
         
         // 选择周期
@@ -822,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;
@@ -896,7 +892,7 @@
 	    var starts = "";
 	    var endTime = "";
 	    var ends = "";
-	    var isvalidOk = "";
+//	    var isvalidOk = "";
 	 	$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             if (data) {
                 area = data.area;
@@ -907,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 = "";
@@ -920,45 +917,47 @@
 			    		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').val(areaHtml);
+			    	$('#area').attr("placeholder",areaHtml);
 			    }
 			    if(buyerclass !== "" && buyerclass !== undefined){
 			    	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').val(buyerclassHtml);
+					$('#buyerclass').attr("placeholder",buyerclassHtml);
 			    }
 			    //
 			    var nowDate = data.now.replace(/-/g, ".");
 			    var a = nowDate+ " - " +endTime;
 			    $(".nownow").text(nowDate+ " - " +endTime.replace(/-/g, "."))
 			    //
-			    if(!isvalidOk){
-			    	var effectiveName = new Date().getMonth()+2;
-		    		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);
         //
@@ -982,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;
@@ -1086,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){
@@ -1249,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;
@@ -1288,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){
@@ -1311,7 +1310,7 @@
 	    	sessionStorage.removeItem("proPrice");
 	    	sessionStorage.removeItem("vipSubSelectAreaUpgrade");
 	    	sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
-	    	sessionStorage.removeItem("effectiveDate");
+//	    	sessionStorage.removeItem("effectiveDate");
 	    	sessionStorage.removeItem("buyCheck");
 	    }
 	    

src/web/templates/weixin/wxinfocontent.html

@@ -496,7 +496,7 @@ pre {
 }
 
 .time_label{
-	margin-top:5px;
+	margin-top:10px;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;

src/web/templates/weixin/wxinfocontent_rec.html

@@ -445,6 +445,12 @@ pre {
 .toolbar .follow i,.toolbar .follow_vip i{
 	top: 2px;
 }
+.time_label {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
 </style>
 </head>
 <body>
@@ -521,7 +527,7 @@ pre {
 						}
 					}
 			</script>
-		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:-21px !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}}
+		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:0px !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-->
 		<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="area">'+area+'</span>');}</script>