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

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

@@ -41,14 +41,17 @@ func (m *Me) MeIndex() error {
 	} else {
 		m.T["pullnew"] = false
 	}
+	userid := qutil.ObjToString(m.GetSession("userId"))
 	//检测用户是否绑定邮箱
-	res, err := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(qutil.ObjToString(m.GetSession("userId")))})
-	if len(*res) > 0 && err {
-		if qutil.ObjToString((*res)["s_myemail"]) == "" {
-			m.T["isNoEmail"] = true
-		}
-		if qutil.Int64All((*res)["i_vip_status"]) == 1 || qutil.Int64All((*res)["i_vip_status"]) == 2 {
-			m.T["isVip"] = true
+	if userid != "" {
+		res, err := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(userid)})
+		if len(*res) > 0 && err {
+			if qutil.ObjToString((*res)["s_myemail"]) == "" {
+				m.T["isNoEmail"] = true
+			}
+			if qutil.Int64All((*res)["i_vip_status"]) == 1 || qutil.Int64All((*res)["i_vip_status"]) == 2 {
+				m.T["isVip"] = true
+			}
 		}
 	}
 	return m.Render("/me/index.html", &m.T)

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

@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -674,7 +678,7 @@ $(function () {
 		}
 		let showCount = selectedCityLength - dataCount;
 		if(showCount > 2){
-			$(".tips_d_text").text("已选择"+showCount+"个市，建议购买“全省”");
+			$(".tips_d_text").text("已新增"+showCount+"个市，建议新增“全省”");
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();
@@ -686,7 +690,6 @@ $(function () {
 	
 	function showOther(){
 		let showCounts = newlyAdded.province;
-		console.log(showCounts)
 		if(showCounts > 9){
 			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();

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

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

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

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

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

@@ -164,7 +164,6 @@ func (a *AfterPay) DirectSubKWS() error {
 			} else if kwsCount >= 300 {
 				flag = "m"
 			} else {
-				//首次添加分类和关键词
 				var _key = make(map[string]interface{})
 				var a_key = make([]map[string]interface{}, 1)
 				classify_name := "未分类"
@@ -269,6 +268,7 @@ func (a *AfterPay) SetUserInfo() error {
 			actionType := a.GetString("actionType")
 			addtion_kws := a.GetSlice("addition_kws")
 			not_kws := a.GetSlice("not_kws")
+			kwscount := a.GetString("kwscount")
 			if len([]rune(kws_name)) > 20 {
 				kws_name = qutil.SubString(kws_name, 0, 20)
 			}
@@ -295,27 +295,36 @@ func (a *AfterPay) SetUserInfo() error {
 							}
 						}
 					}
-					var _key = make(map[string]interface{})
-					var a_key = make([]map[string]interface{}, 1)
-					if classify_name == "" {
-						classify_name = "未分类"
-					}
-					_key["key"] = _kws
-					_key["appendkey"] = addtion_kws
-					_key["notkey"] = not_kws
-					a_key[0] = _key
-					if len(a_key) > 0 {
-						flag = util.MQFW.UpdateById("user", userId, bson.M{
-							"$push": bson.M{
-								"o_vipjy.a_items." + classify_index + ".a_key": bson.M{
-									"$each": a_key,
+					if kwscount != "0" {
+						//修改关键词
+						saveData["o_vipjy.a_items."+classify_index+".s_item"] = classify_name
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".key"] = _kws
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".appendkey"] = addtion_kws
+						saveData["o_vipjy.a_items."+classify_index+".a_key."+kws_index+".notkey"] = not_kws
+					} else {
+						//首次添加分类和关键词
+						var _key = make(map[string]interface{})
+						var a_key = make([]map[string]interface{}, 1)
+						if classify_name == "" {
+							classify_name = "未分类"
+						}
+						_key["key"] = _kws
+						_key["appendkey"] = addtion_kws
+						_key["notkey"] = not_kws
+						a_key[0] = _key
+						if len(a_key) > 0 {
+							flag = util.MQFW.UpdateById("user", userId, bson.M{
+								"$push": bson.M{
+									"o_vipjy.a_items." + classify_index + ".a_key": bson.M{
+										"$each": a_key,
+									},
 								},
-							},
-							"$set": bson.M{
-								"o_vipjy.l_modifydate":                          time.Now().Unix(),
-								"o_vipjy.a_items." + classify_index + ".s_item": classify_name,
-							},
-						})
+								"$set": bson.M{
+									"o_vipjy.l_modifydate":                          time.Now().Unix(),
+									"o_vipjy.a_items." + classify_index + ".s_item": classify_name,
+								},
+							})
+						}
 					}
 					//					}
 				} else if actionType == "DK" { //删除关键词
@@ -376,12 +385,17 @@ func (a *AfterPay) GetUserInfo() error {
 			}
 			delete((*userData), "o_jy")
 			//区域
-			_buyset := qutil.ObjToMap((*data)["o_buyset"].(interface{}))
-			var area_i = qutil.IntAll((*_buyset)["areacount"])
-			var citys = qutil.ObjToMap((*_buyset)["citys"].(interface{}))
+			var area_i = -1
+			var buyerclasscount = -1
 			var city_i = 0
-			for _, cv := range *citys {
-				city_i += qutil.IntAll(cv.(int))
+			_buyset := qutil.ObjToMap((*data)["o_buyset"].(interface{}))
+			if (*_buyset)["citys"] != nil {
+				area_i = qutil.IntAll((*_buyset)["areacount"])
+				citys := qutil.ObjToMap((*_buyset)["citys"].(interface{}))
+				buyerclasscount = qutil.IntAll((*_buyset)["buyerclasscount"])
+				for _, cv := range *citys {
+					city_i += qutil.IntAll(cv.(int))
+				}
 			}
 			if area_i != -1 && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域、" + strconv.Itoa(city_i) + "个地市"
@@ -393,7 +407,7 @@ func (a *AfterPay) GetUserInfo() error {
 				(*data)["o_area"] = "全国"
 			}
 			//采购行业
-			(*data)["a_buyerclass"] = qutil.IntAll((*_buyset)["buyerclasscount"])
+			(*data)["a_buyerclass"] = buyerclasscount
 			//有效日期
 			var _starttime = (*userData)["l_vip_starttime"]
 			(*userData)["l_vip_starttime"] = strings.Replace(qutil.FormatDateWithObj(&_starttime, qutil.Date_Short_Layout), "-", ".", -1)

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

@@ -72,7 +72,7 @@ func syncVipUpgrade() {
 
 //每天0点 检查试用、vip服务是否到期
 func checkIsExpire() {
-	crontab(false, TimeTaskConfig.CheckIsExpire, func() {
+	crontab(true, TimeTaskConfig.CheckIsExpire, func() {
 		log.Println("定时任务，开始更新vip状态")
 		now_unix := time.Now().Unix()
 		sess := util.MQFW.GetMgoConn()
@@ -165,18 +165,20 @@ func expireRemind() {
 			s_appponetype := qutil.ObjToString(m["s_appponetype"])
 			log.Println("到期提醒，推送消息", _id, "i_vip_status", i_vip_status, "l_vip_starttime", l_vip_starttime, "l_vip_endtime", l_vip_endtime, "i_vip_expire_tip", i_vip_expire_tip, "s_m_openid", s_m_openid, "isPushWx", isPushWx, "s_appponetype", s_appponetype, "s_jpushid", s_jpushid, "s_opushid", s_opushid)
 			tp := ""
-			tplId, first_value, keyword1_value, keyword2_value, keyword3_value, keyword4_value, remark := "", "", "", "", "", "", ""
+			tplId, first_value, first_color, keyword1_value, keyword2_value, keyword3_value, keyword4_value, remark := "", "", "", "", "", "", "", ""
 			switch i_vip_status {
 			case 1, -1:
 				if i_vip_expire_tip == 1 {
 					tp = "ontrial_soonexprie"
 					tplId = MessageConfig.WxTpl_OnTrial_SoonExpire.Id
 					first_value = MessageConfig.WxTpl_OnTrial_SoonExpire.First.Value
+					first_color = MessageConfig.WxTpl_OnTrial_SoonExpire.First.Color
 					remark = MessageConfig.WxTpl_OnTrial_SoonExpire.Remark.Value
 				} else if i_vip_expire_tip == 2 {
 					tp = "ontrial_expried"
 					tplId = MessageConfig.WxTpl_OnTrial_Expired.Id
 					first_value = MessageConfig.WxTpl_OnTrial_Expired.First.Value
+					first_color = MessageConfig.WxTpl_OnTrial_Expired.First.Color
 					remark = MessageConfig.WxTpl_OnTrial_Expired.Remark.Value
 				}
 				keyword1_value = qutil.ObjToString(m["s_nickname"])
@@ -187,6 +189,7 @@ func expireRemind() {
 					tp = "soonexprie"
 					tplId = MessageConfig.WxTpl_SoonExpire.Id
 					first_value = MessageConfig.WxTpl_SoonExpire.First.Value
+					first_color = MessageConfig.WxTpl_SoonExpire.First.Color
 					keyword2_value = MessageConfig.WxTpl_SoonExpire.Keyword2.Value
 					keyword3_value = MessageConfig.WxTpl_SoonExpire.Keyword3.Value
 					remark = MessageConfig.WxTpl_SoonExpire.Remark.Value
@@ -194,6 +197,7 @@ func expireRemind() {
 					tp = "expried"
 					tplId = MessageConfig.WxTpl_Expired.Id
 					first_value = MessageConfig.WxTpl_Expired.First.Value
+					first_color = MessageConfig.WxTpl_Expired.First.Color
 					keyword2_value = MessageConfig.WxTpl_Expired.Keyword2.Value
 					keyword3_value = MessageConfig.WxTpl_Expired.Keyword3.Value
 					remark = MessageConfig.WxTpl_Expired.Remark.Value
@@ -206,6 +210,7 @@ func expireRemind() {
 				tmplData := map[string]*qrpc.TmplItem{
 					"first": &qrpc.TmplItem{
 						Value: first_value,
+						Color: first_color,
 					},
 					"keyword1": &qrpc.TmplItem{
 						Value: keyword1_value,

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

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

src/jfw/modules/weixin/src/wx/wx.go

@@ -1559,9 +1559,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 	}
 	o_vipjy, _ := (*user)["o_vipjy"].(map[string]interface{})
 	var classify_index = 0 //未分类索引
-	//var keys_index = 0     未分类关键词组数量
-	var keysHas = ""    //已订阅关键词
-	var itemHas = false //是否有未分类
+	var keysHas = ""       //已订阅关键词
 	flag := false
 	//有分类
 	var keysFilter = strings.Split(strings.Replace(keyWord, "+", " ", -1), " ")
@@ -1574,7 +1572,6 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			keysMap := util.ObjArrToMapArr(v["a_key"].([]interface{}))
 			if v["s_item"].(string) == "未分类" {
 				classify_index = i
-				itemHas = true
 			}
 			keysCount += len(keysMap)
 			for _, k := range keysMap {
@@ -1607,29 +1604,23 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 		}
 	}
-	var _key []map[string]interface{}
-	if itemHas {
-		for _, v := range keysFilter {
-			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
-			_key = append(_key, tmp)
-		}
+	var _key = make(map[string]interface{})
+	var a_key = make([]map[string]interface{}, 1)
+	classify_name := "未分类"
+	_key["key"] = keysFilter
+	a_key[0] = _key
+	if len(a_key) > 0 {
 		flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
-			"$push": bson.M{"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": bson.M{"$each": _key}},
+			"$push": bson.M{
+				"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": bson.M{
+					"$each": a_key,
+				},
+			},
+			"$set": bson.M{
+				"o_vipjy.l_modifydate":                                        time.Now().Unix(),
+				"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".s_item": classify_name,
+			},
 		}, false, false)
-	} else {
-		var o_kws = make(map[string]interface{})
-		o_kws["s_item"] = "未分类"
-		for _, v := range keysFilter {
-			tmp := map[string]interface{}{"key": strings.Split(v, " ")}
-			_key = append(_key, tmp)
-		}
-		o_kws["a_key"] = _key
-		o_kws["i_tips"] = 0
-		if o_kws != nil && len(o_kws) > 0 {
-			flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, bson.M{
-				"$push": bson.M{"o_vipjy.a_items": o_kws},
-			}, false, false)
-		}
 	}
 	if flag {
 		return 1, strings.Replace(strings.Join(keysFilter, " "), "+", " ", -1), hasOldKey
@@ -1646,6 +1637,7 @@ func fastSubscribe(content, openId string) (int, string, bool) {
 		//content = strings.TrimSpace(content)
 		content = regexp.MustCompile("\\s+").ReplaceAllString(content, " ")
 		keyWord := strings.Replace(content, " ", "+", -1)
+		log.Println(keyWord, ":kwssssssss")
 		o_jy, _ := (*user)["o_jy"].(map[string]interface{})
 		i_vip_status := util.IntAll((*user)["i_vip_status"])
 		if (*user)["i_vip_status"] != nil && i_vip_status > 0 && keyWord != "" {

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

@@ -658,6 +658,10 @@ $(function () {
     })
 
 	function showCityTips(dom){
+		let isAll = $(".area-list").attr("data-buy-province-count");
+		if(Number(isAll)===-1){
+			return	
+		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
@@ -686,7 +690,6 @@ $(function () {
 	
 	function showOther(){
 		let showCounts = newlyAdded.province;
-		console.log(showCounts)
 		if(showCounts > 9){
 			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
 			$(".tips_d_text").show();

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

@@ -2,31 +2,91 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<title>我的邮箱</title>
		<meta name="keywords" content="更换邮箱 解绑邮箱"/>
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
+		<title>我的邮箱</title>
+		<meta name="keywords" content="更换邮箱 解绑邮箱"/>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/> 
 		{{include "/common/weixin.html"}}
-		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>   
+		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>   
 	</head>
 	<body>
-		<div class="unbind_email">
			<div class="input_box mgT26">
				<label>邮箱</label>
				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly" unselectable="on" onfocus="this.blur()" style="-webkit-user-select :none"/>
			</div>
			<button type="button" class="common_btn choose_email">更换邮箱</button>
			<p class="text-algin">
				<a href="javascript:;" class="unbind">解绑</a>
			</p>
			
			<!-- 更换邮箱弹框 -->
			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
					<div class="dialog_bd">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
					</div>
				</div>
			</div>
			<!-- 解绑邮箱弹框 -->
			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
					</div>
				</div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script>
-			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
			$(function(){
				/* 更换邮箱 */
				$('.choose_email').on('click',() =>{
-					$('#choose_email_dialog').show(400);
-					$("#cancel_choose").on('click',() =>{
-						$('#choose_email_dialog').hide(400);
-					});
+		<div class="unbind_email">
+			<div class="input_box mgT26">
+				<label>邮箱</label>
+				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly" unselectable="on" onfocus="this.blur()" style="-webkit-user-select :none"/>
+			</div>
+			<button type="button" class="common_btn choose_email">更换邮箱</button>
+			<p class="text-algin">
+				<a href="javascript:;" class="unbind">解绑</a>
+			</p>
+			
+			<!-- 更换邮箱弹框 -->
+			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
+				<div class="mask"></div>
+				<div class="dialog">
+					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
+					<div class="dialog_bd">{{.T.text_email}}</div>
+					<div class="dialog_ft">
+						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
+						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
+					</div>
+				</div>
+			</div>
+			<!-- 解绑邮箱弹框 -->
+			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
+				<div class="mask"></div>
+				<div class="dialog">
+					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
+					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
+					<div class="dialog_ft">
+						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
+						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
+		<script>
+			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+			$(function(){
+				/* 更换邮箱 */
+				$('.choose_email').on('click',() =>{
+					/*
+					$('#choose_email_dialog').show(400);
+					$("#cancel_choose").on('click',() =>{
+						$('#choose_email_dialog').hide(400);
+					});
 					$('#sure_choose').on('click',() =>{
-						//sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 						//window.location.replace("/front/wxMyOrder/myEmail?name=change");
-						window.location.href="/front/wxMyOrder/myEmail?name=change";
-					});
+						window.location.href="/front/wxMyOrder/myEmail?name=change";
+					});
+					*/
+					window.location.href="/front/wxMyOrder/myEmail?name=change";
 				})
 				
-				
				/* 解绑邮箱 */
				$('.unbind').on('click',() =>{
					$('#unbind_email_dialog').show(4);
					$("#cancel_unbind").on('click',() =>{
						$('#unbind_email_dialog').hide(400);
					});
					$('#sure_unbind').on('click',() =>{
+				
+				/* 解绑邮箱 */
+				$('.unbind').on('click',() =>{
+					$('#unbind_email_dialog').show(4);
+					$("#cancel_unbind").on('click',() =>{
+						$('#unbind_email_dialog').hide(400);
+					});
+					$('#sure_unbind').on('click',() =>{
 						$.post("/subscribepay/orderListDetails/emailOperation",{"operation":"unbind","email":{{.T.text_email}}},function(data){
 							if(data.success){
 								window.location.replace("/front/wxMyOrder/myEmail?name=unbind");
 							}
-						})
					});
				})
				$('.mask').on('click',()=>{
					$('#choose_email_dialog').hide(400);
					$('#unbind_email_dialog').hide(400);
				})
			})
		</script>
-	{{include "/common/baiducc.html"}}
	</body>
+						})
+					});
+				})
+				$('.mask').on('click',()=>{
+					$('#choose_email_dialog').hide(400);
+					$('#unbind_email_dialog').hide(400);
+				})
+			})
+		</script>
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

src/web/templates/weixin/historypush.html

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

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

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

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

@@ -634,6 +634,7 @@
             param.actionType = actionType;
             param.addition_kws = addition_kws;
             param.not_kws = not_kws;
+			 param.kwscount = $(".content .showKeyWord li").length;
             $.ajax({
                 type: "POST",
                 url: "/subscribepay/afterPay/setUserInfo",

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

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