Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

src/jfw/front/login.go

@@ -115,7 +115,7 @@ func (l *Login) Login() error {
 						"s_company":     s_company,
 						"o_jy": map[string]interface{}{
 							"i_apppush":    1,
-							"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+							// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 							"i_ratemode":   2,
 							"l_modifydate": time.Now().Unix(),
 						},

src/jfw/front/otherAct.go

@@ -134,8 +134,8 @@ func (f *Front) Lpsubmit() error {
 				"l_registedate": time.Now().Unix(),
 				"i_ts_guide":    2,
 				"o_jy": map[string]interface{}{
-					"i_apppush":    1,
-					"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+					"i_apppush": 1,
+					// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 					"i_ratemode":   2,
 					"l_modifydate": time.Now().Unix(),
 				},

src/jfw/front/pchelper.go

@@ -126,9 +126,9 @@ func (l *PcHelper) Login() error {
 							"l_registedate": time.Now().Unix(),
 							"i_ts_guide":    2,
 							"o_jy": map[string]interface{}{
-								"i_apppush":    1,
-								"i_ratemode":   2,
-								"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+								"i_apppush":  1,
+								"i_ratemode": 2,
+								// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 								"l_modifydate": time.Now().Unix(),
 							},
 							"s_regsource": "pchelper",

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

@@ -204,9 +204,9 @@ func (l *Login) Login() error {
 						"s_appponetype": phoneType,
 						"i_ts_guide":    2,
 						"o_jy": map[string]interface{}{
-							"i_apppush":    1,
-							"i_ratemode":   2,
-							"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+							"i_apppush":  1,
+							"i_ratemode": 2,
+							// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 							"l_modifydate": time.Now().Unix(),
 						},
 						"s_platform": "app",
@@ -462,9 +462,9 @@ func (l *Login) Register() error {
 					data["l_registedate"] = time.Now().Unix()
 					data["i_ts_guide"] = 2
 					data["o_jy"] = map[string]interface{}{
-						"i_apppush":    1,
-						"i_ratemode":   2,
-						"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+						"i_apppush":  1,
+						"i_ratemode": 2,
+						// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 						"l_modifydate": time.Now().Unix(),
 					}
 					data["s_regsource"] = isAndroidOrIOS(l.Header("User-Agent"))
@@ -607,9 +607,9 @@ func (l *Login) WxLogin() {
 				"s_city":         u.City,
 				"s_headimageurl": u.HeadImageUrl,
 				"o_jy": map[string]interface{}{
-					"i_apppush":    1,
-					"i_ratemode":   2,
-					"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
+					"i_apppush":  1,
+					"i_ratemode": 2,
+					// "i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
 					"l_modifydate": time.Now().Unix(),
 				},
 				"s_platform": "app", //用户注册平台 app 微信 pc

src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -95,7 +95,7 @@
                     继续浏览
                 </button>
             </div>
-        {{else if or .T.doType "dataPack" .T.doType "areaPack"}}
+        {{else if or (eq .T.doType "dataPack") (eq .T.doType "areaPack")}}
             <div class="bottom_button j-button-group">
                 <button id ="order" class="j-button-confirm" onclick="window.location.href = '/jyapp/common/{{.T.doType}}/orderDetail?order_code={{.T.orderCode}}'">
                     查看订单

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

@@ -297,11 +297,11 @@
             <div class="provincePay">
               <div class="provincePay-text">订阅周期：${subscribeTime}</div>
               <div class="provincePay-text provincePay-numText">
-                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span><span v-show="userAreaAllNum !== '全国'">个</span>
+                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span>${userAreaAllNum !== '全国' ? '个' : ''}
               </div>
               <div class="provincePay-btnWrap">
-                <div class="privincePay-btn"  @click="renewBtn">续费</div>
-                <div class="privincePay-btn updateColor" @click="updateBtn">升级</div>
+                <div class="privincePay-btn" @click="renewBtn">续费</div>
+                <div class="privincePay-btn updateColor" v-if="userAreaAllNum !== '全国'" @click="updateBtn">升级</div>
               </div>
             </div>
           </div>

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

@@ -832,7 +832,9 @@
         toBuyAreaPack: function () {
           this.dialog.backTip = false
           this.saveState()
-          location.href = '/jyapp/areaPack/page/buy'
+          setTimeout(function () {
+            location.href = '/jyapp/areaPack/page/buy'
+          }, 20)
         },
         restoreState: function () {
           var k = sessionStorage.getItem(this.sessKey)

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

@@ -1,7 +1,7 @@
 <html>
 <head>
 	{{include "/common/meta.html"}}
-	<title>超级订阅结果预览</title>
+	<title>订阅结果预览</title>
 	{{include "/common/nnc.html"}}
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">

src/jfw/modules/bigmember/src/config.json

@@ -56,5 +56,6 @@
 			"name":"赵秀臻",
 			"wxer":"/big-member/image/customer/customer-wx.png"
 		}
-    ]
+    ],
+    "newFreeUser":1637647199
 }

src/jfw/modules/bigmember/src/config/config.go

@@ -32,6 +32,7 @@ type config struct {
 	RegWinner           string
 	OldSubscribeMoveTip int64
 	Customers           []customerInfo
+	NewFreeUser         int64 //免费用户 -- 订阅升级新用户
 }
 type customerInfo struct {
 	Name string `json:"name"`

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -238,7 +238,7 @@ func (this *Portrait) BuyerPortraitData(screen *PortraitScreen, flag string) (ma
 	}
 	buyerPortraitData := map[string]interface{}{}
 	if screen.IsEmptySearch() { //空查询读缓存
-		buyerPortraitData = TryFunc(GetPortraitCache, screen.Ent, "buyer", 2)
+		buyerPortraitData = TryFunc(GetPortraitCache, screen.Ent, "buyer", 5)
 	} else {
 		Screen_Thread <- true
 		res, err := GetBuyerPortraitData(screen)

src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -83,11 +83,11 @@ func (ps *PortraitScreen) PareMatchType(isBidding ...bool) (items []string) {
 	} else { //project表
 		for _, t := range strings.Split(ps.MatchRange, ",") {
 			if t == "buyer" {
-				items = append(items, "buyer")
+				items = append(items, "mbuyer")
 			} else if t == "winner" {
-				items = append(items, "winner")
+				items = append(items, "mwinner")
 			} else if t == "agency" {
-				items = append(items, "agency")
+				items = append(items, "magency")
 			} else if t == "purchasing" {
 				items = append(items, []string{"purchasing", "projectname.pname"}...)
 			}

src/jfw/modules/bigmember/src/service/use/use.go

@@ -615,7 +615,11 @@ func (u *Use) IsAdd() {
 		d["freeEntPort"] = bigPower.FreeEntPort     //免费用户可查看企业画像次数
 		d["freeBuyerPort"] = bigPower.FreeBuyerPort //免费用户可查看采购单位画像次数
 		d["freeFile"] = bigPower.FreeFile           //免费用户可以进行附件下载次数
-		d["isUpgrade"] = bigPower.IsUpgrade         //是否是升级后的免费用户  默认true
+		d["isUpgrade"] = bigPower.IsUpgrade         //是否是升级后的免费用户  默认false
+		//新用户->新订阅设置页面
+		if config.Config.NewFreeUser < bigPower.Registedate {
+			d["isUpgrade"] = true
+		}
 		uid := userid
 		if bigPower.Pid != "" {
 			uid = bigPower.Pid

src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -27,10 +27,11 @@ type BigVipBaseMsg struct {
 	VipStatus  int    `json:"vip_status"` //超级订阅状态
 	Vip_BuySet BuySet `json:"vip_buyset"` //超级订阅套餐内容
 
-	FreeEntPort   int  `json:"freeEntPort"`   //免费用户可查看企业画像次数
-	FreeBuyerPort int  `json:"freeBuyerPort"` //免费用户可查看采购单位画像次数
-	FreeFile      int  `json:"freeFile"`      //免费用户可进行附件下载次数
-	IsUpgrade     bool `json:"isUpgrade"`     //是否是免费用户订阅升级用户 默认true
+	FreeEntPort   int   `json:"freeEntPort"`   //免费用户可查看企业画像次数
+	FreeBuyerPort int   `json:"freeBuyerPort"` //免费用户可查看采购单位画像次数
+	FreeFile      int   `json:"freeFile"`      //免费用户可进行附件下载次数
+	IsUpgrade     bool  `json:"isUpgrade"`     //是否是免费用户订阅升级用户 默认true
+	Registedate   int64 `json:"registedate"`   //用户注册时间
 }
 
 //超级订阅购买内容
@@ -108,8 +109,9 @@ func GetBigVipUserBaseMsg(userId string, mysql *mysql.Mysql, mg MongodbSim) *Big
 		}
 	}
 	//大会员状态
-	data, ok := mg.FindById("user", userId, `{"i_member_status":1,"i_member_give":1,"s_member_mainid":1,"i_member_sub_status":1,"i_member_trial":1,"i_vip_status":1,"o_vipjy":1,"o_jy":1}`)
+	data, ok := mg.FindById("user", userId, `{"i_member_status":1,"i_member_give":1,"s_member_mainid":1,"i_member_sub_status":1,"i_member_trial":1,"i_vip_status":1,"o_vipjy":1,"o_jy":1,"l_registedate":1}`)
 	if ok && *data != nil && len(*data) > 0 {
+		userPower.Registedate = qutil.Int64All((*data)["l_registedate"])
 		userPower.Status = qutil.IntAllDef((*data)["i_member_status"], 0)
 		//子账号被启用
 		i_member_sub_status := qutil.IntAllDef((*data)["i_member_sub_status"], 0)

src/jfw/modules/common/src/qfw/util/jy/switchService.go

@@ -32,16 +32,16 @@ func (s *switchService) Get(session *httpsession.Session, m MongodbSim) string {
 	v, _ := session.Get(s.SessionKey).(string)
 	u, ok := m.FindById("user", userId, `{"i_member_status":1,"i_vip_status":1}`)
 	if ok && u != nil {
-		if i_member_status := util.IntAll((*u)["i_member_status"]); v == s.Member && i_member_status > 0 {
-			return s.Member
-		} else if i_vip_status := util.IntAll((*u)["i_vip_status"]); v == s.Vip && i_vip_status > 0 {
+		if i_vip_status := util.IntAll((*u)["i_vip_status"]); v == s.Vip && i_vip_status > 0 {
 			return s.Vip
-		} else if i_member_status > 0 {
-			session.Set(s.SessionKey, s.Member)
-			return s.Member
 		} else if i_vip_status > 0 {
 			session.Set(s.SessionKey, s.Vip)
 			return s.Vip
+		} else if i_member_status := util.IntAll((*u)["i_member_status"]); v == s.Member && i_member_status > 0 {
+			return s.Member
+		} else if i_member_status > 0 {
+			session.Set(s.SessionKey, s.Member)
+			return s.Member
 		}
 	}
 	session.Del(s.SessionKey)

src/jfw/modules/publicapply/src/adLeague/service/service.go

@@ -49,13 +49,15 @@ func (this *Ad) AdL(typ string) {
 		defer res.Body.Close()
 		bs, _ := ioutil.ReadAll(res.Body)
 		//log.Println("返回内容:" + string(bs))
-		resMap := map[string]interface{}{}
-		err = json.Unmarshal([]byte(bs), &resMap)
-		if err != nil {
-			log.Println("json.unmarshal err", resMap)
-		} else {
-			if qu.IntAll(resMap["Code"]) == 1 {
-				return Result{Data: true}
+		if len(bs) > 0 {
+			resMap := map[string]interface{}{}
+			err = json.Unmarshal([]byte(bs), &resMap)
+			if err != nil {
+				log.Println("json.unmarshal err", resMap)
+			} else {
+				if qu.IntAll(resMap["Code"]) == 1 {
+					return Result{Data: true}
+				}
 			}
 		}
 		return Result{Data: false}

src/jfw/modules/publicapply/src/subscribe/entity/entity.go

@@ -59,13 +59,14 @@ func (this *ParamInfo) SetAreaByOneProvince() (b bool) {
 			}
 			areas = append(areas, qutil.ObjArrToStringArr(area)...)
 		}
+		setMap := map[string]interface{}{
+			"o_jy.i_newfree": 1, //老免费用户=>新订阅设置页面 20211122
+		}
 		if len(areas) == 1 {
-			if db.Mgo.UpdateById("user", this.UserId, map[string]interface{}{"$set": map[string]interface{}{
-				"o_jy.o_area":    areas, //设置地区
-				"o_jy.i_newfree": 1,     //老免费用户=>新订阅设置页面 20211122
-			}}) {
-				jy.ClearBigVipUserPower(this.UserId)
-			}
+			setMap["o_jy.o_area"] = areas //设置地区
+		}
+		if db.Mgo.UpdateById("user", this.UserId, map[string]interface{}{"$set": setMap}) {
+			jy.ClearBigVipUserPower(this.UserId)
 		}
 	}
 	return b

src/jfw/modules/publicapply/src/subscribePush/entity/keyWords.go

@@ -101,7 +101,8 @@ func directSubKWSFree(updateItems string, keys string, userId string) map[string
 						"updatetime": time.Now().Unix(),
 					},
 				},
-				"l_modifydate": time.Now().Unix(),
+				updateItems + ".l_modifydate": time.Now().Unix(),
+				updateItems + ".i_newfree":    1, //老免费用户=>新订阅设置页面 20211122
 			},
 			}); ok {
 				flag = "y"
@@ -131,6 +132,7 @@ func directSubKWSFree(updateItems string, keys string, userId string) map[string
 					"$set": bson.M{
 						updateItems + ".l_modifydate": time.Now().Unix(),
 						updateItems + ".s_item":       classify_name,
+						updateItems + ".i_newfree":    1, //老免费用户=>新订阅设置页面 20211122
 					},
 				})
 				if ok {
@@ -139,6 +141,10 @@ func directSubKWSFree(updateItems string, keys string, userId string) map[string
 			}
 		}
 	}
+	if flag == "y" {
+		//清楚缓存
+		jy.ClearBigVipUserPower(userId)
+	}
 	return map[string]interface{}{"flag": flag}
 }
 
@@ -188,7 +194,8 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 		if !errs {
 			db.Mgo.UpdateById("user", userId, map[string]interface{}{
 				"$set": map[string]interface{}{
-					types + ".a_key": []map[string]interface{}{},
+					types + ".a_key":     []map[string]interface{}{},
+					types + ".i_newfree": 1, //老免费用户=>新订阅设置页面 20211122
 				},
 			})
 		}
@@ -226,6 +233,7 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 		} else {
 			//修改关键词
 			saveData[types+".s_item"] = className
+			saveData[types+".i_newfree"] = 1 //老免费用户=>新订阅设置页面 20211122
 			saveData[types+".a_key."+keywordsIndex+".key"] = newKws
 			saveData[types+".a_key."+keywordsIndex+".appendkey"] = append(appendKeyword, _kws[1:]...)
 			saveData[types+".a_key."+keywordsIndex+".notkey"] = notKeyword
@@ -234,9 +242,13 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 		}
 	}
 	if len(saveData) > 0 {
-		flag = db.Mgo.UpdateById("user", userId, map[string]interface{}{
+		if db.Mgo.UpdateById("user", userId, map[string]interface{}{
 			"$set": saveData,
-		})
+		}) {
+			flag = true
+			//清楚缓存
+			jy.ClearBigVipUserPower(userId)
+		}
 		SetLog(userId, types)
 	}
 	return map[string]interface{}{"flag": flag, "msg": ""}
@@ -507,11 +519,18 @@ func (this *UpdateOther) UpdateOther() map[string]interface{} {
 		return nil
 	}()
 	flag := true
+	if types == "o_jy" {
+		setMap["o_jy.i_newfree"] = 1 //老免费用户=>新订阅设置页面 20211122
+	}
 	log.Println(setMap)
 	if setMap != nil {
-		flag = db.Mgo.UpdateById("user", this.UserId, map[string]interface{}{
+		if db.Mgo.UpdateById("user", this.UserId, map[string]interface{}{
 			"$set": setMap,
-		})
+		}) {
+			flag = true
+			//清楚缓存
+			jy.ClearBigVipUserPower(this.UserId)
+		}
 		SetLog(this.UserId, types)
 	}
 	return map[string]interface{}{"flag": flag, "msg": ""}

src/jfw/modules/publicapply/src/subscribePush/service/subscribe.go

@@ -67,7 +67,6 @@ func (s *Subscribe) SetUserInfo() {
 		pmindex, _ := s.GetInteger("pmindex")
 		matchtype, _ := s.GetInteger("matchtype")
 		other, _ := s.GetInteger("other")
-		log.Println("--:", s.GetString("pageType"))
 		uo := &entity.UpdateOther{
 			PageType:        s.GetString("pageType"),
 			Pmindex:         pmindex,

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

@@ -649,7 +649,7 @@ func (this *UserAccount) WxUnBind() {
 			(*unsetMap)["o_jy"] = map[string]interface{}{
 				"i_wxpush":   1,
 				"i_ratemode": 2,
-				"i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
+				// "i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
 			}
 			//公众号微信关注移至另一用户中  此时微信公众号用户session问题错乱
 			if saveId := util.MQFW.Save("user", unsetMap); saveId == "" {

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

@@ -501,8 +501,8 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		if newUser["o_jy"] == nil {
 			newUser["i_ts_guide"] = 2
 			newUser["o_jy"] = map[string]interface{}{
-				"i_wxpush":   1,
-				"i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
+				"i_wxpush": 1,
+				// "i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
 				"i_ratemode": 2,
 			}
 		} else {
@@ -589,7 +589,6 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				"s_sourceid":      source,
 				"i_sourceid":      isourceid,
 				"o_jy.i_wxpush":   1,
-				"o_jy.i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
 				"i_ispush":        1,
 				"s_headimageurl":  u.HeadImageUrl,
 				"s_nickname":      u.Nickname,
@@ -597,6 +596,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				"s_country":       u.Country,
 				"s_city":          u.City,
 				"i_sex":           u.Sex,
+				// "o_jy.i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
 			}
 			set["i_applystatus"] = 1
 			if tuser["l_registedate"] == nil {

src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css

@@ -270,7 +270,7 @@
 }
 
 .jy-icon-loaction {
-  background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAN1SURBVHgB7VddUttADJZ2baaPuUHDCQonaDhB4bnlJzPYMzwBJyCcIPCUaRImgbTPgROQnoDcgPQG6UsfcHZVaUOKY2zHyfDWaiZjZ1crfSt9K60B/nVBWEE6nU7pdwRlX+sNIhxbmozfeTCsVqtjWFKWAtBodSoeemf8WslQGZCl6zDc68JbAmg0OmXP9zovjmmMCLdA+Ev+WYD3PLaBgOUZkEk0qR4dVUeLbC8E0Gx2NkD5fQQqi2EgOA+C3UGabqvVqxBSR4Dwb2Qt7oTh5yGsCkB2rn3/Xpyz4uXh4e4JFBAGUmPLkqoxR2IzLxIqz9DMOZA9L+pchCNUk0jxa8nz/X6ebiaA5tXNgds5YjcI9muwpDgQkjLmxtfWTSZ4L9MCKQ4hQfQUnSen5Bg+TfQBg/voBizdGWMGyVALEZm8jwrVPv+9SHOTyoEGk8lDuCeiuzDY247PJUgZM5ROula7dw9yemiyFQTVQdJXagoUh829EB+1ODAmZfxEMPod1tni3zXxmFLUl+jE11jehHuC3kjzlZECAcB7QjOKj+o1XUGiMgHchoe7O7GpAe/0PYOoSGogFm4kMwD0QCv4AKmbzRHEtcc5WJYq7glwndTl8+/Gko6MgdzynAsgE5il0itD3BPSdLWGEiwLgMusM2bAbiZmHMFQ4X5yjQWsu6eBH3MOlFd2tiz9TPPlpaNSAw7zMU5r/18irnmmGxnN41hpt789GrKXqGCMJICkWtIoeNWI8JNLGqphuq8U0XoycA0HYD/Oamm3JjJbTLaRYz1inZ27JiXOI55L2rLPDWzN2SwIQByxAyEVFxw1V8Wk2ISHe+tMuqr0B0TqyrvW5lXNb119P5tV06y7QmYzmrZg/SAqixpK9nrvQcI/iUzm+sxT4BY8NxSfm1KywOSJ6Eojk7VAdLlyNwyCvQsJs+TbWL8OBWVi9VnRRrawDjAha450RAd5XW0mzXbvmKvSiZBSq+h0kf4SVzLHhxJZtZl1y3nOu6uezJv1IrwpVAljfIC0hiMSy7vU5dOipC1ciuN8iIy7oM6JMX59dnULgi8XRe0u1QuED/wYspPt1lXvbDYu552BHbi8T3UKy9IfJnE+CMu535cEkFTOvPP+ZgBEprci3X/5DqAxWbMVhtXhsrZWAjAT+Q7gzlmS3rHKZ9l/EfkD/euwpZMVjc8AAAAASUVORK5CYII=);
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAUrSURBVHgB7VnNUttIEO6RsfHBrjVZwNqbXJsle1t4ghW3vS08AfAEIU+AOe0RuO0N8gSEJ4iP3EJuWyYblFNkUiFOlanYSqRJt/4tJGv0c4u/KldJ8qjn6+me/hkBzDHHjw0GJaHVUlrVenVL4vAHSKByiymMQYv+4xyGjPErDkwDy7wwDLM3HGpDKAGFFSDitXrtKXDY9wingRTCmV9IYBzquqZBARRSoN1+8pQD7yYQ17wLJNxKUo4DdG/1/iHkRC4FZPl3hYN5iq+rPhFyE+DP0VVejMffrqIuQpaq1xfWLZB2cdKdaRb8ivGv23mskVkBh7z1Ei8VCNifTCZfu6J+TTIssLoRRTQGxmZWJTIpEEMeJ7X2dP1ND3IgTt5kbGxk2eASZACu2gFMkacVy0eeoOv/oQxpE4L9oizWq+eQAcIKrMi/ke/uure5zB2Hh0owtf3Lk33R94VcKGpqdJtCKx8/x2OVg/TSZTWcfDE6Iq4kZAETTBVc8hj2zkTJU+Shn8hYWybjJ+BMQrlFyApCFmjLazfgr77RmeU6trW4ifmB7YZiv4aK99ISl50UF2s39ntohcH7/hKkINUCy2hamFr9ZAJOYrNugLFoVlZo/3Co3azKawdJ77su0wNnspbszF1MAQkk1b+x4CJpnE2M8ePIY80uG0JARbqzNqnErJNgutDcifxSgNn1T+/aMIxe3BhyGyIWPOE9y+QbA73fuR30lzDKdKj2Cf1/IMuKEieLsrg/N4d1KKoADlGcOeEqKSq4+cEnP9CvNz98uPaJUKhEf96m/1xZLc6rsVZw5sCq1dYAK9viCnDFEcaTQ1popSwTniUNQ2sGRRtjf0MiLM29UCAFmTJxEnDDOgpg5AivfBQUKkN7QoESUIoCPnh6PyDaM4hCQAHXH4EpSSNwVf1VnxX6lsP/hd55KI/5+QNSIKBA4I+JWZUF4ZUzdhQ3jp5VQDoNxiWHZN8lgWuQgnQFGLz2LqkhiRtijI1j37c5W1+s116trv665RGnladnEKpkMSufxcmKWOk1FFWAce7HbzTtVtwYO/Rxcy/0SGFS5RxLEI7EP1WcIk3x5Vjms6SMjonTb3Kou4M0fiCA1fbaJ68+mVUl0qoj8SNIiDC2lVDR29v/Y4nZnRq3XrkbXaNECCkQi0IMhKpEIka1Pcb7PTdpac6P93ClDo2J0UkiT8CEuOMfxXg1USo1AUxViTQRlgmz4n0euD0HVb22pSRmbIg0TEIWsF3GswK9VGHnonW+CEiW2zA58nEu0W6vAoK4H33sNRqPVDcftCoLknw/uruAEvDT0so/KPcv95Z8f1v03UyZmEFlzwuXDBuWLL1rEqiHwNDrybF77Szv5zgXCvWuUGw/hP3eIcPxiOb6DDIgcy1EBRlFFF9Azv0Q9XuSmZW8PT/kgK73u35tT2c5i7XTjCIAw3GQL/Bo0ZGZHbmrUdoP4BVbDLay7Afy+6kzJjwXhZwodDod3Q8i50VRv8eyYntWckuDcBiNw2h0pzUbP9MiqM4TplYXms/H4+E4bnzogMzeM+T3g8Gbf6EACjc0D/bDjLPNqbPVAn4fRikd2WRs+7Dm3DE17uyHnpXl92EUciEP5DLNxhLW7myX7pGo2mguf8bsfUn3K/LaDq7UsTce9wp+zHhbSi1V2kc+Qrv9eB+YdOTdOx/37MythCY8LMN1PJRiAQ/393eX4U2N5OsAQRNfNnlCqQoQRlj0NRuP3oFNnCnuJ9bLPGXCHHPMkY7vAkJsVjQZfu0AAAAASUVORK5CYII=);
   background-repeat: no-repeat;
   background-size: contain;
 }
@@ -606,4 +606,4 @@
     float: right;
     margin-top: 0.2rem;
     margin-right: 0.2rem;
-  }
+  }

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -113,7 +113,7 @@ var subScribeTemplate = `
       </a>
     </li>
     <li class="body-item push-set" v-if="pushsetShow">
-      <a class="item-container" :href="linkobj.pushsetting">
+      <a class="item-container" :href="linkobj.pushLink || linkobj.pushsetting">
         <div class="item">
           <span class="item-l">
             <span class="leading_ jy-icon-push-set"></span>
@@ -355,6 +355,9 @@ var subComponent = {
         }
         if(this.initdata.industry.length == 0) {
           this.info.industry = '已选：全部'
+          if (this.vSwitch === 'f') {
+            this.info.industry = '请选择采购单位类型'
+          }
         } else {
           this.info.industry = '已选：' + this.initdata.industry.join('、')
         }

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -12,7 +12,9 @@ var subNode = new Vue({
                 keyword: '/front/vipsubscribe/toSetKeyWordPage',
                 infotype: '/front/vipsubscribe/toSetInfoTypePage',
                 resultview: '/front/vipsubscribe/toVIPViewPage',
-                pushsetting: '/front/setting/push_detail?header=超级订阅推送设置&type=super_subscribe'
+                pushsetting: '/front/setting/push_detail?header=超级订阅推送设置&type=super_subscribe',
+                freepush: '/front/setting/push_detail?header=订阅&type=free_subscribe',
+                pushLink: ''
             },
             initData: {},
             userAreaNum: 1, // 用户修改地区剩余次数
@@ -33,6 +35,12 @@ var subNode = new Vue({
         })
     },
     methods: {
+        getPushLink: function () {
+            if (this.vSwitch === 'f') {
+                return this.linkObj.freepush
+            }
+            return this.linkObj.pushsetting
+        },
         superOrderTemplateMounted () {
             $('#pushResultPreview').attr('data-cl-event', 'c_wx_preview_buttonclick')
         },
@@ -78,12 +86,14 @@ var subNode = new Vue({
                 success: function(res) {
                     if (res.data.vt !== 'v' ) {
                         _this.vSwitch = 'f'
+                        _this.linkObj.pushLink = _this.getPushLink()
                         document.title = '订阅管理-免费订阅'
                         $('.update_renew').hide()
                         $('.super-title').text('订阅管理-免费订阅');
                         $('.super-title').css('background', 'none')
                     } else {
                         _this.vSwitch = 'v'
+                        _this.linkObj.pushLink = _this.getPushLink()
                         document.title = '订阅管理-超级订阅'
                         $('.update_renew').show()
                         $('.super-title').show();

src/web/templates/areaPack/wx/page_set_area.html

@@ -302,7 +302,7 @@
                 toPay: function () {
                     this.popupTip = false
                     var area = this.selectedArea
-                    var urlBase = '/jyapp/areaPack/page/buy'
+                    var urlBase = '/areaPack/wx/page/buy'
                     var areaJSON = encodeURIComponent(JSON.stringify(area))
                     this.savePageState()
                     if (this.userType) {

src/web/templates/weixin/tabbar.html

@@ -19,34 +19,11 @@
 
 <div id="tabMesg" v-cloak>
   <van-tabbar v-model="tabActive" active-color="#2ABED1" inactive-color="#171826">
-    <van-tabbar-item @click="routeHref('/jylab/mainSearch',0)">
-      <span>首页</span>
+    <van-tabbar-item @click="routeHref(index)" v-for="(item, index) in tabList" :key="index" :badge="index === 2 ? getMsgCount : ''">
+      <span>{item.label}</span>
       <template #icon="props">
-        <img :src="props.active ? home.active : home.inactive" />
-      </template>
-    </van-tabbar-item>
-    <van-tabbar-item @click="routeHref('/swordfish/newhistorypush',1)">
-      <span>订阅</span>
-      <template #icon="props">
-        <img :src="props.active ? book.active : book.inactive" />
-      </template>
-    </van-tabbar-item>
-    <van-tabbar-item @click="routeHref('/weixin/frontPage/messageCenter/sess/index',2)" :class="{'a-badge':counts==0}" :badge="counts">
-      <span>消息</span>
-      <template #icon="props">
-        <img :src="props.active ? mesg.active : mesg.inactive" />
-      </template>
-    </van-tabbar-item>
-    <van-tabbar-item @click="routeHref('/page_treasurebox/index.html',3)">
-      <span>百宝箱</span>
-      <template #icon="props">
-        <img :src="props.active ? box.active : box.inactive" />
-      </template>
-    </van-tabbar-item>
-    <van-tabbar-item @click="routeHref('/front/wxMyOrder/myMenu',4)">
-      <span>我的</span>
-      <template #icon="props">
-        <img :src="props.active ? my.active : my.inactive" />
+        <img v-show="!props.active" :src="'/images/tabbar/' + item.icon + '.png'" />
+        <img v-show="props.active" :src="'/images/tabbar/' + item.icon + '_active.png'" />
       </template>
     </van-tabbar-item>
   </van-tabbar>
@@ -63,49 +40,95 @@
     return {
 			tabActive: 0,
 			counts: 0,
-			home: {
-				active: '/images/tabbar/home_active.png',
-				inactive: '/images/tabbar/home.png',
-			},
-			book: {
-				active: '/images/tabbar/book_active.png',
-				inactive: '/images/tabbar/book.png',
-			},
-			mesg: {
-				active: '/images/tabbar/mesg_active.png',
-				inactive: '/images/tabbar/mesg.png',
-			},
-			box: {
-				active: '/images/tabbar/box_active.png',
-				inactive: '/images/tabbar/box.png',
-			},
-			my: {
-				active: '/images/tabbar/mine_active.png',
-				inactive: '/images/tabbar/mine.png',
-			}
+            tabList: [
+              {
+                label: '首页',
+                icon: 'home',
+                url: '/jylab/mainSearch',
+                index: 0
+              },
+              {
+                label: '订阅',
+                icon: 'book',
+                url: '/swordfish/newhistorypush',
+                index: 1
+              },
+              {
+                label: '消息',
+                icon: 'mesg',
+                url: '/weixin/frontPage/messageCenter/sess/index',
+                index: 2
+              },
+              {
+                label: '百宝箱',
+                icon: 'box',
+                url: '/page_treasurebox/index.html',
+                index: 3
+              },
+              {
+                label: '我的',
+                icon: 'mine',
+                url: '/front/wxMyOrder/myMenu',
+                index: 4
+              },
+            ]
 		}
 	},
 	created() {
 		this.tabsCount()
-    this.tabActive = Number(getQueryString('msg'))
+        var uMsg = Number(getQueryString('msg') || this.getURLIndex())
+        this.tabActive = uMsg
 	},
+    computed: {
+      getMsgCount: function () {
+        return this.counts ? (this.counts > 99 ? '99+' : this.counts) : ''
+      }
+    },
 	methods: {
+        getURLIndex: function () {
+          try {
+            var tempUrl = this.findMapsForUrl(this.tabList, location.pathname)
+            if (tempUrl.length) {
+              return tempUrl[0].index
+            } else {
+              return ''
+            }
+          } catch (e) {
+            return ''
+          }
+        },
+        findMapsForUrl: function (arr, url) {
+          var tempReuslt = []
+          arr.forEach(function (v) {
+            if (url.indexOf(v.url) !== -1) {
+              tempReuslt.push(v)
+            }
+          })
+          return tempReuslt.sort(function(a,b) {
+            return b.url.length - a.url.length
+          })
+        },
 		tabsCount() {
-      const _this = this
-      $.ajax({
-        type:'GET',
-        url:'/jymessageCenter/isMsgOpen',
-        data: {},
-        success:function (res) {
-          if (res && res.status == 1) {
-            _this.counts = res.data.count > 99 ? '99+' : res.data.count
+          const _this = this
+          $.ajax({
+            type:'GET',
+            url:'/jymessageCenter/isMsgOpen',
+            data: {},
+            success:function (res) {
+              if (res && res.status == 1 && res.data && res.data.count) {
+                _this.counts = res.data.count
+              }
+            }
+          })
+        },
+		routeHref(index) {
+          var goHref = this.tabList[index].url + '?msg=' + index
+          if (index === this.tabActive) {
+            location.replace(goHref)
+          } else {
+            location.href = goHref
           }
-        }
-      })
-    },
-		routeHref(url, status) {
-      location.href = url + '?msg=' + status
 		}
 	}
 })
-</script>
+</script>

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

@@ -193,11 +193,11 @@
             <div class="provincePay">
               <div class="provincePay-text">订阅周期：${subscribeTime}</div>
               <div class="provincePay-text provincePay-numText">
-                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span><span v-show="userAreaAllNum !== '全国'">个</span>
+                省份数量：<span class="provincePay-num">&nbsp;<span v-html="userAreaAllNum"></span>&nbsp;</span>${userAreaAllNum !== '全国' ? '个' : ''}
               </div>
               <div class="provincePay-btnWrap">
                 <div class="privincePay-btn" @click="renewBtn">续费</div>
-                <div class="privincePay-btn updateColor" @click="updateBtn">升级</div>
+                <div class="privincePay-btn updateColor" v-if="userAreaAllNum !== '全国'" @click="updateBtn">升级</div>
               </div>
             </div>
         </div>

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

@@ -810,7 +810,9 @@
                 toBuyAreaPack: function () {
                   this.dialog.backTip = false
                   this.saveState()
-                  location.href = '/areaPack/wx/page/buy'
+                  setTimeout(function () {
+                    location.href = '/areaPack/wx/page/buy'
+                  }, 20)
                 },
                 restoreState: function () {
                   var k = sessionStorage.getItem(this.sessKey)

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

@@ -1,7 +1,7 @@
 <html>
 <head>
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-	<title>超级订阅结果预览</title>
+	<title>订阅结果预览</title>
 	{{include "/common/mnc.html"}}
 	<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"}}1" rel="stylesheet">