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

src/config.json

@@ -212,30 +212,7 @@
     "advertUrl": "/swordfish/about",
     "wxJianyu": {
         "appid": "wx5b1c6e7cc4dac0e4",
-        "appsecret": "b026103ffebd2291b3edb7a269612112",
-        "pay": {
-            "mchid": "1418321102",
-            "key": "topnet2016topnet2016topnet2016ab",
-            "attachmsg": "剑鱼标讯打赏",
-            "bodymsg": "剑鱼标讯-招标信息打赏",
-            "detailmsg": "招标推送信息[%s] 打赏%s元钱",
-            "sjdc_attachmsg": "剑鱼标讯-历史数据",
-            "sjdc_bodymsg": "剑鱼标讯-历史数据",
-            "sjdc_detailmsg": "剑鱼标讯-历史数据",
-            "sjbd_msg": "剑鱼标讯-数据报告",
-            "subvip_msg":"剑鱼标讯-vip订阅"
-        },
-        "openidSwitch": {
-            "oIMvJvrVXG89597EFmYiSiznbyyY": "oHwE_wEQlEBvjZJOyZeNnQcgKQMo",
-            "ouCYjw4BJMbpdMRYrTTLb9nFi2RE": "oHwE_wNA1V0DURDO0h7wAriz0qIY"
-        }
-    },
-    "aliPay": {
-        "appid": "2016092900620854",
-        "reqUrl": "https://openapi.alipaydev.com/gateway.do",
-        "Subject": "剑鱼数据导出",
-        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-        "callbackPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkZY9RWrX1cZi/AWuBn7u6bjoT2RMBaq4Gdc87CgrIZm89wa28mYzbnuOrzxGtEMP82lU/KoVAbzY46j7s+bR0qUyUwQyFDFHYzDNSjhngeokzcZ+8rU6a8IOyXOHU0V2BLuvzKb44P4ctzZpmgtDZfxMbAt0ULumz9ma3elYa3pEYgQCoWm5i9eiN8DwhY2uBKZ94vW8+c2iCSwoNntZt6S608TYNOICl7nNWIR+zu3f3HnEE+7mQR37XC1aJWmtH5hKrHF8W5PVzEGhOWETcEdpUmaLhXOfN9nCBKNgFbYUmH+r6s93kfdHAqm6MEuFE6m42nmk6lqoDhEeHKteQIDAQAB"
+        "appsecret": "b026103ffebd2291b3edb7a269612112"
     },
     "industry": "分类综合测试",
     "recommendEntLimit": "50",

src/jfw/front/vipsubscribe.go

@@ -24,12 +24,12 @@ type Subscribepay struct {
 	toVIPViewPage     xweb.Mapper `xweb:"/front/vipsubscribe/toVIPViewPage"`     //订阅收费预览
 
 	//修改
-	toEditSubPage     xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`     //订阅收费修改页面
-	toEditSubProvPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubProvPage"` //订阅收费修改省份
-	toEditSubAllArea  xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubAllArea"`  //订阅收费全国修改
-	toEditSubCityPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubCityPage"` //订阅收费修改城市
-	toEditSubInduPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubInduPage"` //订阅收费修改行业
-	submitEditSub     xweb.Mapper `xweb:"/front/vipsubscribe/submitEditSub"`     //提交订阅收费
+	toEditSubPage       xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`       //订阅收费修改页面
+	toEditSubProvPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubProvPage"`   //订阅收费修改省份
+	toEditSubAllArea    xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubAllArea"`    //订阅收费全国修改
+	toEditSubCityPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubCityPage"`   //订阅收费修改城市
+	toEditSubInduPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubInduPage"`   //订阅收费修改行业
+	submitEditSubFinish xweb.Mapper `xweb:"/front/vipsubscribe/submitEditSubFinish"` //订阅收费修改成功
 
 	//升级
 	toUpgradePage xweb.Mapper `xweb:"/weixin/pay/toUpgradePage"`                   //订阅收费升级服务页面
@@ -189,7 +189,7 @@ func (s *Subscribepay) ToEditSubInduPage() {
 }
 
 //提交订阅修改
-func (s *Subscribepay) SubmitEditSub() {
+func (s *Subscribepay) SubmitEditSubFinish() {
 	s.Render("/weixin/vipsubscribe/edit_subscribe_success.html")
 }
 

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -43,7 +43,8 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		"order_money":  param.TotalFee,
 	}, "id,filter,order_code,order_status,user_id,vip_starttime,vip_endtime", "")
 	pay_time := qutil.FormatDate(&now, qutil.Date_Full_Layout)
-	if orderdata != nil {
+	if orderdata == nil {
+		log.Println("未找到订单")
 		return false //未找到订单
 	}
 	userid := qutil.ObjToString((*orderdata)["user_id"])
@@ -252,9 +253,12 @@ func (this *vipSubscribeStruct) GetBuySet(userId string) (*SubvipBuySet, error)
 
 //订阅修改校验
 func (this *vipSubscribeStruct) SubEditCheckArea(area *map[string]interface{}, buySet *SubvipBuySet) bool {
-	if buySet.AreaCount == -1 {
+	if buySet.AreaCount == -1 { //购买全国
 		return true
 	}
+	if len(*area)==0{ //选择全国
+		return false
+	}
 	pCount := 0
 	for k, v := range *area {
 		citys := qutil.ObjArrToStringArr(v.([]interface{}))

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

@@ -67,7 +67,11 @@ func (a *AfterPay) SetUserInfo() error {
 		saveData := make(map[string]interface{})
 		if a.GetString("pageType") == "infoType" {
 			infoTypeArr := a.GetString("infoTypeArr")
-			saveData["o_vipjy.a_infotype"] = strings.Split(infoTypeArr, ",")
+			if infoTypeArr != "" {
+				saveData["o_vipjy.a_infotype"] = strings.Split(infoTypeArr, ",")
+			} else {
+				saveData["o_vipjy.a_infotype"] = make([]string, 0)
+			}
 		} else if a.GetString("pageType") == "saveSeniorset" {
 			i_ratemode, _ := a.GetInteger("ratemode")
 			i_wxpush, _ := a.GetInteger("wxpush")
@@ -102,11 +106,25 @@ func (a *AfterPay) SetUserInfo() error {
 					}
 				} else {
 					//首次添加分类和关键词
-					flag = util.MQFW.UpdateById("user", userId,
-						bson.M{
-							"$push": bson.M{"o_vipjy.a_items." + classify_index + ".a_key": bson.M{"key": _kws, "appendkey": addtion_kws, "notkey": not_kws}},
-							"$set":  bson.M{"o_vipjy.a_items." + classify_index + ".s_item": classify_name, "o_vipjy.a_items." + classify_index + ".i_tips": 0, "o_vipjy.l_modifydate": time.Now().Unix()},
+					var _key = make(map[string]interface{})
+					var a_key = make([]map[string]interface{}, 1)
+					var o_kws = make(map[string]interface{})
+					if kws_name == "" {
+						kws_name = "未分类"
+					}
+					o_kws["s_item"] = kws_name
+					_key["key"] = _kws
+					_key["appendkey"] = addtion_kws
+					_key["notkey"] = not_kws
+					a_key[0] = _key
+					o_kws["a_key"] = a_key
+					o_kws["i_tips"] = 0
+					if o_kws != nil && len(o_kws) > 0 {
+						flag = util.MQFW.UpdateById("user", userId, bson.M{
+							"$push": bson.M{"o_vipjy.a_items": o_kws},
+							"$set":  bson.M{"o_vipjy.l_modifydate": time.Now().Unix()},
 						})
+					}
 				}
 			} else if actionType == "DK" { //删除关键词
 				data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy.a_items":1}`)
@@ -152,6 +170,7 @@ func (a *AfterPay) GetUserInfo() error {
 	userId, _ := a.GetSession("userId").(string)
 	var userData *map[string]interface{}
 	if userId != "" {
+		go util.MergeKws(userId)
 		userData, _ = util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1}`)
 		if *userData != nil {
 			data := qutil.ObjToMap((*userData)["o_vipjy"])

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

@@ -134,7 +134,11 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		now := time.Now()
 		//数据校验
 		if len(industry) == 1 { //去掉[""]
-			industry = []string{}
+			for _, i := range industry {
+				if i == "" {
+					industry = []string{}
+				}
+			}
 		}
 		if !(pay_source == "Renew" || pay_source == "Upgrade") {
 			return &entity.FuncResult{false, errors.New("未知操作"), nil}
@@ -156,7 +160,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 
 		start := qutil.Int64All((*res)["l_vip_starttime"])
-		end := qutil.Int64All((*res)["l_vip_starttime"])
+		end := qutil.Int64All((*res)["l_vip_endtime"])
 		if start == 0 || end == 0 {
 			return &entity.FuncResult{false, errors.New("数据异常"), nil}
 		}
@@ -164,7 +168,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		endTime := time.Unix(end, 0)
 		orderType := 0
 		if pay_source == "Upgrade" { //计算升级时间
-			if effect == "Now" { //立即生效
+			if effect == "now" { //立即生效
 				orderType = 3
 				startTime = time.Now()
 			} else { //下月生效

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

@@ -93,7 +93,7 @@ func (this *EditSub) SaveSubEdit() {
 			if err != nil {
 				return &editSubResult{false, errors.New("数据格式错误"), nil}
 			}
-			if len(industryNew) > buyset.BuyerclassCount && buyset.BuyerclassCount != -1 {
+			if buyset.BuyerclassCount != -1 && (len(industryNew) == 0 || len(industryNew) > buyset.BuyerclassCount) {
 				return &editSubResult{false, errors.New("非法操作"), nil}
 			}
 			if ok := util.MQFW.UpdateById("user", userId, bson.M{"$set": bson.M{"o_vipjy.a_buyerclass": industryNew}}); !ok {

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

@@ -39,7 +39,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 	r := func() *entity.FuncResult {
 		now := time.Now()
 		//数据校验
-		if len(industry) == 1 { //去掉[""]
+		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 		}
 		if !(payWay == "wx_js" || payWay == "wx_app" || payWay == "ali_app") {

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

@@ -242,19 +242,18 @@ func MergeKws(userId string) {
 	if ok && data != nil && len(*data) > 0 {
 		o_vipjy, _ = (*data)["o_vipjy"].(map[string]interface{})
 		a_items, _ := o_vipjy["a_items"].([]interface{})
-		if a_items == nil { //首次
+		o_jy, _ = (*data)["o_jy"].(map[string]interface{})
+		a_key, _ := o_jy["a_key"].([]interface{})
+		if a_items == nil && len(a_key) > 0 { //首次
 			var o_kws = make(map[string]interface{})
-			o_jy, _ = (*data)["o_jy"].(map[string]interface{})
-			a_key, _ := o_jy["a_key"].([]interface{})
 			var _key = make([]map[string]interface{}, len(a_key))
-			if len(a_key) > 0 {
-				o_kws["s_item"] = "未分类"
-				for k, v := range a_key {
-					keyarr := v.(map[string]interface{})
-					_key[k] = map[string]interface{}{"key": keyarr["key"].([]interface{})}
-				}
+			o_kws["s_item"] = "未分类"
+			for k, v := range a_key {
+				keyarr := v.(map[string]interface{})
+				_key[k] = map[string]interface{}{"key": keyarr["key"].([]interface{})}
 			}
 			o_kws["a_key"] = _key
+			o_kws["i_tips"] = 0
 			if o_kws != nil && len(o_kws) > 0 {
 				a := MQFW.UpdateById("user", userId, bson.M{
 					"$push": bson.M{"o_vipjy.a_items": o_kws},

src/jfw/modules/weixin/src/config.json

@@ -3,16 +3,16 @@
     "mongodbPoolSize": "5",
     "mongodbName": "qfw",
     "redisServers": "sso=192.168.3.128:1712,other=192.168.3.128:1712,jyop_other=192.168.3.128:1712,push=192.168.3.128:1712",
-	"redisLogin":"login=192.168.3.128:1712",
+    "redisLogin": "login=192.168.3.128:1712",
     "weixinport": "82",
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "http://web-jydev-ws.jianyu360.cn",
-	"appid": "wx5b1c6e7cc4dac0e4",
-    "apptoken": "top2015top2015",
-    "appsecret": "b026103ffebd2291b3edb7a269612112",
-	"proxysess": "http://web-jydev-ws.jianyu360.cn/front/sess/%s",
+    "webdomain": "http://web-jydev-wky.jianyu360.cn",
+    "appid": "wx79f2cc873dbea989",
+    "apptoken": "top2016top2016",
+    "appsecret": "fb3f77e9c6725811b5c39f6d58bd58a3",
+    "proxysess": "http://web-jydev-wky.jianyu360.cn/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",
@@ -32,6 +32,7 @@
         "skill": "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect",
         "success": "您已成功订阅该关键词“%s”。您可点击下方菜单“招标订阅”查看修改订阅关键词。<a href='%s'>点击这里，获得更多订阅技巧。</a>",
         "fail": "对不起，您已订阅十个关键词，请点击下方菜单“招标订阅”修改订阅关键词，<a href='%s'>点击这里，获得更多订阅技巧。</a>",
+        "fail_vip": "对不起，您已订阅300个关键词，请点击下方菜单“招标订阅”修改订阅关键词，<a href='%s'>点击这里，获得更多订阅技巧。</a>",
         "exists": "您已订阅过关键词“%s”，您可点击下方菜单“招标订阅”查看修改订阅关键词，<a href='%s'>点击这里，获得更多订阅技巧。</a>",
         "firsttake": "您已成功订阅该关键词“%s”。<a href='%s'>点击这里，获得更多订阅技巧。</a>",
         "hints": [
@@ -67,22 +68,22 @@
         "description": ""
     },
     "2017policy": "2017年招投标政策法规大盘点下载：https://share.weiyun.com/66b98209cefd61860fd32b9416ed52d9",
-	"activesign":true,
+    "activesign": true,
     "activeArr": [
         {
             "keysReplay": false,
             "keysReplayC": "证书",
             "keysTxtReplay": "<a href='%s'>点击测一测五年后的你</a>",
-			"keysTxtReplayUrlName":"futureIndex",
-			"activeCode":"future",
-			"activeName":"五年后的你",
-			"replayflag": true,
+            "keysTxtReplayUrlName": "futureIndex",
+            "activeCode": "future",
+            "activeName": "五年后的你",
+            "replayflag": true,
             "scanReplay": "<a href='%s'>啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！</a>",
-			"scanReplayUrlName":"futureIndex",
-			"subReply":"啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！",
-			"subReplyPic":"http://webws.qmx.top/future/images/pq.png",
+            "scanReplayUrlName": "futureIndex",
+            "subReply": "啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！",
+            "subReplyPic": "http://webws.qmx.top/future/images/pq.png",
             "activeEnd": 1586185600,
-			"subSecondRP":"https://www.jianyu360.com/images/t3.jpg"
+            "subSecondRP": "https://www.jianyu360.com/images/t3.jpg"
         }
     ]
 }

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

@@ -27,6 +27,7 @@ import (
 	"github.com/SKatiyar/qr"
 	_ "github.com/influxdata/influxdb-client"
 	. "github.com/wizjin/weixin"
+	"gopkg.in/mgo.v2/bson"
 )
 
 var Mux *Weixin
@@ -101,6 +102,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 	}
 	autoReply_reg, _ := regexp.Compile("剑鱼|招标|中标|订阅|公告|项目|设置|推送")
 	shalong_text, shalong_img := "", ""
+	log.Println(len(autoReply_reg.FindStringIndex(r.Content)))
 	if strings.Replace(r.Content, " ", "", -1) == "沙龙" {
 		shalong_text, shalong_img = shalongActive.Get()
 	}
@@ -132,6 +134,8 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 						replyText = fmt.Sprintf(fastSubscribeText["fail"].(string), skill)
 					} else if returnValue == -2 {
 						replyText = fmt.Sprintf(fastSubscribeText["exists"].(string), keyWord, skill)
+					} else if returnValue == -3 {
+						replyText = fmt.Sprintf(fastSubscribeText["fail_vip"].(string), skill)
 					} else if returnValue == 1 {
 						if hasOldKey {
 							replyText = fmt.Sprintf(fastSubscribeText["success"].(string), keyWord, skill)
@@ -898,7 +902,7 @@ func ScanHandler(w ResponseWriter, r *Request) {
 		return
 	}
 	log.Println("openid======", openid)
-	m, b := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`"}`, `{"_id":1,"s_headimage":1,"o_jy":1}`)
+	m, b := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`"}`, `{"_id":1,"s_headimage":1,"o_jy":1,"o_vipjy":1,"i_vip_status":1}`)
 	if b {
 		//剑鱼标讯订阅提醒  (1:关注事件，2:扫码事件，3:发送客服消息处理，4:支付操作)
 		if openid != "" {
@@ -955,15 +959,31 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					}
 				}
 			} else if pccodepre == "11" || pccodepre == "12" || pccodepre == "19" || pccodepre == "17" { //101pc订阅，102pc搜索关键词 22落地页订阅关键词
-				pcUser, pcresult, subkey := pcSetUserKeys(*m, r.EventKey, pccodepre)
-				go tools.MQFW.Update("user", &map[string]interface{}{
-					"s_m_openid": openid,
-				}, &map[string]interface{}{
-					"$set": map[string]interface{}{
-						"s_headimage": headimage,
-						"o_jy":        pcUser["o_jy"],
-					},
-				}, false, false)
+				var pcresult, subkey string
+				var pcUser map[string]interface{}
+				if (*m)["i_vip_status"] != nil && util.IntAll((*m)["i_vip_status"]) > 0 {
+					shareid := util.ObjToString(r.EventKey)
+					subkey = util.ObjToString(redis.Get("sso", "pc_subscribe_"+shareid))
+					resNum := 0
+					resNum, subkey, _ = vipFastSubscribe(m, subkey, openid)
+					if resNum == -2 {
+						pcresult = "repeat"
+					} else if resNum == -3 {
+						pcresult = "fail"
+					} else if resNum == 1 {
+						pcresult = "ok"
+					}
+				} else {
+					pcUser, pcresult, subkey = pcSetUserKeys(*m, r.EventKey, pccodepre)
+					go tools.MQFW.Update("user", &map[string]interface{}{
+						"s_m_openid": openid,
+					}, &map[string]interface{}{
+						"$set": map[string]interface{}{
+							"s_headimage": headimage,
+							"o_jy":        pcUser["o_jy"],
+						},
+					}, false, false)
+				}
 				if pcresult == "ok" {
 					pchints := config.Sysconfig["pchints"].(map[string]interface{})
 					url := fmt.Sprintf(config.Sysconfig["proxysess"].(string), se.EncodeString(openid+","+user.UnionId+","+strconv.Itoa(int(time.Now().Unix()))+",rssset"))
@@ -1491,9 +1511,89 @@ func updateIsPush(openid string, status int) {
 	}, false, true)
 }
 
+//
+func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (returnValue int, content string, hasOldKey bool) {
+	o_vipjy, _ := (*user)["o_vipjy"].(map[string]interface{})
+	var classify_index = 0 //未分类索引
+	//var keys_index = 0     未分类关键词组数量
+	var keysHas = ""    //已订阅关键词
+	var itemHas = false //是否有未分类
+	flag := false
+	//有分类
+	var keysFilter = strings.Split(keyWord, " ")
+	if o_vipjy != nil && o_vipjy["a_items"] != nil && len(o_vipjy["a_items"].([]interface{})) > 0 {
+		var keysCount = 0 //已订关键词数量
+		hasOldKey = true
+		a_items := util.ObjArrToMapArr(o_vipjy["a_items"].([]interface{}))
+		classify_index = len(a_items)
+		for i, v := range a_items {
+			keysMap := util.ObjArrToMapArr(v["a_key"].([]interface{}))
+			if v["s_item"].(string) == "未分类" {
+				classify_index = i
+				itemHas = true
+			}
+			keysCount += len(keysMap)
+			for _, k := range keysMap {
+				_keysMap := util.ObjArrToStringArr(k["key"].([]interface{}))
+				keys := ""
+				for _, m := range _keysMap {
+					if keys == "" {
+						keys += util.ObjToString(m)
+					} else {
+						keys += "+" + util.ObjToString(m)
+					}
+				}
+				for i, n := range keysFilter {
+					if keys == n {
+						if !strings.Contains(keysHas, n) {
+							keysHas += " " + n
+						}
+						keysFilter = append(keysFilter[:i], keysFilter[i+1:]...)
+					}
+				}
+			}
+			if len(keysFilter) == 0 {
+				//						log.Println("已经订阅过此关键词-----")
+				return -2, strings.Replace(keyWord, "+", " ", -1), hasOldKey
+			}
+		}
+		if keysCount+len(keysFilter) > 300 {
+			//vip订阅超过300组关键词
+			log.Println("vip订阅超过300组关键词-----")
+			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
+		}
+	}
+	var _key = make([]map[string]interface{}, len(keysFilter))
+	if itemHas {
+		for k, v := range keysFilter {
+			_key[k] = map[string]interface{}{"key": strings.Split(v, " ")}
+		}
+		flag = tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, map[string]interface{}{
+			"$pushAll": bson.M{"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": _key},
+		}, false, false)
+	} else {
+		var o_kws = make(map[string]interface{})
+		o_kws["s_item"] = "未分类"
+		for k, v := range keysFilter {
+			_key[k] = map[string]interface{}{"key": strings.Split(v, " ")}
+		}
+		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
+	}
+	return
+}
+
 //快速订阅关键词
 func fastSubscribe(content, openId string) (int, string, bool) {
-	user, ok := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openId+`"}`, `{"o_jy":1}`)
+	user, ok := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openId+`"}`, `{"o_jy":1:"o_vipjy":1,"i_vip_status":1}`)
 	hasOldKey := false
 	if ok && user != nil {
 		//content = strings.TrimPrefix(content, "订阅")
@@ -1501,48 +1601,53 @@ func fastSubscribe(content, openId string) (int, string, bool) {
 		content = regexp.MustCompile("\\s+").ReplaceAllString(content, " ")
 		keyWord := strings.Replace(content, " ", "+", -1)
 		o_jy, _ := (*user)["o_jy"].(map[string]interface{})
-		if o_jy == nil {
-			o_jy = make(map[string]interface{})
-		}
-		a_key, _ := o_jy["a_key"].([]interface{})
-		if len(a_key) > 0 {
-			hasOldKey = true
-		}
-		//关键词达到最大数量
-		if len(a_key) >= 10 {
-			return -1, content, hasOldKey
-		}
-		//关键词已存在
-		for _, v := range a_key {
-			if tmp, ok := v.(map[string]interface{}); ok {
-				key := tmp["key"].([]interface{})
-				keys := ""
-				for _, val := range key {
-					if keys == "" {
-						keys += util.ObjToString(val)
-					} else {
-						keys += "+" + util.ObjToString(val)
+		i_vip_status := util.IntAll((*user)["i_vip_status"])
+		if (*user)["i_vip_status"] != nil && i_vip_status > 0 && keyWord != "" {
+			return vipFastSubscribe(user, keyWord, openId)
+		} else {
+			if o_jy == nil {
+				o_jy = make(map[string]interface{})
+			}
+			a_key, _ := o_jy["a_key"].([]interface{})
+			if len(a_key) > 0 {
+				hasOldKey = true
+			}
+			//关键词达到最大数量
+			if len(a_key) >= 10 {
+				return -1, content, hasOldKey
+			}
+			//关键词已存在
+			for _, v := range a_key {
+				if tmp, ok := v.(map[string]interface{}); ok {
+					key := tmp["key"].([]interface{})
+					keys := ""
+					for _, val := range key {
+						if keys == "" {
+							keys += util.ObjToString(val)
+						} else {
+							keys += "+" + util.ObjToString(val)
+						}
+					}
+					if keys == keyWord {
+						return -2, content, hasOldKey
 					}
-				}
-				if keys == keyWord {
-					return -2, content, hasOldKey
 				}
 			}
+			key := map[string][]string{}
+			key["key"] = strings.Split(keyWord, "+")
+			key["notkey"] = []string{}
+			key["infotype"] = []string{}
+			key["area"] = []string{}
+			a_key = append(a_key, key)
+			tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, map[string]interface{}{
+				"$set": map[string]interface{}{
+					"i_ts_guide":        1,
+					"o_jy.a_key":        a_key,
+					"o_jy.l_modifydate": time.Now().Unix(),
+				},
+			}, false, false)
+			return 1, content, hasOldKey
 		}
-		key := map[string][]string{}
-		key["key"] = strings.Split(keyWord, "+")
-		key["notkey"] = []string{}
-		key["infotype"] = []string{}
-		key["area"] = []string{}
-		a_key = append(a_key, key)
-		tools.MQFW.Update("user", `{"s_m_openid":"`+openId+`"}`, map[string]interface{}{
-			"$set": map[string]interface{}{
-				"i_ts_guide":        1,
-				"o_jy.a_key":        a_key,
-				"o_jy.l_modifydate": time.Now().Unix(),
-			},
-		}, false, false)
-		return 1, content, hasOldKey
 	}
 	return 0, content, hasOldKey
 }

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

@@ -592,7 +592,7 @@
           let pHeight = $('.result_text').height()
           let minHeight = $('.result_text').css('min-height')
           let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
-          $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+          $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
           console.log("高度："+ pHeight,"最小高度"+ minHeight,"行数：" + rows)
           if(rows == 1){
               $('.packup').hide()
@@ -619,14 +619,14 @@
                 $(".result").css("padding-bottom","0.3rem")
                 $(this).hide();
                 $('.packup').show()
-                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
             })
             $('.packup').click(function () { 
                 $(".result").css("padding-bottom","0.2rem")
                 $('.result_text').addClass('line_two')
                 $(this).hide();
                 $('.detail').show()
-                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
             })
             $("body").on('click','.slide a',function(){
                 var s = $(this).html()

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

@@ -25,8 +25,11 @@
     <div id="choose_area">
         <!--<p class="optional_count"> 可选择市数量：<em class="count"></em> / <span class="total">11</span></p>-->
         <div class="result">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            <p>已选择：<span class="result_name"></span></p>
+            <p class="result_text line_two">
+              已选择：<span class="result_name"></span>
+              <a href="javascript:;" class="detail">详情</a>
+            </p>
+            <a href="javascript:;" class="packup" style="display: none;">收起</a>
         </div>
         <div class="form">
             <div class="select-area-box">
@@ -450,6 +453,20 @@
             this.getResult();
           },
           initClick:function(){
+            $('.detail').click(function () {  
+                $('.result_text').removeClass('line_two')
+                $(".result").css("padding-bottom","0.3rem")
+                $(this).hide();
+                $('.packup').show()
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
+            })
+            $('.packup').click(function () { 
+                $(".result").css("padding-bottom","0.2rem")
+                $('.result_text').addClass('line_two')
+                $(this).hide();
+                $('.detail').show()
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
+            })
             // 锚点跳转
             $("body").on('click', '.slide a', function () {
                 var s = $(this).html()
@@ -526,13 +543,13 @@
             $('#enter').click(function(){
               $("#enter").attr("disabled","disabled");
               //提交修改
-              if(EditArea.reqData.buyset.areacount==-1&&EditArea.reqData.area["全国"]){
+              if(EditArea.reqData.area["全国"]){
                 EditArea.reqData.area={}
               }
               console.log("final select ",EditArea.reqData.area)
               $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditArea.reqData.area)},function(r){
                 if(r.success){
-                  window.history.go(-1);
+                  window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                 }
               },false)
               $("#enter").removeAttr("disabled");  
@@ -646,7 +663,8 @@
                 }
             }
             $('.result_name').append(html);
-            $(".select-area-box .area-list").css("margin-top",$('.result').height()+20);
+            $(".select-area-box .area-list").css("margin-top",$('.result').height()+25);
+            this.isOpen();
             if(this.noChange(this.lastSelectObj,this.reqData.area)){
               $("#enter").attr("disabled","disabled");  
             }else{
@@ -658,6 +676,31 @@
             var tmp1 = getAreaClassArr(obj1);
             var tmp2 = getAreaClassArr(oj2);
             return (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort()))&&(JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
+          },
+          isOpen:function(){
+            let pHeight = $('.result_text').height()
+            let minHeight = $('.result_text').css('min-height')
+            let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
+            $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+25);
+            console.log("高度："+ pHeight,"最小高度"+ minHeight,"行数：" + rows)
+            if(rows == 1){
+                $('.packup').hide()
+                $('.detail').hide()
+            }else if(rows == 2){
+                console.log($('.result_name').html().trim().length)
+                let length = $('.result_name').html().trim().length;
+                if(length >= 50){
+                    $('.detail').show()
+                    $('.packup').hide()
+                }else{
+                    $('.detail').hide()
+                    $('.packup').hide()
+                }
+                
+            } else{
+                $('.packup').show()
+                $('.detail').hide()
+            }
           }
         }
         $(function(){

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

@@ -26,8 +26,11 @@
         <p class="optional_count" style="position: fixed;width: 100%;top: 0px;"> 可选择市数量：<em class="count"></em> / <span class="total">11</span></p>
         <div class="result" style="top:0.88rem">
             <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-
-            <p>已选择：<span class="result_name">郑州市、洛阳市、淮南市、洛阳市、淮南市、洛阳市、淮南市、洛阳市、淮南市、洛阳市、淮南市</span></p>
+            <p class="result_text line_two">
+            已选择：<span class="result_name"></span>
+            <a href="javascript:;" class="detail">详情</a>
+            </p>
+            <a href="javascript:;" class="packup" style="display: none;">收起</a>
         </div>
         <div class="form">
             <div class="select-area-box">
@@ -415,7 +418,6 @@
             $('.count').html(num[1].length);
             // 初次渲染城市选择结果
             $('.result_name').html(num[1].join('、'));
-           
             // 渲染城市
             $(".select-area-box ul li:not('.index')").each(function () {
                 var text = $(this).find(".province").text().trim();
@@ -471,6 +473,20 @@
             }
           },
           initClick:function(){
+            $('.detail').click(function () {  
+                $('.result_text').removeClass('line_two')
+                $(".result").css("padding-bottom","0.3rem")
+                $(this).hide();
+                $('.packup').show()
+                $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
+            })
+            $('.packup').click(function () { 
+                $(".result").css("padding-bottom","0.2rem")
+                $('.result_text').addClass('line_two')
+                $(this).hide();
+                $('.detail').show()
+                $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
+            })
             // 锚点跳转
             $("body").on('click', '.slide a', function () {
                 var s = $(this).html()
@@ -522,7 +538,7 @@
               console.log("final select ",EditCity.reqData.area);
               $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditCity.reqData.area)},function(r){
                 if(r.success){
-                  window.history.go(-1);
+                  window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                 }
               },false)
               $("#enter").removeAttr("disabled");  
@@ -596,8 +612,8 @@
             this.selectObj=selectObj;
             $('.count').text(cityCount)
             $('.result_name').append(html);
-            $('.select-area-box').css("margin-top",$(".optional_count").height()+$(".result").height()+20);
-            
+            $('.select-area-box').css("margin-top",$(".optional_count").height()+$(".result").height()+25);
+            this.isOpen();
             if(this.noChange(this.selectObj,EditCity.reqData.area)||!this.compareArr(Object.keys(this.selectObj),Object.keys(this.reqData.buyset.citys))){
               $("#enter").attr("disabled","disabled")
             }else{
@@ -617,6 +633,30 @@
           },
           compareArr:function(arr1,arr2){
             return JSON.stringify(arr1.sort()) === JSON.stringify(arr2.sort());
+          },
+          isOpen:function(){
+            let pHeight = $('.result_text').height()
+            let minHeight = $('.result_text').css('min-height')
+            let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
+            $('.select-area-box').css("margin-top",$(".optional_count").height()+$('.result_text').height()+25);
+            if(rows == 1){
+                $('.packup').hide()
+                $('.detail').hide()
+            }else if(rows == 2){
+                console.log($('.result_name').html().trim().length)
+                let length = $('.result_name').html().trim().length;
+                if(length >= 50){
+                    $('.detail').show()
+                    $('.packup').hide()
+                }else{
+                    $('.detail').hide()
+                    $('.packup').hide()
+                }
+                
+            } else{
+                $('.packup').show()
+                $('.detail').hide()
+            }
           }
         }
         $(function(){

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

@@ -345,7 +345,7 @@
                   console.log("final select ",EditIndustry.reqData)
                   $DoPost("/subscribepay/editSub/submit",{"type":"industry","value":JSON.stringify(EditIndustry.reqData.industry)},function(r){
                     if(r.success){
-                      window.history.go(-1);
+                      window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
                   },false)
                   $("#enter").removeAttr("disabled");  

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

@@ -445,7 +445,7 @@
                   
                   $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditProvince.reqData.area)},function(r){
                     if(r.success){
-                      window.history.go(-1);
+                      window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
                   },false)
                   $("#enter").removeAttr("disabled");  

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

@@ -229,7 +229,7 @@
     <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}2"></script>
     <script>
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
         weui.loading();
@@ -238,6 +238,7 @@
             if(window.location.search.indexOf("page=1")>-1){
 				history.replaceState("{id:1}","","/front/vipsubscribe/toSetKeyWordPage")
             }else if(history.state){
+				alert(history.state)
                 window.history.go(-1)
 			}
         },500)

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

@@ -150,7 +150,7 @@
                     var _userData = r.userData;
                     var _vipData = _userData["o_vipjy"];
                     var a_infotype = _vipData["a_infotype"]
-                    if (a_infotype!=undefined&&a_infotype.split("、").length>0){
+                    if (a_infotype!=undefined&&a_infotype.split("、").length>0&&a_infotype!=""){
                         inputHtml(a_infotype.split("、"));
                         isLockButton (true);
                     }else{

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

@@ -92,7 +92,7 @@
             <div class="price">
                 <label></label>
                 <p>
-                    <span class="old_price">&yen;610.80</span>
+                    <!--<span class="old_price">&yen;610.80</span>-->
                     <strong class="finally_price">&yen;0.00</strong>
                 </p> 
             </div>
@@ -511,20 +511,24 @@
 			    	}
 			    	$(".item_industry .label_for").text(buyerclassHtml);
 			    }
-			    if(cycleunit !== "" && cycleunit !== undefined){
-			    	if(cycleunit === 1){
-			    		dateName = cyclecount + " 年";
-			    	}else if(cycleunit === 2){
-			    		dateName = cyclecount + " 个月";
-			    	}
-			    	$(".item_cycle .label_for").text(dateName);
-			    }
+//			    if(cycleunit !== "" && cycleunit !== undefined){
+//			    	if(cycleunit === 1){
+//			    		dateName = cyclecount + " 年";
+//			    	}else if(cycleunit === 2){
+//			    		dateName = cyclecount + " 个月";
+//			    	}
+//			    	$(".item_cycle .label_for").text(dateName);
+//			    }
 			    if(startTime !== "" && endTime !== ""){
 			    	var start = startTime.replace(/-/g, ".");
 			    	var end = endTime.replace(/-/g, ".");
 			    	dateHtml = start + " - " + end;
 			    	$(".item_validity .label_for").text(dateHtml);
 			    }
+			    if(starts !== "" && ends !== ""){
+			    	let end = new Date(ends).toLocaleDateString();
+			    	console.log(end)
+			    }
 			    var val = monthPrice * 6
 			    $(".computed_price").html("￥"+val.toFixed(1))
 			 	//
@@ -638,7 +642,7 @@
 		        })
 		        return
 	    	}
-	        
+	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
 	    		"area": JSON.stringify(area),
 	    		"industry": buyerclass.toString(),
@@ -653,6 +657,7 @@
                     clearSessionStorage();
                     onBridgeReady(JSON.parse(r.data.res),r.data.code);
                 }
+                $(".save_renew").removeAttr("disabled");
             })
 	    });
 	    

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

@@ -61,7 +61,7 @@
                 </div>
                 <!-- 如果用户同时购买全国和全行业 则隐藏修改功能 -->
                 <div class="s_info_bottom">
-                    <span onclick="window.location.href='vip_subscribe_edit.html'">修改</span>
+                    <span onclick="window.location.href='/front/vipsubscribe/toEditSubPage'">修改</span>
                     <i class="iconfont icon-arrow"></i>
                 </div>
             </div>
@@ -90,10 +90,10 @@
                         </div>
                         <a href="/front/vipsubscribe/toSetPushSetPage" class="media_right" id="pushSet"></a>
                     </div>
-                    <div class="media_list" style="margin-top:.2rem;display: none;" id="auto_renew">
+                    <div class="media_list" style="margin-top:.2rem;" id="auto_renew">
                         <div class="media_left">
-                            <img src="/vipsubscribe/image/renew.png?v={{Msg "seo" "version"}}" alt="">
-                            <span>自动续费</span>
+                            <img src="/vipsubscribe/image/frame.png?v={{Msg "seo" "version"}}" alt="">
+                            <span>项目匹配</span>
                         </div>
                         <div class="media_switch">
                             <div class="weui-cell__ft">
@@ -145,7 +145,7 @@
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}11"></script>
     <script>
 		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
         $(function () {

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

@@ -141,7 +141,7 @@
             <div class="price">
                 <label>需补差价：</label>
                 <p>
-                    <span class="old_price">&yen;610.80</span>
+                    <!--<span class="old_price">&yen;610.80</span>-->
                     <strong class="finally_price">&yen;0.00</strong>
                 </p> 
             </div>
@@ -973,6 +973,9 @@
 			if(effect === "notnow"){
 				nowUpgrade = nowUpgrade -1;
 			}
+			if(nowUpgrade == 0){
+				nowUpgrade = 1;
+			}
 			//
 			var nowUpgradeYear = 0;
 			if(nowUpgrade >= 12){
@@ -988,6 +991,8 @@
 			}
 			console.log("year",nowUpgradeYear)
 			console.log("month",nowUpgrade)
+			console.log("oldYearPrice",oldYearPrice)
+			console.log("oldMonthPrice",oldMonthPrice)
 			$DoPost("/subscribepay/renewUpgrade/getRenewUpgradePrice", {"nowUpgradeYear":nowUpgradeYear,"nowUpgrade":nowUpgrade}, function (r) {
 				if(r){
 					oldPrice = r.oldprice;
@@ -995,8 +1000,6 @@
 					oldMonthPrice = r.oldmonthprice;
 				}
 			},false);
-			console.log("oldYearPrice",oldYearPrice)
-			console.log("oldMonthPrice",oldMonthPrice)
 			if(nowUpgradeYear >= 1){
 				let yearprice = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgradeYear,1]);
 				let monthprice = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgrade,2]);
@@ -1042,6 +1045,7 @@
         
         //
         $(".save_upgrade").on("click", function(){
+        	$(".save_upgrade").attr("disabled","disabled")
         	let effective = $("#effect_date_name").text();
         	var effect = "now";
         	if(effective !== "立即生效，需支付当月费用差价"){
@@ -1087,7 +1091,7 @@
                     clearSessionStorage();
                     onBridgeReady(JSON.parse(r.data.res),r.data.code);
                 }
-                $("#payHandle").removeAttr("disabled");
+                $(".save_upgrade").removeAttr("disabled");
             })
 	    });