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

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

@@ -23,7 +23,8 @@ var subNode = new Vue({
             userType: false, // 用户是否为付费用户
             userAreaAllNum: 1, // 用户可修改地区总次数
             subscribeTime: '', // 用户订阅的时间
-            vSwitch: '' // 用户权限
+            vSwitch: '', // 用户权限
+            freeUserArea: {}, // 购买省份订阅包的用户所选择的地区
         }
     },
     created () {
@@ -46,7 +47,11 @@ var subNode = new Vue({
         },
         // 省份订阅包升级 
         updateBtn: function () {
-            location.href = '/jyapp/areaPack/page/buy?type=upgrade'
+            let thisList = []
+            for (const key in this.freeUserArea) {
+                thisList.push(key)
+            }
+            location.href = '/jyapp/areaPack/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(thisList))
         },
         // 得到用户是否购买省份包
         getUserSubscribe: function () {
@@ -55,6 +60,7 @@ var subNode = new Vue({
                 url: '/publicapply/free/subscribe',
                 type: 'POST',
                 success: function (res) {
+                    _this.freeUserArea = res.data.area
                     _this.userAreaNum = res.data.areanum
                     _this.userType = res.data.provincenum === 0 ? false : true
                     _this.userAreaAllNum = res.data.provincenum

src/jfw/modules/app/src/web/templates/areaPack/page_set_area.html

@@ -219,14 +219,13 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.areanum
+                    maxSelect = res.data.provincenum + res.data.basenum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)
                     } else {
                         $('#canSelect').text(`${maxSelect}个省`)
                     }
-                    
                 }
             })
         }

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -94,7 +94,7 @@
                 <div class="updateTips-btnWrap">
                     <div class="updateTips-btn" id="cancel" @click="hiddenTips">取消</div>
                     <div class="updateTips-line"></div>
-                    <div class="updateTips-btn levelUp" id="newLevelUp"  @click="updateJump">立即升级</div>
+                    <div class="updateTips-btn levelUp" id="newLevelUp"  @click="updateJump">立即更新</div>
                 </div>
             </div>
         </div>

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

@@ -73,7 +73,7 @@ func GetBuyerPortraitData(screen *PortraitScreen) (map[string]interface{}, error
 func BuyerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(false)
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)
 

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

@@ -106,7 +106,7 @@ func GetProjectContactsMsg(buyerName, entId string) (list []map[string]interface
 func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(true)
 
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)

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

@@ -100,11 +100,12 @@ func (ps *PortraitScreen) PareMatchType(isBidding ...bool) (items []string) {
 }
 
 //PareTimeSelect 格式筛选时间，默认2年
-func (ps *PortraitScreen) PareTimeSelect() (st, et time.Time) {
+func (ps *PortraitScreen) PareTimeSelect(checkPower bool) (st, et time.Time) {
 	now := time.Now()
 	sYear := now.Year() - 4
 	eYear := now.Year()
-	if yearArr := strings.Split(ps.TimeRange, "_"); ps.HasPower && len(yearArr) == 2 {
+	//需要校验权限时 无权限默认查询两年
+	if yearArr := strings.Split(ps.TimeRange, "_"); (!checkPower || ps.HasPower) && len(yearArr) == 2 {
 		if tYear := qutil.IntAll(yearArr[0]); tYear > sYear { //选择开始时间不得早于4年
 			sYear = tYear
 		}
@@ -191,7 +192,7 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 		}
 	}
 	//按照当前年份，往前推4年，共5个年份可选
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(true)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"publishtime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
 
 	//地区多选，选项：全部（初始值）、项目地区（省、直辖市）
@@ -271,7 +272,7 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"term":{"buyer":"%s"}}`, pwp.Screen.Ent))
 
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(false)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
 
 	//文本输入框，字数限制50个字，超过上限不再允许输入内容

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

@@ -20,6 +20,7 @@ var subNode = new Vue({
             userAreaAllNum: 1, // 用户可修改地区总次数
             subscribeTime: '', // 用户订阅的时间
             vSwitch:'', // 用户版本权限
+            freeUserArea: {}, // 购买省份订阅包的用户所选择的地区 
         }
     },
     created () {
@@ -45,6 +46,7 @@ var subNode = new Vue({
                 url: '/publicapply/free/subscribe',
                 type: 'POST',
                 success: function (res) {
+                    _this.freeUserArea = res.data.area
                     _this.userAreaNum = res.data.areanum
                     _this.userType = res.data.provincenum === 0 ? false : true
                     _this.userAreaAllNum = res.data.provincenum
@@ -60,7 +62,12 @@ var subNode = new Vue({
         },
         // 省份订阅包升级 
         updateBtn: function () {
-            location.href = '/areaPack/wx/page/buy?type=upgrade'
+            // '&area=' +  encodeURIComponent(JSON.stringify(thisData))
+            let thisList = []
+            for (const key in this.freeUserArea) {
+                thisList.push(key)
+            }
+            location.href = '/areaPack/wx/page/buy?type=upgrade&area=' +  encodeURIComponent(JSON.stringify(thisList))
         },
         // 判断用户权限版本
         getUserType: function (data) {

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

@@ -213,7 +213,7 @@
                 type: 'POST',
                 success: function (res) {
                     userType = res.data.provincenum === 0 ? false : true
-                    maxSelect = res.data.provincenum
+                    maxSelect = res.data.provincenum  + res.data.basenum
                     // _this.$emit('UserSubscribe',res)
                     if (maxSelect === -1) {
                         $('#canSelect').text(`全国`)

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

@@ -157,7 +157,7 @@
                 <div class="updateTips-btnWrap">
                     <div class="updateTips-btn" id="cancel" @click="hiddenTips">取消</div>
                     <div class="updateTips-line"></div>
-                    <div class="updateTips-btn levelUp" id="newLevelUp"  @click="updateJump">立即升级</div>
+                    <div class="updateTips-btn levelUp" id="newLevelUp"  @click="updateJump">立即更新</div>
                 </div>
             </div>
         </div>