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

src/jfw/filter/pcfilter.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/jyutil"
+	"jfw/public"
 	"net/http"
 	"qfw/util"
 	"qfw/util/redis"
@@ -28,7 +29,7 @@ func (this *pcFilter) Do() bool {
 	if this.R.Method == "POST" {
 		return true
 	}
-	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) {
+	if userAgent := this.R.UserAgent(); mobileReg.MatchString(userAgent) || public.CheckWxBrowser(this.R) {
 		//wx
 		return true
 	}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/public.css

@@ -227,8 +227,7 @@ input::placeholder {
     font-size: 17px;
     color: #171826;
     transform: translateX(-50%);
-    display: block;
-    width: max-content;
+    white-space: nowrap;
 }
 
 .j-header .header-right {

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1944,20 +1944,20 @@
             try {
                 var isUserNext = oCookie != {{session "userId"}}
                 if (isUserNext) {
-                    localStorage.removeItem('home_top_search_ent_history_2021')
-                    localStorage.removeItem('home_top_search_buyer_history_2021')
+                    localStorage.removeItem('home_top_search_ent_history_202109')
+                    localStorage.removeItem('home_top_search_buyer_history_202109')
                 }
             } catch (e) {
                 console.log('cookie 获取失败02')
             }
         } else {
-            localStorage.removeItem('home_top_search_ent_history_2021')
-            localStorage.removeItem('home_top_search_buyer_history_2021')
+            localStorage.removeItem('home_top_search_ent_history_202109')
+            localStorage.removeItem('home_top_search_buyer_history_202109')
         }
     }
 
     function saveSearchHistory (type, insetStr, entId) {
-        var saveOnlyKey = 'home_top_search_' + type + '_history_2021'
+        var saveOnlyKey = 'home_top_search_' + type + '_history_202109'
         var oldArr = JSON.parse(localStorage.getItem(saveOnlyKey) || '[]')
         var oldIds = JSON.parse(localStorage.getItem(saveOnlyKey + '_ids') || '[]')
         // 检查原数组中是否存有本次查询字符串
@@ -1983,7 +1983,7 @@
     }
 
     function clearSearchHistory (type) {
-        var saveOnlyKey = 'home_top_search_' + type + '_history_2021'
+        var saveOnlyKey = 'home_top_search_' + type + '_history_202109'
         localStorage.removeItem(saveOnlyKey)
         localStorage.removeItem(saveOnlyKey  + '_ids')
         var domNode = $('.del_' + type + '_history')
@@ -1996,7 +1996,7 @@
     function getSearchHistory (type, setDom) {
         clearOtherUserLocalStorage()
         console.log('tyoe', type)
-        var saveOnlyKey = 'home_top_search_' + type + '_history_2021'
+        var saveOnlyKey = 'home_top_search_' + type + '_history_202109'
         var oldArr = JSON.parse(localStorage.getItem(saveOnlyKey) || '[]')
         var oldIds = JSON.parse(localStorage.getItem(saveOnlyKey  + '_ids') || '[]')
         if (setDom) {
@@ -2037,4 +2037,4 @@
         })
     })
 </script>
-<!--E-脚本-->
+<!--E-脚本-->

src/main.go

@@ -103,7 +103,6 @@ func initXweb() {
 	xweb.RootApp().SetConfig("schecm", Sysconfig["agreement"])
 	xweb.RootApp().AppConfig.ReloadTemplates = true
 	xweb.RootApp().AppConfig.SessionTimeout = time.Hour * time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 168))
-	log.Println("~~~", time.Hour*time.Duration(util.IntAllDef(Sysconfig["sessionTimeout"], 168)))
 	xweb.RootApp().AppConfig.CacheTemplates = Sysconfig["cacheflag"].(bool)
 	xweb.RootApp().AddTmplVar("Msg", tag.Msg)
 	xweb.RootApp().AddTmplVar("Ad", tag.Ad)