Merge branch 'dev4.5.2' of http://127.0.0.1:8080/qmx/jy into dev4.5.2

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -205,10 +205,10 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total < this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
         },
         surplus: function () {
-            return this.entvisit.total >= this.entvisit.usage
+            return this.entvisit.total > this.entvisit.usage
         }
     },
     methods: {

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

@@ -340,7 +340,7 @@ var renew = {
             }
             sizeTime = size.period
           } else {
-            sizeTime = '1个月'
+            sizeTime = '1年'
           }
           console.log(upgrade,sizeTime, '新or老')
             $('.vip-footer.renew .confirm').prop('disabled', true)

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -195,7 +195,7 @@
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
                     <span v-if="!hasOnePower || !surplus" class="bid_upgrade">升级</span>
-                    <span v-if="hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
+                    <span v-if="!hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
                     <div class="card-row zb-info">

src/jfw/modules/common/src/qfw/util/bidsearch/search.go

@@ -124,9 +124,9 @@ func GetBidSearchQuery(area, publishtime, subtype, winner, buyerclass string) st
 			starttime = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, 0, 0, 0, 0, time.Local).Unix())
 		} else if publishtime == "lately-30" { //最近30天
 			starttime = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Unix())
-		} else if publishtime == "thisyear" { //去年
-			starttime = fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Unix())
-			endtime = fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Unix())
+		} else if publishtime == "thisyear" { //最近一年
+			starttime = fmt.Sprint(time.Date(now.Year()-1, now.Month(), now.Day(), now.Hour(), now.Minute(), now.Second(), 0, time.Local).Unix())
+			endtime = fmt.Sprint(now.Unix())
 		} else {
 			starttime = strings.Split(publishtime, "_")[0]
 			endtime = strings.Split(publishtime, "_")[1]

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

@@ -56,23 +56,21 @@ func (this *BigVipBaseMsg) SubVipPortraitTimesCheck(mysql *mysql.Mysql, entId st
 		return nil
 	}
 
+	//校验本月次数是否使用完
+	useKey := fmt.Sprintf(PortraitRecordTimes, this.Uid, int(now.Month()))
+	useCount := redis.GetInt(PowerCacheDb, useKey)
+	if this.Vip_BuySet.AreaCount == -1 {
+		fullCount = 16 * OneAreaTimes //全国全国行业
+	} else {
+		fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
+	}
+	if useCount >= fullCount {
+		return fmt.Errorf("本月次数已使用完")
+	}
+
 	//并发控制
 	if redis.Incr(PowerCacheDb, fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId)) == 1 {
 		_ = redis.SetExpire(PowerCacheDb, fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId), 60*60*5)
-		if this.Vip_BuySet.AreaCount == -1 {
-			fullCount = 16 * OneAreaTimes //全国全国行业
-		} else {
-			fullCount = this.Vip_BuySet.AreaCount * OneAreaTimes
-		}
-
-		//校验本月次数是否使用完
-		useKey := fmt.Sprintf(PortraitRecordTimes, this.Uid, int(now.Month()))
-
-		useCount := redis.GetInt(PowerCacheDb, useKey)
-		if useCount >= fullCount {
-			return fmt.Errorf("本月次数已使用完")
-		}
-
 		//新增使用记录
 		if mysql.Insert(PortraitRecordTable, map[string]interface{}{
 			"user_id":     this.Uid,

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -204,10 +204,10 @@ var vNode = {
         },
         // 查看次数为零，显示遮罩
         getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
+            return (!this.conf._4 && !this.isVip) || (this.entvisit.total < this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited)
         },
         surplus: function () {
-            return this.entvisit.total >= this.entvisit.usage
+            return this.entvisit.total > this.entvisit.usage
         }
     },
     methods: {

src/web/staticres/js/ent-search-index-pc.js

@@ -181,7 +181,7 @@ var vm = new Vue({
         tabActive: function (newVal, oldVal) {
             if (newVal === 'zb') {
                 if (this.searchContent) {
-                    location.href = '/jylab/supsearch/index.html?keywords=' + this.searchContent
+                    location.href = '/jylab/supsearch/index.html?keywords=' + this.searchContent + '&publishtime=lately-30'
                 } else {
                     location.href = '/jylab/supsearch/index.html'
                 }

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -341,7 +341,7 @@ var renew = {
               }
               sizeTime = size.period
             } else {
-              sizeTime = '1个月'
+              sizeTime = '1年'
             }
             console.log(upgrade,sizeTime, '新or老')
             //支付请求

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -200,7 +200,7 @@
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
                     <span v-if="!hasOnePower || !surplus" class="bid_upgrade">升级</span>
-                    <span v-if="hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
+                    <span v-if="!hasOnePower && surplus && isVip" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
                     <div class="card-row zb-info">

src/web/templates/pc/supsearch.html

@@ -1424,6 +1424,11 @@ $(function(){
   $(document).click(function() {
     $('.custom-select').css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
     $('.custom-select').siblings().hide()
+
+    // 隐藏标签添加弹框
+    if (!$('.tags-box').is(':hidden')){
+      $('.tags-box').hide()
+    }
   })
   // 全选
   $('.custom-checkbox.check-all').on('change', function() {
@@ -1519,9 +1524,8 @@ $(function(){
     var hasVipIcon = $(this).siblings().hasClass('icon-vip'); // 有无点击付费的搜索范围
     // 如果是老用户（版本更新前注册的用户）可以使用中标企业搜索范围
     // 不是付费用户引导去付费
-    console.log($(this).text() === '中标企业',isOld)
     if (!vipState && hasVipIcon) {
-      if($(this).text() == '中标企业' && isOld) {
+      if($(this).text().indexOf('中标企业')> -1 && isOld) {
         var typeArr = selectType ? selectType.split(',') : []
         var isChecked = $(this).hasClass('checkbox-checked')
         if(isChecked) {
@@ -1538,9 +1542,9 @@ $(function(){
           selectType = typeArr.toString()
           beforeSubmit();
         }
-        return true
+      } else{
+        openVipDialog('搜索范围')
       }
-      openVipDialog('搜索范围')
       return
     }
     

src/web/templates/weixin/search/tabSearch.html

@@ -1329,7 +1329,7 @@
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 				</span><br>
-            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
+<!--            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>-->
         </div>
         <div class="text-center" id="feedback" style="width:100%;">
             <div class="jy_sprite_main sprite_jyyjfk" style="transform: scale(1.21);margin-top: 15px;"></div>