Merge branch 'dev/v4.9.16_cyl' of qmx/jy into feature/v4.9.16

src/web/staticres/js/login.js

@@ -343,7 +343,13 @@ var redisUserInfo = function(pid,kid){
 		}
 	})
 }
-function checkBigStatus () {
+
+// (必要！)优先获取用户权限，不管用户有没有登陆，以便在页面中更早的拿到权限
+ajaxGetUserPower()
+function ajaxGetUserPower (conf) {
+  conf = conf || {}
+  var success = conf.success
+  var complete = conf.complete
   $.ajax({
     type: 'post',
     url: '/bigmember/use/isAdd',
@@ -362,41 +368,52 @@ function checkBigStatus () {
         window.isNewEntNiche = res.data.entIsNew
         window.isEntService = res.data.isEntService
         sessionStorage.setItem('bidPower', JSON.stringify(res.data.power))
-        try {
-          setUserFree()
-        } catch (error) {}
-        if (res.data.memberStatus > 0) {
-          $(".myorderDiv.lastBox").show()
-        }
-        if (res.data.viper) {
-          $(".myorderDiv.ent-search").show()
+        success && success(res)
+      }
+    },
+    complete: function () {
+      complete && complete()
+    }
+  })
+}
+
+function checkBigStatus () {
+  ajaxGetUserPower({
+    success: function (res) {
+      try {
+        setUserFree()
+      } catch (error) {}
+      if (res.data.memberStatus > 0) {
+        $(".myorderDiv.lastBox").show()
+      }
+      if (res.data.viper) {
+        $(".myorderDiv.ent-search").show()
+      }
+      if(res.data.power && res.data.power.length) {
+        if (res.data.power.indexOf(4) == -1 && res.data.vipStatus>0&&res.data.viper) {
+          $(".myorderDiv.entPortraitRecord").show()
         }
-        if(res.data.power && res.data.power.length) {
-          if (res.data.power.indexOf(4) == -1 && res.data.vipStatus>0&&res.data.viper) {
-            $(".myorderDiv.entPortraitRecord").show()
-          }
-          if (res.data.power.indexOf(5) == -1 && res.data.vipStatus>0&&res.data.viper) {
-            $(".myorderDiv.buyerPortraitRecord").show()
-          }
+        if (res.data.power.indexOf(5) == -1 && res.data.vipStatus>0&&res.data.viper) {
+          $(".myorderDiv.buyerPortraitRecord").show()
         }
-		if (res.data.memberStatus<=0&&res.data.vipStatus>0&&res.data.viper){
-			$(".myorderDiv.portraitRecord").show()
-		}
-	   if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) === -1) {
-		  $('.fileRecord').show()
-	   }
+      }
+      if (res.data.memberStatus<=0&&res.data.vipStatus>0&&res.data.viper){
+        $(".myorderDiv.portraitRecord").show()
+      }
+      if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) === -1) {
+        $('.fileRecord').show()
+      }
 
-	   if (res.data.memberStatus <= 0 && res.data.vipStatus > 0 && res.data.viper) {
-		   $('.fileRecord').show()
-	   }
+      if (res.data.memberStatus <= 0 && res.data.vipStatus > 0 && res.data.viper) {
+        $('.fileRecord').show()
+      }
 
 
-		if ($.isArray(res.data.power)) {
-		  // 大会员没有附加下载包权限用户且新版超级订阅用户
-		  if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) === -1) {
-			  $('.fileRecord').show()
-		  }
-		}
+      if ($.isArray(res.data.power)) {
+        // 大会员没有附加下载包权限用户且新版超级订阅用户
+        if (res.data.memberStatus > 0 && res.data.vipStatus > 0 && res.data.viper && res.data.power.indexOf(3) === -1) {
+          $('.fileRecord').show()
+        }
       }
     },
     complete: function () {

src/web/templates/pc/supsearch.html

@@ -149,6 +149,15 @@
         saveFiltersToStorage()
       }
     }
+    function getFilterFromStorageWithPower() {
+      var isMember = window.memberStatus > 0
+      var isVip = window.vipStatus > 0
+      if (isMember || isVip) {
+        return getFilterFromStorage()
+      } else {
+        return ''
+      }
+    }
 
     // 定义全局变量
     var industry = {{.T.industry}}!=null?{{.T.industry}}:""; // 行业模版变量-选中的数据(下划线拼接字符串)
@@ -4843,15 +4852,19 @@ function checkTagDisabled () {
             }
           },
           complete: function() {
-            _this.restoreFilterStateFormLocal()
+            setTimeout(function() {
+              _this.restoreFilterStateFormLocal()
+            }, 200)
           }
         })
       },
       restoreFilterStateFormLocal: function () {
+        // 如果有nostore参数，则不进行默认恢复
+        if (getParam('nostore')) return
         // 如果后端解析的表单中有值，则不进行恢复
         if (searchvalue) return
         // 尝试取缓存中数据，取不到.则取已存筛选第1项，如果还取不到，则不做任何操作.
-        var lastFilters = getFilterFromStorage()
+        var lastFilters = getFilterFromStorageWithPower()
         if (lastFilters) {
           var card = this.sortFilterItem(lastFilters)
           this.lastFiltersFormatted = card