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/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/common/src/qfw/util/jy/subvipPortrait.go

@@ -56,6 +56,14 @@ 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 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)
@@ -65,14 +73,6 @@ func (this *BigVipBaseMsg) SubVipPortraitTimesCheck(mysql *mysql.Mysql, entId st
 			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/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/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() {