Merge remote-tracking branch 'origin/feature/v4.9.27' into v4.9.27_fu

src/config.json

@@ -465,5 +465,23 @@
   "precisionNum": 50,
   "ossUrl":"https://jydocs-previewimg.oss-cn-beijing.aliyuncs.com/%s",
   "docinUrl":"https://img3.douding.cn/docin_%s_90x80.jpg",
-  "h5": "https://h5.jianyu360.cn"
+  "h5": "https://h5.jianyu360.cn",
+  "indexDocClass": [
+    {
+      "class": "招标文件",
+      "search": "招标文件"
+    },
+    {
+      "class": "办公文档",
+      "search": "招标投标"
+    },
+    {
+      "class": "行业报告",
+      "search": "行业报告"
+    },
+    {
+      "class": "建筑/环境",
+      "search": "建筑/环境"
+    }
+  ]
 }

src/go.mod

@@ -1,13 +1,15 @@
 module jy/src
 
-go 1.19
+go 1.21
+
+toolchain go1.22.4
 
 require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20240412015757-6d8429bb4dae
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.5
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
+	app.yhyue.com/moapp/jypkg v1.21.7
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/fsnotify/fsnotify v1.7.0
@@ -25,7 +27,7 @@ require (
 	app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb // indirect
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2 // indirect
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843 // indirect
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/BurntSushi/toml v1.2.0 // indirect

src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240412015757-6d8429bb4dae/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.21.5 h1:maU7dRSMLAUB8GLDyQoS9BKKwiNAO+grTZwKj4sJphc=
-app.yhyue.com/moapp/jypkg v1.21.5/go.mod h1:wyJeNc8I9R5799tqch7n8SEZrB0s8nmNou0brBh91w4=
+app.yhyue.com/moapp/jypkg v1.21.7 h1:maTxUGz6djnrkvDk9S4Y7IY3a/yzuiolnQJRFZOBwgg=
+app.yhyue.com/moapp/jypkg v1.21.7/go.mod h1:LlxnGEQUJALOD85IcaPU7FlYxlILF9OL1ctRRap0Kj0=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -31,8 +31,8 @@ bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2 h1:Qi8C7gZeR7+kjOtSl9ilR5HwbjCe8GO1RuotFb4+kFA=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2/go.mod h1:v8y7FCbkKEIRP4Ie9ZM8NtoRP+Fk4O3C1hnexNusYIQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b h1:6f/if8nVoR89n7RbgFEniiUqt4QpqJNQX2kS2JJHDEM=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843 h1:u+8k/T0D6EUjj9BhI5RJdRa+8v4FZbyZhaNcm66L6Vs=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743/go.mod h1:1SQIPPL5Ya5BzQdByFKtTkXrXTWBv+PDqWIhNknLnZw=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
@@ -41,8 +41,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16 h1:CckcpZZs1jb76sn8b7YDJZTh30py1RymWzuj3FVO6iI=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16/go.mod h1:2V4LPtebYd1sN0xFoWF0OC8M2PCzKubVxXA0f5+stnY=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18 h1:aJNS24p6SOAOsCMvdOF0togsiO6HxmLIExVyTjog8Io=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18/go.mod h1:03bxckJBVCjal3uQ1loJmupbYHWRnaRC3V5LG4bgg6Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -857,10 +857,12 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE=
+github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I=
 github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
 github.com/alicebob/miniredis/v2 v2.30.5/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/alicebob/miniredis/v2 v2.32.1 h1:Bz7CciDnYSaa0mX5xODh6GUITRSx+cVhjNoOR4JssBo=
+github.com/alicebob/miniredis/v2 v2.32.1/go.mod h1:AqkLNAfUm0K07J28hnAyyQKf/x0YkCY/g5DCtuL01Mw=
 github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -891,7 +893,9 @@ github.com/bos-hieu/mongostore v0.0.2/go.mod h1:8AbbVmDEb0yqJsBrWxZIAZOxIfv/tsP8
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
@@ -1005,6 +1009,7 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -1091,6 +1096,7 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -1139,6 +1145,7 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1232,6 +1239,7 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1539,6 +1547,7 @@ github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkA
 github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
 github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1556,6 +1565,7 @@ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2
 github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
 github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
@@ -1655,6 +1665,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1774,6 +1785,7 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJB
 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
@@ -2407,6 +2419,7 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

src/index.yaml

@@ -83,11 +83,9 @@ topMenu:
         href: /swordfish/frontPage/enterpriseCertificatio/free/index
       - name: 中标必听课
         href: /jyxspc
-      - name: 商务合作
+      - name: 渠道及商务合作
         href: /swordfish/frontPage/cooperation/free/index
         class: red
-      - name: 合作招募
-        href: /swordfish/frontPage/partner/free/index
       - name: 发布供需信息
         href: /swordfish/frontPage/InformationDistribution/free/index
         class: red

src/jfw/front/index.go

@@ -299,17 +299,18 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 		docinUrl = common.InterfaceToStr(config.Sysconfig["docinUrl"]) //"https://img3.douding.cn/docin_%s_90x80.jpg"
 	)
 	//浏览量前十的一级分类
-	classSql := `SELECT dc.name,dc.code FROM jydocs.doc_class_statistics dcs LEFT JOIN jydocs.doc_class dc ON dcs.code = dc.code AND dcs.state = dc.state WHERE dc.level = 1 ORDER BY dcs.total DESC ;`
-	docClassNames := public.BaseMysql.SelectBySql(classSql)
-	if docClassNames != nil && len(*docClassNames) > 0 {
+	docClassNames := config.Sysconfig["indexDocClass"].([]interface{})
+	if docClassNames != nil && len(docClassNames) > 0 {
 		docSql := `SELECT d.id,d.docName,d.docFileSuffix,d.docTags,d.previewImgId,d.productType,d.source FROM jydocs.doc d LEFT JOIN jydocs.doc_statistics ds ON d.id=ds.docId WHERE FIND_IN_SET(?,d.docTags) ORDER BY ds.viewTimes DESC LIMIT 10 `
-		for _, dv := range *docClassNames {
-			if len(docClass) > 7 {
-				break
+		for _, dv := range docClassNames {
+			tmpClass := common.ObjToMap(dv)
+			if tmpClass == nil {
+				continue
 			}
-			name := common.InterfaceToStr(dv["name"])
+			name := common.InterfaceToStr((*tmpClass)["class"])
+			search := common.InterfaceToStr((*tmpClass)["search"])
 			indexDoc := []map[string]interface{}{}
-			docs := public.BaseMysql.SelectBySql(docSql, name)
+			docs := public.BaseMysql.SelectBySql(docSql, search)
 			if docs != nil && len(*docs) > 0 {
 				for dock, docv := range *docs {
 					if dock > 7 {
@@ -332,10 +333,9 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 					})
 				}
 			}
-			if len(indexDoc) > 0 {
-				docClass = append(docClass, name)
-				indexDocs = append(indexDocs, indexDoc)
-			}
+			docClass = append(docClass, name)
+			indexDocs = append(indexDocs, indexDoc)
+
 		}
 	}
 	if len(indexDocs) > 0 {

src/jfw/modules/app/src/app/front/wx.go

@@ -26,8 +26,8 @@ func init() {
 // 微信首页地址
 func (w *WX) Index(pageLabel string) error {
 	log.Println("---sessionId----:", w.Session().Id())
-	//是否是移动端
-	if bm := mobileReg.MatchString(w.Header("User-Agent")); bm {
+	//是否是电脑端
+	if bm := mobileReg.MatchString(w.Header("User-Agent")); !bm {
 		return w.Redirect(fmt.Sprintf("%s/partner/%s", config.Sysconfig["mainDomainName"].(string), pageLabel))
 	}
 	//未登录

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

@@ -135,6 +135,8 @@ var vNode = {
       },
       importantCustomers: [],
       scrollTop: 0,
+      // 页面滚动距离
+      pageScrollTop: 0,
       getEntPortraitInfoTimes: 0,
       initEchartsOptions: {
         renderer: 'svg'
@@ -361,8 +363,8 @@ var vNode = {
       }
     },
     // 监听画像页面滚动
-    onEntScroll: utils.debounce(function () {
-      // do something
+    onEntScroll: utils.debounce(function (e) {
+      this.pageScrollTop = e.target.scrollTop
     }, 50),
     scrollHeight: function () {
       var storageClick = JSON.parse(sessionStorage.getItem('is-click-set'))

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

@@ -174,7 +174,9 @@ var vNode = {
       buyerHighSet: '',
       unitParams: {},
       follow:false, // 是否监控
-      allpower:{}
+      allpower:{},
+      // 页面滚动距离
+      pageScrollTop: 0
     }
   },
   computed: {
@@ -363,7 +365,8 @@ var vNode = {
     getStickyTop: function () {
       this.stickyTop = $('.j-header.jy-app-header').outerHeight()
     },
-    onUnitScroll: utils.debounce(function () {
+    onUnitScroll: utils.debounce(function (e) {
+      this.pageScrollTop = e.target.scrollTop
       if (!this.getfreeBuyerOpen) return
     }, 300),
     // 判断当前用户是登录
@@ -851,7 +854,7 @@ var vNode = {
               data: JSON.stringify(params),
               success: function(res) {
                 if (res.data && !_this.follow) { // 为监控调用组件函数 相关逻辑统一组件内处理
-                  _this.$refs.portrayalFooter.no_monitor(res.data)   
+                  _this.$refs.portrayalFooter.no_monitor(res.data)
                 }
                 if (res && res.error_code === 0 && res.data.status) {
                   if (_this.follow) {
@@ -862,7 +865,7 @@ var vNode = {
 
                   } else {
                     // 关注操作返回
-                    _this.follow = true  
+                    _this.follow = true
                     _this.updataStorage(decodeURIComponent(utils.getParam('entName')),'isFollowed',true)
                   }
                 } else {

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

@@ -98,7 +98,7 @@
 <body>
 <div class="j-container">
   {{include "/big-member/header.html"}}
-  <div id="client_portrayal" class="j-main" v-cloak @click="doubleBar.showTooltip = false">
+  <div id="client_portrayal" class="j-main" v-cloak @click="doubleBar.showTooltip = false"  @scroll="onUnitScroll">
     <div v-if="chartLoading" class="skeleton">
       <img class="working"  src="/jyapp/big-member/image/working.gif" alt="">
     </div>
@@ -132,7 +132,7 @@
           <forwardshare :params="clientParams"></forwardshare>
         </div> -->
       </div>
-      
+
       <!-- 超级订阅用户展示  -->
       <!-- <div v-if="superVipPort" style="margin-top: .24rem; " class="free-give">
         <div class="balance-text"> 当月采购单位画像余额：<em class="highlight-text">${usageInfo.surplus}</em></div>
@@ -576,6 +576,8 @@
     </div>
     <!-- 底部按钮组件 -->
     <mobile-portrayal-footer ref="portrayalFooter" @monitorclick="changeFollowState('g')" @claimclick="changeClaimState" :islogin="true" :monitorshow="true" :monitor="follow" :params="clientParams" :shareshow="true" :claimshow="claimShow" :claim="claim" :allpower="powerInfo"></mobile-portrayal-footer>
+      <!--客服组件-->
+      <customer-corner-component :scroll-status="pageScrollTop < 60" bottom-position="12%"></customer-corner-component>
   </div>
   <div id="jyKeepEntComponent">
     <keep-ent-component ref="vKeepComponent" @on-save-tag="onSaveTag" :bid="nowOpenBid" :first="false"></keep-ent-component>
@@ -615,6 +617,7 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module//mobile-portrayal-footer/js/mobile-portrayal-footer.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/big-member/js/client_portrayal.js?v={{Msg "seo" "version"}}11'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 收藏组件
   var vKeepComponent = new Vue({

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

@@ -627,8 +627,10 @@
           </div>
         </van-tab>
       </van-tabs>
+     <!--客服组件-->
+      <customer-corner-component v-show="isLogin" :scroll-status="pageScrollTop < 60"></customer-corner-component>
     </section>
-    
+
     <div class="j-main project-tab-container" v-if="conf.powerLoaded && !conf.showPortraitAll">
       <div class="j-container empty" v-show="topProject.list.length === 0">
         <div class="j-img img-empty empty-img"></div>
@@ -689,6 +691,7 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/components/popup-data-export.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 收藏组件
   var vKeepComponent = new Vue({

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

@@ -706,7 +706,9 @@
       <popup-data-export ref="popup_dataExport" @next="next_export"></popup-data-export>
        <!-- 底部按钮组件 -->
     <mobile-portrayal-footer ref="portrayalFooter" @monitorclick="changeFollowState('g')" :islogin="userInfo.isLogin"  :monitorshow="true" :monitor="follow" :params="unitParams" :allpower="allpower" :shareshow="isLogin"></mobile-portrayal-footer>
-    </div>
+      <!--客服组件-->
+      <customer-corner-component v-show="isLogin" :scroll-status="pageScrollTop < 60" bottom-position="12%"></customer-corner-component>
+  </div>
     <div id="jyKeepComponent">
       <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false">
       </keep-component>
@@ -759,6 +761,7 @@
     src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'>
   </script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/components/popup-data-export.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
   <script>
     // 收藏组件
     var vKeepComponent = new Vue({

src/jfw/modules/app/src/web/templates/frontRouter/fileRecord/sess/index.html

@@ -395,15 +395,15 @@
               <h3>
                   <span>
                       <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/wx2.png" alt="微信icon">
-                      <span>客户成功经理</span>
+                      <span>{ kefuInfo.remark || '专属客服'}</span>
                   </span>
                   <span class="close-icon" @click="kfDialogShow = false">
                       <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/icon-close.png?v={{Msg "seo" "version"}}" alt="">
                   </span>
               </h3>
               <div class="content">
-                  <p class="qr-code" v-if="QRCode">
-                      <img id="QRCode-pic" :src="QRCode" alt="">
+                  <p class="qr-code" v-if="kefuInfo.wxer">
+                      <img id="QRCode-pic" :src="kefuInfo.wxer" alt="">
                   </p>
                   <p>微信扫一扫</p>
               </div>

src/jfw/modules/bigmember/src/filter/sessionfilter.go

@@ -37,7 +37,8 @@ func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 		return true
 	}
 	//免费用户搜索词订阅接口开放
-	if req.URL.Path == "/bigmember/subscribe/freeUser/searchSubscribe" || req.URL.Path == "/bigmember/subscribe/freeUser/subscribeSearch" {
+	if req.URL.Path == "/bigmember/subscribe/freeUser/searchSubscribe" || req.URL.Path == "/bigmember/subscribe/freeUser/subscribeSearch" ||
+		req.URL.Path == "/bigmember/use/getCustom" {
 		return true
 	}
 	userId, ok := getSession["userId"].(string)

src/jfw/modules/bigmember/src/service/use/custom.go

@@ -0,0 +1,83 @@
+package use
+
+import (
+	. "app.yhyue.com/moapp/jybase/api"
+	qu "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"fmt"
+	"jy/src/jfw/modules/bigmember/src/config"
+	"jy/src/jfw/modules/bigmember/src/db"
+)
+
+func (u *Use) GetCustom() {
+	r := func() Result {
+		cName := func() (customName string) {
+			userid := qu.ObjToString(u.GetSession("userId"))
+			positionId := qu.Int64All(u.GetSession("positionId"))
+			t := u.GetString("type") // kf 直接返回客服 不查询客成
+			if userid == "" || t == "kf" {
+				return
+			}
+			bigPower := jy.GetBigVipUserBaseMsg(u.Session(), *config.Middleground)
+			if bigPower.Status <= 0 && bigPower.EntnicheStatus <= 0 {
+				return ""
+			}
+			res := db.MysqlSubject.SelectBySql("SELECT i.name as customer_name FROM dwd_f_data_equity_info e INNER JOIN dwd_f_crm_clue_info  c on (e.uid=c.uid) INNER JOIN dwd_f_csm_customer_info i on( c.id = i.clue_id) WHERE e.position_id=? AND e.product_type in ('大会员','商机管理') AND c.is_transfer=1", positionId)
+			if res != nil || len(*res) != 0 {
+				for _, m := range *res {
+					if customName = qu.ObjToString(m["customer_name"]); customName != "" {
+						return
+					}
+				}
+			}
+			return
+		}()
+		return Result{Data: getWxm(cName)}
+	}()
+	u.ServeJson(r)
+}
+
+func getWxm(name string) (customEwm interface{}) {
+	var (
+		code     = "jy-customers"
+		cacheKey = fmt.Sprintf("ad_%s", code)
+		rMap     = map[string]interface{}{}
+	)
+
+	obj := redis.Get("other", cacheKey)
+	if obj != nil {
+		if t, _ := obj.(map[string]interface{}); len(t) > 0 {
+			rMap = t
+		}
+	}
+	if len(rMap) == 0 {
+		res, ok := db.Mgo.FindOneByField("ad", `{"s_code":"`+code+`"}`, `{"a_son":1}`)
+		if ok && res != nil && (*res)["a_son"] != nil {
+			son := (*res)["a_son"].([]interface{})
+			for _, m := range son {
+				var (
+					mm     = qu.ObjToMap(m)
+					remark = qu.ObjToString((*mm)["s_remark"])
+					nv     = qu.ObjToString((*mm)["s_picalt"])
+					ewm    = qu.ObjToString((*mm)["s_pic"])
+				)
+				if remark != "客户成功经理" {
+					nv = ""
+				}
+				rMap[nv] = map[string]interface{}{
+					"name":   qu.ObjToString((*mm)["s_picalt"]),
+					"wxer":   ewm,
+					"remark": remark,
+				}
+			}
+		}
+		if len(rMap) > 0 {
+			redis.Put("other", cacheKey, rMap, -1)
+		}
+	}
+	if rMap[name] == nil {
+		return rMap[""]
+	}
+	return rMap[name]
+}

src/jfw/modules/bigmember/src/service/use/use.go

@@ -38,6 +38,7 @@ type Use struct {
 	isAdd          xweb.Mapper `xweb:"/use/isAdd"`          //是否进行首次试用
 	update         xweb.Mapper `xweb:"/use/set/update"`     //大会员权益页修改
 	aiused_history xweb.Mapper `xweb:"/use/aiused_history"` //AI中标预测使用记录
+	getCustom      xweb.Mapper `xweb:"/use/getCustom"`      //获取客服接口
 
 	attachment        xweb.Mapper `xweb:"/attachment/get"`   //附件下载
 	email_attachement xweb.Mapper `xweb:"/attachment/email"` //IOS邮件-附件下载

src/jfw/modules/publicapply/src/go.mod

@@ -1,13 +1,15 @@
 module jy/src/jfw/modules/publicapply/src
 
-go 1.20
+go 1.21
+
+toolchain go1.22.4
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.21.5
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16
+	app.yhyue.com/moapp/jypkg v1.21.7
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.5
 	github.com/alibabacloud-go/dypnsapi-20170525/v2 v2.2.1

src/jfw/modules/publicapply/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66/go.mod h1:XHNATN6t
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.21.5 h1:maU7dRSMLAUB8GLDyQoS9BKKwiNAO+grTZwKj4sJphc=
-app.yhyue.com/moapp/jypkg v1.21.5/go.mod h1:wyJeNc8I9R5799tqch7n8SEZrB0s8nmNou0brBh91w4=
+app.yhyue.com/moapp/jypkg v1.21.7 h1:maTxUGz6djnrkvDk9S4Y7IY3a/yzuiolnQJRFZOBwgg=
+app.yhyue.com/moapp/jypkg v1.21.7/go.mod h1:LlxnGEQUJALOD85IcaPU7FlYxlILF9OL1ctRRap0Kj0=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -31,8 +31,8 @@ bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2 h1:Qi8C7gZeR7+kjOtSl9ilR5HwbjCe8GO1RuotFb4+kFA=
 bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2/go.mod h1:v8y7FCbkKEIRP4Ie9ZM8NtoRP+Fk4O3C1hnexNusYIQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b h1:6f/if8nVoR89n7RbgFEniiUqt4QpqJNQX2kS2JJHDEM=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240603091545-83ceaad11e6b/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843 h1:u+8k/T0D6EUjj9BhI5RJdRa+8v4FZbyZhaNcm66L6Vs=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20240607062231-ae1d02891843/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743/go.mod h1:1SQIPPL5Ya5BzQdByFKtTkXrXTWBv+PDqWIhNknLnZw=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
@@ -41,8 +41,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16 h1:CckcpZZs1jb76sn8b7YDJZTh30py1RymWzuj3FVO6iI=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.16/go.mod h1:2V4LPtebYd1sN0xFoWF0OC8M2PCzKubVxXA0f5+stnY=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18 h1:aJNS24p6SOAOsCMvdOF0togsiO6HxmLIExVyTjog8Io=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18/go.mod h1:03bxckJBVCjal3uQ1loJmupbYHWRnaRC3V5LG4bgg6Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -880,10 +880,12 @@ github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzY
 github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE=
+github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I=
 github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
 github.com/alicebob/miniredis/v2 v2.30.5/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/alicebob/miniredis/v2 v2.32.1 h1:Bz7CciDnYSaa0mX5xODh6GUITRSx+cVhjNoOR4JssBo=
+github.com/alicebob/miniredis/v2 v2.32.1/go.mod h1:AqkLNAfUm0K07J28hnAyyQKf/x0YkCY/g5DCtuL01Mw=
 github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw=
 github.com/aliyun/credentials-go v1.3.1 h1:uq/0v7kWrxmoLGpqjx7vtQ/s03f0zR//0br/xWDTE28=
@@ -916,7 +918,9 @@ github.com/bos-hieu/mongostore v0.0.2/go.mod h1:8AbbVmDEb0yqJsBrWxZIAZOxIfv/tsP8
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
@@ -1028,6 +1032,7 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -1116,6 +1121,7 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
@@ -1164,6 +1170,7 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1257,6 +1264,7 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1565,6 +1573,7 @@ github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkA
 github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
 github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1582,6 +1591,7 @@ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2
 github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
 github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
@@ -1678,6 +1688,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1801,6 +1812,7 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJB
 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
@@ -2443,6 +2455,7 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

src/jfw/modules/publicapply/src/identity/service/service.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
 	. "jy/src/jfw/modules/publicapply/src/config"
@@ -9,6 +8,8 @@ import (
 	"log"
 	"strings"
 
+	"app.yhyue.com/moapp/jybase/redis"
+
 	. "app.yhyue.com/moapp/jybase/api"
 	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
@@ -84,6 +85,7 @@ func (f *Identity) List() {
 					EntRole:      v.EntRole,
 					EntNicheDis:  v.EntNicheDis,
 					EntDeptId:    v.EntDeptId,
+					EntUserRole:  v.EntUserRole,
 				}),
 			})
 		}
@@ -250,6 +252,7 @@ func (f *Identity) NewProductOrClear() {
 							EntRole:      v.EntRole,
 							EntNicheDis:  v.EntNicheDis,
 							EntDeptId:    v.EntDeptId,
+							EntUserRole:  v.EntUserRole,
 						})
 					}
 				}

src/web/staticres/big-member/js/unit_portrayal.js

@@ -174,7 +174,8 @@ var vNode = {
             isShowMoreBtn:false,
             unitParams: {},
             follow:false, // 是否监控,
-            allpower:{}
+            allpower:{},
+          pageScrollTop: 0
         }
     },
     computed: {
@@ -350,7 +351,8 @@ var vNode = {
           referer: location.href
         }
       },
-        onUnitScroll: utils.debounce(function() {
+        onUnitScroll: utils.debounce(function(e) {
+          this.pageScrollTop = e.target.scrollTop
           if (!this.getfreeBuyerOpen) return
         }, 300),
         goOpenVip: function () {
@@ -502,7 +504,7 @@ var vNode = {
                       data: JSON.stringify(params),
                       success: function(res) {
                         if (res.data && !_this.follow) { // 为监控调用组件函数 相关逻辑统一组件内处理
-                          _this.$refs.portrayalFooter.no_monitor(res.data)   
+                          _this.$refs.portrayalFooter.no_monitor(res.data)
                         }
                         if (res && res.error_code === 0 && res.data.status) {
                           if (_this.follow) {
@@ -512,7 +514,7 @@ var vNode = {
                             _this.updataStorage(decodeURIComponent(utils.getParam('entName')),'isFollowed',false)
                           } else {
                             // 关注操作返回
-                            _this.follow = true  
+                            _this.follow = true
                             _this.updataStorage(decodeURIComponent(utils.getParam('entName')),'isFollowed',true)
                           }
 
@@ -539,7 +541,7 @@ var vNode = {
             }catch(e){
             }
           },
-          
+
         // 点击去开通埋点方法(免费体验)
         goBuyBuried: function(text) {
           var _this = this
@@ -1757,7 +1759,7 @@ var vNode = {
                     sessionStorage.removeItem(this.sessKey)
                     return false
                 }
-        
+
                 this.chartLoading = $data.chartLoading
                 this.tabActiveName = $data.tabActiveName
                 Object.assign(this.buyer, $data.buyer || {})

src/web/staticres/common-module/big-member/js/client_portrayal.js

@@ -179,7 +179,8 @@ var vNode = {
           list:[],
           // 招标动态筛选条件缓存，用来判断是否正在使用筛选项进行请求
           buyerHighSet: '',
-          clientParams: {}
+          clientParams: {},
+          pageScrollTop: 0
       }
   },
   computed: {
@@ -318,6 +319,9 @@ var vNode = {
     window.removeEventListener("resize", this.init,20);
   },
   methods: {
+      onUnitScroll:function (e) {
+        this.pageScrollTop = e.target.scrollTop
+      },
       restoreTab: function() {
         var tab = utils.getParam('tab') || ''
         if (tab) {
@@ -470,7 +474,7 @@ var vNode = {
           success: function(res) {
             if(res.error_code == 0) {
               if (res.data && !_this.follow) { // 为监控调用组件函数 相关逻辑统一组件内处理
-                _this.$refs.portrayalFooter.no_monitor(res.data)   
+                _this.$refs.portrayalFooter.no_monitor(res.data)
               }
               if(res.data.status) {
                   if(_this.follow){
@@ -480,7 +484,7 @@ var vNode = {
                     _this.updataStorage(decodeURIComponent(utils.getParam('entName')),'isFollowed',true)
 
                   }
-                  _this.follow = !_this.follow 
+                  _this.follow = !_this.follow
               } else {
                 // _this.$toast(res.error_msg)
               }
@@ -551,7 +555,7 @@ var vNode = {
              }
           })
          }
-         
+
          localStorage.setItem('JY-MOBILE-/search/result/buyer',JSON.stringify(data))
         }catch(e){
         }
@@ -1198,7 +1202,7 @@ var vNode = {
             v.parent = v.project_count / data[0].project_count*100 + "%";
           })
           this.agencyList = data;
-          this.isShow.showAgency = true 
+          this.isShow.showAgency = true
         }
       },
       // 处理金额区间转换
@@ -1680,7 +1684,7 @@ var vNode = {
             sessionStorage.removeItem(this.sessKey)
             return false
           }
-  
+
           this.chartLoading = $data.chartLoading
           this.tabActiveName = $data.tabActiveName
           Object.assign(this.buyer, $data.buyer || {})

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

@@ -134,6 +134,8 @@ var vNode = {
       },
       importantCustomers: [],
       scrollTop: 0,
+      // 页面滚动距离
+      pageScrollTop: 0,
       getEntPortraitInfoTimes: 0,
       initEchartsOptions: {
         renderer: 'svg'
@@ -359,7 +361,8 @@ var vNode = {
       }
     },
     // 监听画像页面滚动
-    onEntScroll: utils.debounce(function(){
+    onEntScroll: utils.debounce(function(e){
+      this.pageScrollTop = e.target.scrollTop
       if (!this.freeWinnerOpen) return // 没有开通超级订阅广告位banner return
       // do something
     }, 50),

src/web/staticres/common-module/consult-dialog/js/index.js

@@ -17,33 +17,48 @@ var consultDialog = new Vue({
   created: function () {
   },
   mounted: function () {
-    this.getimage()
+    this.getKefuInfo()
   },
   methods: {
-      getimage: function () {
-          var this_ = this
-          $.ajax({
-              type: 'POST',
-              url: '/bigmember/use/equity',
-              data: {
-
-              },
-              success: function (res) {
-                  if (res.data) {
-                      var customers = res.data.customers
-                      customers.forEach(function (ele) {
-                          if (ele.vip == false) {
-                              this_.img = ele.wxer
-
-                          } else if (ele.vip == true) {
-                              this_.vip_img = ele.wxer
-
-                          }
-                      });
-                      this_.getstates()
-                  }
-              }
-          })
+      // getimage: function () {
+      //     var this_ = this
+      //     $.ajax({
+      //         type: 'POST',
+      //         url: '/bigmember/use/equity',
+      //         data: {
+      //
+      //         },
+      //         success: function (res) {
+      //             if (res.data) {
+      //                 var customers = res.data.customers
+      //                 customers.forEach(function (ele) {
+      //                     if (ele.vip == false) {
+      //                         this_.img = ele.wxer
+      //
+      //                     } else if (ele.vip == true) {
+      //                         this_.vip_img = ele.wxer
+      //
+      //                     }
+      //                 });
+      //                 this_.getstates()
+      //             }
+      //         }
+      //     })
+      // },
+      getKefuInfo: function () {
+        var _this = this
+        $.ajax({
+          type: 'post',
+          url: '/bigmember/use/getCustom',
+          data: { type: "kf" },
+          success: function (res) {
+            if (res && res.data) {
+              const resData = res.data || {}
+              _this.url = resData.wxer
+              _this.getstates()
+            }
+          }
+        })
       },
       getstates: function () {
         var this_ = this
@@ -70,11 +85,11 @@ var consultDialog = new Vue({
                     }
                 }
                 if(this_.isbuy_big){
-                  this_.url = this_.vip_img
+                  // this_.url = this_.vip_img
                   this_.text='扫一扫，立即联系您的专属客服'
 
                 }else{
-                  this_.url = this_.img
+                  // this_.url = this_.img
                   this_.text='扫一扫，立即联系客户经理'
                 }
             }
@@ -82,7 +97,7 @@ var consultDialog = new Vue({
     },
     close: function (val) {
           this[val] = false
-   },   
+   },
   }
 })
 

src/web/staticres/common-module/customer-corner/mobile-template.js

@@ -0,0 +1,65 @@
+var customerCornerStyle = `<style>
+#customer-corner-component{
+    position: fixed;
+    padding-top:0.08rem;
+    width: 0.84rem;
+    height: 0.84rem;
+    bottom: 9%;
+    right: 0.24rem;
+    background: #fff;
+    border-radius: 50%;
+    z-index: 99;
+    box-shadow: 0 0 16px rgba(0,0,0,0.16);
+    font-size: 0.18rem;
+    line-height: 0.2rem;
+    color: #2ABED1;
+  }
+  #customer-corner-component.fadeOutRight{
+   transform: translateX(98%);
+      opacity: 0.2;
+  }
+  #customer-corner-component>.box-con{  
+      width:100%;
+      height:100%;
+      text-align: center;
+    }
+  #customer-corner-component img{
+    width: 0.48rem !important;
+    height: 0.48rem !important;
+  }
+  </style>`
+var customerCornerTemplate = `
+<div id="customer-corner-component" :class="{ fadeOutRight: !scrollStatus }" :style="{bottom: bottomPosition || ''}">
+    <div class="box-con" @click="jumpCustomerPage">
+      <img src="/common-module/customer-corner/img/kf-blue.png" alt="">
+      <p>客服</p>
+    </div>
+  </div>`
+
+Vue.component('customer-corner-component',{
+  name: 'customerCornerComponent',
+  template: customerCornerTemplate,
+  props: {
+    scrollStatus: {
+      type: Boolean,
+      default: false
+    },
+    bottomPosition: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      show: false
+    }
+  },
+  created () {
+    $('head').append(customerCornerStyle)
+  },
+  methods: {
+    jumpCustomerPage () {
+      location.href = '/jyapp/free/customer'
+    }
+  }
+})

src/web/staticres/common-module/exhibition/css/index_pc.css

@@ -11,17 +11,27 @@
   #vm_exhibition .head {
     width: 100%;
     height: 360px;
-    background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;
-    background-size: cover;
-
+    /*background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;*/
+    /*background-size: cover;*/
   }
+#vm_exhibition .exhibition-head{
+    width: 100%;
+    height:100%;
+}
+#vm_exhibition .head .img-con{
+    width: 100%;
+    height: 100%;
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+}
 
-  #vm_exhibition .head .content {
-    width: 1200px;
-    height: 360px;
-    margin: auto;
-    position: relative;
-  }
+  /*#vm_exhibition .head content {*/
+  /*  width: 1200px;*/
+  /*  height: 360px;*/
+  /*  margin: auto;*/
+  /*  position: relative;*/
+  /*}*/
 
   #vm_exhibition .qr {
     width: 192px;

src/web/staticres/common-module/file-pack/js/index-wx.js

@@ -119,8 +119,12 @@ var vm = new Vue({
         freeNum: 0
       },
       kfDialogShow: false,
-      // 二维码
-      QRCode: ''
+      // 客服信息
+      kefuInfo: {
+        name: '',
+        remark: "专属客服",
+        wxer: ''
+      }
     }
   },
   computed: {
@@ -130,6 +134,7 @@ var vm = new Vue({
     }
   },
   created: function () {
+      this.getKefuInfo()
       this.getPType("type")
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
@@ -156,21 +161,20 @@ var vm = new Vue({
             _this.userPower.vipStatus = resData.vipStatus
             _this.userPower.memberStatus = resData.memberStatus
             _this.userPower.power = resData.power
-            // 客服二维码获取
-            if(resData.customers && resData.customers.length > 0 ){
-              var qrImgs = {
-                vip: '',
-                default: ''
-              }
-              resData.customers.forEach(function (ele) {
-                if (ele.vip) {
-                  qrImgs.vip = ele.wxer
-                } else {
-                  qrImgs.default = ele.wxer
-                }
-              })
-              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
-            }
+          }
+        }
+      })
+    },
+    // 获取客服信息
+    getKefuInfo () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefuInfo = resData
           }
         }
       })

src/web/staticres/common-module/file-pack/js/index.js

@@ -93,8 +93,12 @@ var vm = new Vue({
         freeNum: 0
       },
       kfDialogShow: false,
-      // 二维码
-      QRCode: '',
+      // 客服信息
+      kefuInfo: {
+        name: '',
+        remark: "专属客服",
+        wxer: ''
+      },
       // 保存图片是否成功
       savePicSuccess: false,
       picImgUrl: null
@@ -107,6 +111,7 @@ var vm = new Vue({
     }
   },
   created: function () {
+    this.getKefuInfo()
     this.getPType("type")
     this.years = new Date().getFullYear()
     this.months = parseInt(new Date().getMonth() + 1)
@@ -133,21 +138,20 @@ var vm = new Vue({
             _this.userPower.vipStatus = resData.vipStatus
             _this.userPower.memberStatus = resData.memberStatus
             _this.userPower.power = resData.power
-            // 客服二维码获取
-            if(resData.customers && resData.customers.length > 0 ){
-              var qrImgs = {
-                vip: '',
-                default: ''
-              }
-              resData.customers.forEach(function (ele) {
-                if (ele.vip) {
-                  qrImgs.vip = ele.wxer
-                } else {
-                  qrImgs.default = ele.wxer
-                }
-              })
-              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
-            }
+          }
+        }
+      })
+    },
+    // 获取客服信息
+    getKefuInfo () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefuInfo = resData
           }
         }
       })

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -487,9 +487,9 @@ var sourceDescMap = {
   wx_article_cqxmmore: '标讯详情页-申请查看更多超前项目',
   h5_article_cqxmmore: '标讯详情页-申请查看更多超前项目',
       // 文库
-  h5_library_details_free: '文库详情-免费下载',
-  app_library_details_free: '文库详情-免费下载',
-  wx_library_details_free: '文库详情-免费下载'
+  h5_library_details_free: '剑鱼文库-免费下载文档',
+  app_library_details_free: '剑鱼文库-免费下载文档',
+  wx_library_details_free: '剑鱼文库-免费下载文档'
 }
 
 var vNode = {

src/web/staticres/frontRouter/pc/cooperation/css/index.css

@@ -112,9 +112,8 @@
 .coop-type-item:hover .item-center {
   animation: moveUpDown 2s linear infinite;
 }
-.coop-type-item.coop-type-3{
+.coop-type-item.coop-type-3, .coop-type-item.coop-type-4{
   margin-top: 23px;
-  width: 1200px;
 }
 .coop-type-item>img{
   position: absolute;
@@ -130,15 +129,15 @@
   height: 298px;
 }
 
-.coop-type-1 .item-bottom, .coop-type-2 .item-bottom{
+.coop-type-item .item-bottom{
   width: 606px;
 }
-.coop-type-3 .item-bottom {
-  width: 1215px;
-}
+/*.coop-type-3 .item-bottom {*/
+/*  width: 1215px;*/
+/*}*/
 .coop-type-1 .item-center {
-  width: 309px;
-  height: 299px;
+  width: 300px;
+  height: 285px;
   right: 19px;
   top: 2px;
 }
@@ -149,10 +148,16 @@
   top: 30px;
 }
 .coop-type-3 .item-center {
-  width: 463px;
-  height: 250px;
-  right: 37.5px;
-  top: 6px;
+    width: 300px;
+    height: 285px;
+    right: 19px;
+    top: 13px;
+}
+.coop-type-4 .item-center {
+    width: 262px;
+    height: 182px;
+    right: 41px;
+    top: 28px;
 }
 .get-more-btn{
   position: absolute;
@@ -229,4 +234,4 @@
   color: #FFFFFF;
   margin: 12px 0 16px;
   line-height: 24px;
-}
+}

src/web/staticres/frontRouter/pc/fileHistory/js/index-pc.js

@@ -147,6 +147,7 @@ var fileRecorder = new Vue({
     this.getUserPower()
     this.subPoint()
     this.subRecord()
+    this.getKefuInfo()
   },
   methods: {
     getUserPower () {
@@ -158,28 +159,25 @@ var fileRecorder = new Vue({
           if (res && res.data) {
             for (var key in res.data) {
               _this.$set(_this.userPower, key, res.data[key])
-              _this.calcKefuInfo()
+              // _this.calcKefuInfo()
             }
           }
         }
       })
     },
-    calcKefuInfo: function () {
-      var customers = this.userPower.customers
-      if (!$.isArray(customers)) {
-        return
-      }
-      var target;
-      for (var i = 0; i < customers.length; i++) {
-        if (customers[i].remark.indexOf('成功') > -1) {
-          target = customers[i]
-          break
+    getKefuInfo: function () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefu.qr = resData.wxer
+            _this.kefu.name = resData.remark
+          }
         }
-      }
-      if (target) {
-        this.kefu.qr = target.wxer
-        this.kefu.name = target.remark
-      }
+      })
     },
     cellClick (row, column, cell, event) {
       console.log(row, column, cell, event)

src/web/staticres/js/index/index_2023.12.js

@@ -167,6 +167,8 @@ var _page = {
     this.initImportantGovTab()
     this.initHotIndustrySearch()
     this.initDocsDescTab()
+    this.docImgClick()
+
   },
   // 计算九宫格高度
   initUserInfoCard: function () {
@@ -374,6 +376,14 @@ var _page = {
       $(this).text(text)
     })
   },
+  // 处理文库图片点击也可跳转（不能用a标签包裹，搜索引擎会识别a标签内不是文字，也不能用行内onclick事件,不能绑定自定义属性）
+  docImgClick: function() {
+    var $img = $('.doc-card-list-item .doc-main-img')
+    $img.click(function() {
+      var href = $(this).parents().siblings('a').attr('href')
+      window.open(href)
+    })
+  }
 }
 
 $(function () {

src/web/staticres/js/login.js

@@ -174,6 +174,9 @@ function toggleLoginDom (type) {
     $("#public-nav .fl").addClass('fix-work')
     // 客服入口显示
     $('#go-customer-4').show()
+    // 客服企微展示
+    $('#customer-wework').show()
+    $('#right-side-kfrx').removeClass('b-bottom-left-r')
   } else {
     $("#public-nav .nav-avatar").hide()
     $("#public-nav .work-link").hide()
@@ -181,6 +184,9 @@ function toggleLoginDom (type) {
     $("#login .loginBtn").show()
     // 客服入口隐藏
     $('#go-customer-4').hide()
+    // 客服企微隐藏
+    $('#customer-wework').hide()
+    $('#right-side-kfrx').addClass('b-bottom-left-r')
   }
 }
 //

src/web/staticres/pccss/index_pc.css

@@ -264,6 +264,7 @@
 }
 .doc-card-list-item .doc-main-img:hover{
   transform: scale(1.3);
+  cursor: pointer;
 }
 .doc-card-list-item .doc-type-img{
   position: absolute;

src/web/staticres/public-pc/css/pc-bottom.css

@@ -115,19 +115,11 @@
 
 .j-bottom .icon-arrow--up,
 .right-side-box .icon-arrow--up {
-  margin-top: 11px;
+  margin-top: 10px;
 }
 
 /* 上箭头 */
 .icon-arrow--up {
-  /* width: 56px;
-  height: 56px;
-  margin: 0 auto;
-  background-size: 56px;
-  background-repeat: no-repeat;
-  background-position: center center;
-  background-image: url(/images/pc/slide_arrow_grey.png); */
-  /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEnSURBVHgB7ZbNrYJAFEaH9zYuLQb6sAN1ydIOtAN3sFP7YaEdaAdWAF4TvsQQZgTmXnXxnYSQYfg5BzIJzhFCCCGEEPItEmdEnufLuq73SZLcZdsWRXFyBvw7A57yTdMcRXwmw7lsiyzLrlVVXZwy6gGQ75kyiVANCMgD9Qi1gAHyQDVCZREH5Nft/tCdkPWx0ljY0V8gJF+W5VHe9DlN05uMF515lS8RFfBOHgPLiMkBQ+WBVcSkgLHywCJidMBUeaAdMSogVh5oRgwO0JIHWhGDArTlgUbE2wAreRAbEQywlgcxEd6AT8mDqRF/vhuK/LbnsIk8aO+97pna+64JBcw7h0zlQV+EuNx953sD5G9xI7tre/FH5MFLBJ6/c4QQQgghhPwcD62mJ887e9SSAAAAAElFTkSuQmCC); */
   width: 24px;
   height: 24px;
   margin: 0 auto;
@@ -139,7 +131,6 @@
 
 .icon-arrow--up.white {
   background-image: url(/images/index/new/up1.png);
-  /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAC5SURBVHgB7ZdRDoMgEAX3pvXmHMEjUBv5eDGtSgvL0swkJH7I7swnZgAAAAAAf0fO+bGddTvp9W0zUeSPzBHxQX6OiAv52BE35WNGnMgv5cSNOJOXf2JG3JGXf2NF1MjLnRgR38jL3bERv8jLjDERLeRllm9ES3mZ6RPRQ15m943oKS87+kR4yMuuthGe8rKzXUTeHyJu8rL3XcRqteT9NeUqL7uPEclqKUNSCVnMmdH7AQAAAACueQIAR4pmNbCOwAAAAABJRU5ErkJggg==); */
 }
 
 .right-side-box {
@@ -156,7 +147,7 @@
   position: fixed;
   z-index: 2002;
   /* min-width: 56px; */
-  width: 80px;
+  width: 68px;
   bottom: 108px;
   left: initial;
   right: 1px;
@@ -210,125 +201,105 @@
   /* height: 80px; */
   text-align: center;
   color: #1D1D1D;
-  margin-left: 0;
 }
 
 .right-side-box .desc_text {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 13px;
+  line-height: 20px;
   /* identical to box height, or 157% */
   text-align: center;
   /* white/100% */
   color: #FFFFFF;
-  margin-top: 4px;
+  margin-top: 2px;
 }
 
 .right-side-box .desc_text_b {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 13px;
+  line-height: 20px;
   /* identical to box height, or 157% */
   text-align: center;
   /* Font/#1d1d1d */
   color: #1D1D1D;
-  margin-top: 4px;
+  margin-top: 2px;
 }
-
-/* .right-side-box .right-side-phone {
-  height: 56px;
-  margin: 6px 0;
-  position: relative;
-} */
 .right-side-box .right-side-phone {
   position: relative;
-  border-radius: 10px 0 0 0;
   width: 100%;
-  height: 80px;
-  background: linear-gradient(180deg, #1699F9 0%, #19C6DC 100%);
-  border-top: 2px solid #FFF;
-  border-left: 2px solid #FFF;
-  box-sizing: border-box;
+  height: 68px;
+  padding-top:10px;
   cursor: pointer;
 }
 
 .right-side-box .right-side-wx {
   position: relative;
   width: 100%;
-  height: 80px;
-  background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
-  border-radius: 0;
-  border-left: 2px solid #FFF;
-  box-sizing: border-box;
+  height: 68px;
   cursor: pointer;
 }
 
 .right-side-box .right-side-app {
   position: relative;
-  border-radius: 0 0 0 10px;
   width: 100%;
-  height: 80px;
-  background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
-  border-bottom: 2px solid #FFF;
-  border-left: 2px solid #FFF;
+  height: 68px;
   box-sizing: border-box;
   cursor: pointer;
 }
+.right-side-box .right-side-one,.right-side-box .right-side-two {
+    box-sizing: border-box;
+    background: #fff;
+    border-left: 2px solid #fff;
+    border-bottom: 2px solid #fff;
+    border-top: 2px solid #fff;
+    border-radius: 12px 0 0 12px;
+    background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
+    box-shadow: 0 0 16px rgba(8, 31, 38, 0.14);
+
+}
+.right-side-box .right-side-two {
+    margin-top:16px;
+}
 
 .right-side-box .right-side-kf {
   position: relative;
-  border-radius: 0 !important;
-  width: 100% !important;
-  height: 80px !important;
+  width: 68px;
+  height: 68px;
   background: linear-gradient(180deg, #F56500 0%, #F79E51 100%) !important;
-  border-left: 2px solid #FFF;
   box-sizing: border-box;
   cursor: pointer;
 }
+.right-side-box .right-side-kf .hover-open-box{
+    text-align:center;
+    top:10px;
+    left:0;
+}
+.right-side-box .right-side-kf img {
+  width:28px;
+  height:28px;
 
-/* .right-side-box .right-side-pop::before {
-  content: "客服热线：400-108-6670   服务时间：工作日 9:00-17:40";
-  position: absolute;
-  left: -210px;
-  top: 4px;
-  display: none;
-  width: 198px;
-  background: #2cb7ca;
-  border-radius: 8px;
-  color: #fff;
-  line-height: 2.3;
-  font-size: 14px;
-  white-space: break-spaces;
-  padding: 3px 5px;
-} */
-
-/* .right-side-box .right-side-pop::after {
-  content: '';
-  position: absolute;
-  left: -12px;
-  top: 22px;
-  display: none;
-  width: 0;
-  height: 0;
-  border-top: 6px solid transparent;
-  border-left: 8px solid #2cb7ca;
-  border-bottom: 6px solid transparent;
-} */
+}
 
 .right-side-box>.right-side-item .text-customer img,
 .right-side-box .right-side-phone .text-customer img {
-  width: 32px;
-  width: 32px;
+  width: 28px;
+  height: 28px;
   display: block;
   margin: auto !important;
-  margin-top: 12px !important;
+  /*margin-top: 10px !important;*/
 }
 
 .right-side-box .right-side-phone .text-customer-hover {
   display: none;
 }
-
+.right-side-box .right-side-pop {
+  background: linear-gradient(180deg, #1699F9 0%, #19C6DC 100%);
+  border-top-left-radius: 10px
+}
 .right-side-box .right-side-pop:hover .text-customer {
   display: none;
 }
+.right-side-box .b-bottom-left-r {
+    border-bottom-left-radius: 10px
+}
 
 .right-side-box .right-side-pop:hover::after,
 .right-side-box .right-side-pop:hover::before {
@@ -517,7 +488,7 @@
     flex-direction: column;
     position: relative;
     width: 100%;
-    height: 80px;
+    height: 68px;
     background: #fff;
     box-sizing: border-box;
     cursor: pointer;
@@ -578,6 +549,67 @@
     display: block;
 }
 
+.right-side-box .right-side-wework {
+    border-radius: 0 0 0 10px;
+    position: relative;
+    width: 100%;
+    height: 68px;
+    background: linear-gradient(180deg, #F1F4F9 0%, #fff 100%);
+    border-top: 2px solid #FFF;
+    border-left: 2px solid #FFF;
+    box-sizing: border-box;
+    cursor: pointer;
+    padding-top: 10px;
+}
+.right-side-box .right-side-wework .text-customer {
+    text-align: center !important;
+}
+.right-side-box .right-side-wework .text-customer img{
+    width: 28px;
+    height: 28px;
+}
+.right-side-box .right-side-wework .desc_text{
+    font-size: 13px;
+    line-height:20px;
+    color: #1d1d1d;
+}
+.right-side-wework .kf-wework {
+    display: none;
+    width:144px;
+    height:154px;
+    min-width:144px;
+    top: 6px;
+    font-size: 14px;
+    line-height: 22px;
+    left: -162px;
+    color: #1D1D1D;
+    background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
+    border: 2px solid #FFFFFF;
+    box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+    border-radius: 8px;
+    box-sizing: border-box;
+    text-align: center;
+    padding: 12px 20px;
+}
+.right-side-wework .kf-wework img {
+    width: 104px;
+    height:104px;
+}
+.right-side-wework .kf-wework p {
+    font-size: 14px;
+    line-height: 22px;
+    color:#1d1d1d;
+    text-align: center;
+    margin-top:4px;
+}
+
+/*.right-side-box .b-radius-left-top {*/
+/*   border-top-left-radius: 10px !important;*/
+/*}*/
+/*.right-side-box .b-radius-left-bottom {*/
+/*    border-bottom-left-radius: 10px !important;*/
+/*    border-bottom: 2px solid #fff;*/
+/*}*/
 
 @media all and (-ms-high-contrast: none),
 (-ms-high-contrast: active) {
@@ -632,25 +664,19 @@
   box-sizing: border-box;
 }
 
-/* .right-side-box .back-to-up {
-  background-color: #b5b6ba;
-  border-radius: 50%;
-  width: 56px;
-  display: none;
-} */
 
 .right-side-box .back-to-up:hover {
   /* background: #2cb7ca; */
 }
 
 .right-side-box .back-to-up {
-  width: 80px;
-  height: 72px;
+  width: 68px;
+  height: 64px;
   background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
   border-width: 2px 0px 2px 2px;
   border-style: solid;
   border-color: #FFFFFF;
-  box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+  box-shadow: 0px 0px 16px rgba(8, 31, 38, 0.14);
   border-radius: 12px 0px 0px 12px;
   display: none;
   box-sizing: border-box;

src/web/staticres/public-pc/js/header-nav-mini.js

@@ -115,7 +115,7 @@ var headerNavMini = {
     })
   },
   doLogin: function () {
-    if (location.pathname === '/') {
+    if (location.pathname === '/'||location.pathname === '/jylab/supsearch/index.html') {
       // 打开登录窗口,登录成功后去工作桌面
       openLoginDig(true)
     } else {

src/web/staticres/public-pc/js/pc-bottom.js

@@ -223,6 +223,37 @@ $(window).on('click', function (e) {
     }
   }
 })
+
+/**
+ * 获取客服二维码
+ */
+window.kefu = {
+  name: '',
+  remark: "专属客服",
+  wxer: ''
+}
+function getKefuInfo () {
+  var data = {}
+  // 官网展示客服，主站有客成展示客成，没有展示客服活码
+  if(window.__headerSiteType === 1) {
+    data = {
+      type: "kf"
+    }
+  }
+  $.ajax({
+    type: 'post',
+    url: '/bigmember/use/getCustom',
+    data: data,
+    success: function (res) {
+      if (res && res.data) {
+        const resData = res.data || {}
+        window.kefu = resData
+      }
+    }
+  })
+}
+getKefuInfo()
+
 $(function () {
   function getDomScreenHeight () {
     var clientHeight = [document.documentElement.clientHeight, document.body.clientHeight, window.screen.availHeight, window.screen.height]
@@ -302,6 +333,14 @@ $(function () {
   },function() {
     $('.right-side-box .kf-phone').hide()
   })
+
+  // 右侧客服企微
+  $('.right-side-wework').hover(function(e) {
+    $('.right-side-box .kf-wework img').attr('src', window.kefu.wxer)
+    $('.right-side-box .kf-wework').show()
+  },function() {
+    $('.right-side-box .kf-wework').hide()
+  })
 });
 ;(function(){
   // 动态设置copyright
@@ -350,6 +389,8 @@ $(function () {
     stypesearch(stype);
   })
 })();
+
+
 function zbsqClose(){
   $("#bidcommunity").modal("hide");
 }
@@ -456,4 +497,4 @@ function renderBottomCustomer (obj) {
   }
   $('.config_classify_r_box').append(html)
 }
-/** SEO优化-pcbottom.html内js迁移 END */
+/** SEO优化-pcbottom.html内js迁移 END */

src/web/staticres/serviceSystem/js/serviceSystem.js

@@ -8,11 +8,10 @@ var vNode = new Vue({
             tabs: 0,
             tablist: ['供应商服务', '采购单位服务', '招标代理机构服务'],
             isshow: false,
-            text: '扫一扫，立即联系客户经理',
-            // 扫一扫，立即联系您的专属客服
-            url: '',
-            img: "",
-            vip_img: "",
+            kefu: {
+              text: '扫一扫，立即联系客户经理',
+              qr: ''
+            },
             loginFlag: false,
             isbuy_vip: false,
             isbuy_big: false,
@@ -31,7 +30,7 @@ var vNode = new Vue({
           this.urlParams = this.getUrlKey('from')
         }
         this.getcode()
-        this.getImage()
+        this.getKefuInfo()
     },
     mounted: function () {
         this.calcFixedTop()
@@ -79,30 +78,22 @@ var vNode = new Vue({
             })
 
         },
-        getImage: function() {
-            var this_ = this
-            // 此接口未登录也能获取客服信息
-            $.ajax({
-                type: 'POST',
-                url: '/bigmember/use/equity',
-                success: function (res) {
-                    if (res.data) {
-                        // 客服二维码
-                        var customers = res.data.customers
-                        customers.forEach(function (ele) {
-                            if (ele.vip) {
-                              this_.vip_img = ele.wxer
-                            } else  {
-                              this_.img = ele.wxer
-                            }
-                        });
-                    }
-                }
-            })
+       // 获取客服信息
+        getKefuInfo: function () {
+          var _this = this
+          $.ajax({
+            type: 'post',
+            url: '/bigmember/use/getCustom',
+            success: function (res) {
+              if (res && res.data) {
+                const resData = res.data || {}
+                _this.kefu.qr = resData.wxer
+              }
+            }
+          })
         },
         close: function(val) {
             this[val] = false
-
         },
         export_my: function() {//自助导出
             if (this.loginFlag) {
@@ -138,7 +129,7 @@ var vNode = new Vue({
                 //去购买
                 window.location.href = "/swordfish/page_big_pc/free/svip/buy"
             } else {
-                // 进入续费活动页 
+                // 进入续费活动页
                 // window.location.href="/swordfish/page_big_pc/free/svip/buy?type=renew"
                 window.location.href = this.vipRenewActivityPage
               }
@@ -153,7 +144,7 @@ var vNode = new Vue({
               }
             } else {
               // this.toast('您已开通大会员')
-              // 进入续费活动页 
+              // 进入续费活动页
               window.location.href = this.bigRenewActivityPage
             }
           }
@@ -163,25 +154,11 @@ var vNode = new Vue({
           // this.vipshow = true
           location.href = '/page_workDesktop/'
         },
-        showBigCustomQrDialog: function () {
-            if (this.isbuy_big || this.powerInfo.entniche) {
-                this.text = '扫一扫，立即联系您的专属客服'
-                this.url = this.vip_img
-            } else {
-                this.text = '扫一扫，立即联系客户经理'
-                this.url = this.img
-            }
-            this.isshow = true
-        },
         consultation: function(val) {
-
             if (val == 0 && this.isbuy_big) {//供应商服务
-                this.text = '扫一扫，立即联系您的专属客服'
-                this.url = this.vip_img
-
+              this.kefu.text = '扫一扫，立即联系您的专属客服'
             } else {
-                this.text = '扫一扫，立即联系客户经理'
-                this.url = this.img
+              this.kefu.text = '扫一扫，立即联系客户经理'
             }
             this.isshow = true
         },

src/web/templates/big-member/wx/page_client_portrayal.html

@@ -562,6 +562,8 @@
       </div>
        <!-- 底部按钮组件 -->
     <mobile-portrayal-footer ref="portrayalFooter" @monitorclick="changeFollowState('g')" @claimclick="changeClaimState" :islogin="true" :monitorshow="true" :monitor="follow" :params="clientParams" :shareshow="true" :claimshow="claimShow" :allpower="powerInfo" :claim="claim"></mobile-portrayal-footer>
+    <!--客服组件-->
+    <customer-corner-component :scroll-status="pageScrollTop < 60" bottom-position="12%"></customer-corner-component>
     </div>
     <div id="jyKeepEntComponent">
       <keep-ent-component ref="vKeepComponent" @on-save-tag="onSaveTag" :bid="nowOpenBid" :first="false"></keep-ent-component>
@@ -591,6 +593,7 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module//mobile-portrayal-footer/js/mobile-portrayal-footer.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/big-member/js/client_portrayal.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 收藏组件
   var vKeepComponent = new Vue({

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -791,6 +791,8 @@
       <popup-data-export ref="popup_dataExport" @next="next_export"></popup-data-export>
         <!-- 底部按钮组件 -->
     <mobile-portrayal-footer ref="portrayalFooter" @monitorclick="changeFollowState('g')" :islogin="userInfo.isLogin"  :monitorshow="true" :monitor="follow" :params="unitParams" :shareshow="true" :allpower="allpower"></mobile-portrayal-footer>
+    <!--客服组件-->
+    <customer-corner-component :scroll-status="pageScrollTop < 60" bottom-position="12%"></customer-corner-component>
     </div>
   <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
@@ -827,6 +829,7 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/dataExport/components/popup-data-export.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 收藏组件
   var vKeepComponent = new Vue({

src/web/templates/common/pcbottom.html

@@ -130,61 +130,67 @@
     <div id="sideIcon" class="common-right-side-item" style="right: 1px;width: 88px;height: 88px;display: none;">
 <!--        <a href="/swordfish/frontPage/share/sess/index"><img src="{{Msg "seo" "cdn"}}/share/img/active-icon.png"  alt="" style="width: 88px;"></a>-->
     </div>
-      <div class="right-side-phone right-side-pop common-right-side-item">
-        <span class=" text-customer">
-          <img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt="">
-        </span>
-        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <p class="desc_text">客服热线</p>
-        <div class="silde-float kf-phone">客服热线：400-108-6670<br>服务时间：工作日 9:00-17:40</div>
-      </div>
-      <div class="right-side-item right-side-kf open-customer common-right-side-item" id="go-customer-4" style="display: block">
-          <div class="hover-open-box" style="padding: 0;">
-              <!-- <div class="icon-customer white icon-badge-number" data-badge-number=""></div> -->
-              <div class="icon-badge-number text-customer" data-badge-number="">
-                  <img src='{{Msg "seo" "cdn"}}/images/index/new/kf.png?v={{Msg "seo" "version"}}' alt="">
-              </div>
-              <p class="desc_text">在线客服</p>
-          </div>
-          <!-- <div class="silde-float help-slide">
-            <img class="help-close" src='{{Msg "seo" "cdn"}}/images/t-close.png?v={{Msg "seo" "version"}}' alt="">
-            <div class="help-slide-top">有什么可以帮助您吗?</div>
-            <div class="help-slide-bottom">
-              <div class="help-slide-kf">客服热线</div>
-              <div class="help-slide-zx open-customer">在线咨询</div>
+    <div class="right-side-one">
+        <div class="right-side-phone right-side-pop common-right-side-item" id="right-side-kfrx">
+            <span class=" text-customer">
+              <img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt="">
+            </span>
+            <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <p class="desc_text">客服热线</p>
+            <div class="silde-float kf-phone">客服热线：400-108-6670<br>服务时间：工作日 9:00-17:40</div>
+        </div>
+        <div class="right-side-item right-side-kf open-customer common-right-side-item" id="go-customer-4" style="display: block">
+            <div class="hover-open-box" style="padding: 0;">
+                <!-- <div class="icon-customer white icon-badge-number" data-badge-number=""></div> -->
+                <div class="icon-badge-number text-customer" data-badge-number="">
+                    <img src='{{Msg "seo" "cdn"}}/images/index/new/kf.png?v={{Msg "seo" "version"}}' alt="">
+                </div>
+                <p class="desc_text">在线客服</p>
+            </div>
+        </div>
+        <div class="right-side-wework  common-right-side-item" id="customer-wework" >
+            <p class="text-customer">
+                <img src='{{Msg "seo" "cdn"}}/images/index/new/wework.png?v={{Msg "seo" "version"}}' alt="">
+            </p>
+            <p class="desc_text">客服企微</p>
+            <div class="silde-float kf-wework">
+                <img class="qrcode" src="" alt="">
+                <p>微信扫一扫</p>
+            </div>
+        </div>
+    </div>
+    <div class="right-side-two">
+        <div class="right-side-phone right-side-wx common-right-side-item" id="right-side-swhz">
+            <span class="text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo-blue.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <p class="desc_text_b">商务合作</p>
+            <div class="slidePop">
+                <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">
+                <p>微信扫一扫<br>商务合作</p>
+            </div>
+        </div>
+        <div class="right-side-phone right-side-wx common-right-side-item">
+            <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx1.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <p class="desc_text_b">关注剑鱼</p>
+            <div class="slidePop">
+                <img data-share-img src="" alt="">
+                <p>关注剑鱼标讯<br>免费追踪全国商机</p>
+            </div>
+        </div>
+        <div class="right-side-phone right-side-wx right-side-app common-right-side-item">
+            <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam_b.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam.png?v={{Msg "seo" "version"}}' alt=""></span>
+            <p class="desc_text_b">下载App</p>
+            <div class="slidePop">
+                <img  src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                <p>下载App<br>免费查看全国商机</p>
             </div>
-          </div> -->
-      </div>
-      <div class="right-side-phone right-side-wx common-right-side-item">
-          <span class="text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo.png?v={{Msg "seo" "version"}}' alt=""></span>
-          <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo-blue.png?v={{Msg "seo" "version"}}' alt=""></span>
-          <p class="desc_text_b">商务合作</p>
-          <div class="slidePop">
-            <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">
-            <p>微信扫一扫<br>商务合作</p>
-          </div>
-      </div>
-      <div class="right-side-phone right-side-wx common-right-side-item">
-          <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx.png?v={{Msg "seo" "version"}}' alt=""></span>
-          <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx1.png?v={{Msg "seo" "version"}}' alt=""></span>
-          <p class="desc_text_b">关注剑鱼</p>
-          <div class="slidePop">
-              <img data-share-img src="" alt="">
-              <p>关注剑鱼标讯<br>免费追踪全国商机</p>
-          </div>
-      </div>
-      <div class="right-side-phone right-side-wx right-side-app common-right-side-item">
-        <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam_b.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <p class="desc_text_b">下载App</p>
-        <div class="slidePop">
-            <img  src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
-            <p>下载App<br>免费查看全国商机</p>
         </div>
     </div>
     {{end}}
 <!--    可配置数据类config-right-side-item-->
-    <div class="right-side-item back-to-up" data-backtop>
+    <div class="right-side-item back-to-up item-height" data-backtop>
         <div class="hover-open-box">
             <div class="icon-arrow--up white"></div>
             <div class="icon-arrow--up"></div>

src/web/templates/exhibition/pc/index.html

@@ -35,12 +35,18 @@
   <div id="vm_exhibition">
     <div class="box">
       <div class="head">
-        <div class="content">
-          <div class="qr">
-            <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">
-            <p class="text">扫码咨询 展会合作</p>
-          </div>
-        </div>
+          {{range $k,$v:=Ad "pc-exhibition-index-head" -1 .Host (cookie "SESSIONID")}}
+              <div class="exhibition-head"  onclick="golink({{$v.S_link}})">
+<!--                  <img src="{{$v.S_pic}}" alt="">-->
+                  <div class="img-con" style="background-image: url({{$v.S_pic}})"></div>
+              </div>
+          {{end}}
+<!--        <div class="content">-->
+<!--          <div class="qr">-->
+<!--            <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">-->
+<!--            <p class="text">扫码咨询 展会合作</p>-->
+<!--          </div>-->
+<!--        </div>-->
       </div>
       <h2 class="title pc_hide">热门展会</h2>
       <div class="content bannerSwiper">

src/web/templates/frontRouter/pc/cooperation/free/index.html

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>商务合作_剑鱼合作伙伴联盟-剑鱼标讯</title>
+  <title>渠道及商务合作_剑鱼合作伙伴联盟-剑鱼标讯</title>
   <meta content="IE=edge,Chrome=1" http-equiv="X-UA-Compatible" />
   <meta name="Keywords" content="商务合作,剑鱼合作伙伴,合作联盟"/>
   <meta name="Description" content="深化合作，共享共赢，剑鱼合作伙伴联盟，聚合百万客户，共同拓展销售商机，共赢企业服务万亿市场！" />
@@ -17,6 +17,7 @@
   <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
   <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
+  <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/index_pc.css?v={{Msg "seo" "version"}}' />
   <link href='{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/css/index.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <style>
   </style>
@@ -25,7 +26,7 @@
 {{include "/common/pchead.html"}}
 <!-- 用户留资 -->
 <div id="vue-collect-user-info"></div>
-<div class="cooperation-page">
+<div class="cooperation-page" v-cloak>
   <div class="cooperation-page-banner">
     <div class="banner-content w">
       <img class="text-theme" src="{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/cooperate.png" alt="">
@@ -56,7 +57,7 @@
           <img class="item-bottom" :src="item.bottom" alt="">
           <img class="item-center" :src="item.center" alt="">
           <img class="item-top" :src="item.top" alt="">
-          <button class="get-more-btn" onclick="openLink()">了解更多</button>
+          <button class="get-more-btn" onclick="openLink()">${index === 0 ? '加入我们' : '了解更多'}</button>
         </div>
       </div>
       <h3 class="coop-call-tip">以上合作方式如不能满足您的合作需求，您可以直接与我们联系</h3>
@@ -113,17 +114,22 @@
         {
           top: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/top-1.png',
           center: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/center-1.png',
-          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom-little.png'
+          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom.png'
         },
         {
           top: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/top-2.png',
           center: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/center-2.png',
-          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom-little.png'
+          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom.png'
         },
         {
           top: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/top-3.png',
           center: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/center-3.png',
-          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom-big.png'
+          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom.png'
+        },
+        {
+          top: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/top-4.png',
+          center: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/center-4.png',
+          bottom: '{{Msg "seo" "cdn"}}/frontRouter/pc/cooperation/img/coopType/bottom.png'
         }
       ]
     }

src/web/templates/frontRouter/pc/serviceSystem/free/index.html

@@ -975,9 +975,9 @@
                 <img src="/serviceSystem/img/close.png" alt="" class="close" @click.stop="close('isshow')">
                 <div class="title">立即咨询</div>
                 <div class="box">
-                    <img :src="url" alt="">
+                    <img :src="kefu.qr" alt="">
                 </div>
-                <p class="text">{text}</p>
+                <p class="text">{kefu.text}</p>
             </div>
         </div>
         <div class="model_ toast_model" v-show="showToast"  @click.self="close('showToast')">

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

@@ -620,8 +620,10 @@
                     </div>
                 </van-tab>
             </van-tabs>
+        <!--客服组件-->
+        <customer-corner-component v-show="isLogin" :scroll-status="pageScrollTop < 60"></customer-corner-component>
         </section>
-        
+
         <div class="j-main project-tab-container" v-if="conf.powerLoaded && !conf.showPortraitAll">
             <div class="j-container empty" v-show="topProject.list.length === 0">
                 <div class="j-img img-empty empty-img"></div>
@@ -683,6 +685,7 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/dataExport/components/popup-data-export.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/customer-corner/mobile-template.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 收藏组件
   var vKeepComponent = new Vue({

src/web/templates/frontRouter/wx/fileRecord/sess/index.html

@@ -404,15 +404,15 @@
               <h3>
                   <span>
                       <img src="{{Msg "seo" "cdn"}}/common-module/collection/image/wx2.png" alt="微信icon">
-                      <span>客户成功经理</span>
+                      <span>{ kefuInfo.remark || '专属客服' }</span>
                   </span>
                   <span class="close-icon" @click="kfDialogShow = false">
                       <img id="QRCode-pic" src="{{Msg "seo" "cdn"}}/jyapp/images/icon-close.png?v={{Msg "seo" "version"}}" alt="">
                   </span>
               </h3>
               <div class="content">
-                  <p class="qr-code">
-                      <img :src="QRCode" alt="">
+                  <p class="qr-code" v-if="kefuInfo.wxer">
+                      <img :src="kefuInfo.wxer" alt="">
                   </p>
                   <p>微信扫一扫</p>
               </div>

src/web/templates/order/pc/docMember/detail.html

@@ -282,6 +282,15 @@
                               $(".pay_num").text(r.data.transaction_id);
                           }
                       }
+                      //发票
+                      if (r.data.order.is_can_invoice) {
+                          $(".openinvoice").css("display", "");
+                      }
+                      if (r.data.order.invoice_show) {
+                          $(".lookinvoice").css("display", "").on("click", function () {
+                              checkinvoice(r.data.applybill_status, orderCode)
+                          })
+                      }
                   }
                 if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
                   $("#status_cancelled").removeClass("hide");
@@ -407,7 +416,7 @@
         })
       })
       $(".payOrder").on("click", function () {
-        location.href = "/front/subvip/orderPay/" + orderCode;
+        location.href = "/front/docMember/orderPay/" + orderCode;
       })
       function diffCountdown(endTime) {
         timerId = setInterval(function () {

src/web/templates/pc/classifylist.html

@@ -771,10 +771,13 @@ var res = {{.T.res}}
 var dataId = "";
 $(function(){
   if(!loginflag){//未登录隐藏
+    // 客服企微隐藏
+    $('#customer-wework').addClass('hide')
     $('#go-customer-4').addClass('hide')//客服隐藏
     $('.nologin-hide').addClass('hide')  //拟建隐藏
   }
   window.loginCallback = function () {//登录成功回调
+    $('#customer-wework').removeClass('hide')
     $('#go-customer-4').removeClass('hide')
     $('.nologin-hide').removeClass('hide')
   }

src/web/templates/pc/dataExport_sieve.html

@@ -1478,7 +1478,6 @@
   var winnerLimit = limit.winnerLimit || 100
   var agencyLimit = limit.agencyLimit || 100
   var wordsLimit =  limit.countLimit
-  console.log(limit);
   var dataNode = new Vue({
     delimiters: ['${', '}'],
     el: '#conditions-box',
@@ -1550,9 +1549,11 @@
           focus: false,
           list: []
       },
+      kefuInfo: {}
     },
     created () {
       $('.dataExport_table').css('display', 'block')
+      this.getKefuInfo()
     },
     mounted () {
       window.addEventListener('scroll', this.handleScroll, true)
@@ -1654,6 +1655,19 @@
       }
     },
     methods: {
+      getKefuInfo () {
+        var _this = this
+        $.ajax({
+          type: 'post',
+          url: '/bigmember/use/getCustom',
+          data: { type: "kf" },
+          success: function (res) {
+            if (res && res.data) {
+              _this.kefuInfo = res.data || {}
+            }
+          }
+        })
+      },
       toDetail (data, str) {
         if(str === '1') {
           $('#buyerInput').val(data)
@@ -2370,15 +2384,14 @@
       }
     }
   })
+
+
+
   $('.customWx').mouseenter(function () {
-    if(window.customers && window.customers.length) {
-      window.customers.forEach(function(item) {
-        var $item = $(item)
-        var $img = $('.custom-service-wximg-img')
-        if(item.name === '高静') {
-          $img.attr('src', item.wxer)
-        }
-      })
+    var kefuInfo = dataNode.$data &&  dataNode.$data.kefuInfo ? dataNode.$data.kefuInfo : {}
+    if(kefuInfo && kefuInfo.wxer) {
+      var $img = $('.custom-service-wximg-img')
+      $img.attr('src', kefuInfo.wxer)
     }
     $('.custom-service-wximg').show()
   })

src/web/templates/pc/newIndex.html

@@ -234,12 +234,6 @@
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_2023.12.js?v={{Msg "seo" "version"}}'></script>
   <script defer src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
   <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_charts.js?v={{Msg "seo" "version"}}'></script>
-  <script>
-    var docsData = {{.T.docsData}}
-    var docClass = {{.T.docsClass}}
-    var strategyList = {{.T.strategyList}}
-    console.log(docsData, strategyList, docClass);
-  </script>
 </body>
 
 </html>

src/web/templates/pc/template/index/doc-card-module.html

@@ -16,18 +16,18 @@
           <ul class="bidding-desc-card-column clearfix">
             {{range $kk,$vv := $v}}
             <li class="doc-card-list-item">
-              <div class='doc-card-list-item-img {{if not $vv.productType}}{{else if Eq $vv.productType 1}}free{{else if Eq $vv.productType 2}}good{{end}}'>
-                <img class="doc-main-img" src="{{$vv.previewImg}}" alt="doc-name">
+              <div class='doc-card-list-item-img {{if not $vv.productType}}{{else if Eq $vv.productType 1}}free{{end}}'>
+                <img class="doc-main-img" src="{{$vv.previewImg}}" alt="{{$vv.docName}}">
                 {{if or (eq $vv.docFileSuffix "doc") (eq $vv.docFileSuffix "docx")}}
-                <img class="doc-type-img" src='/images/pc/word.png' alt="doc-type">
+                <img class="doc-type-img" src='/images/pc/word.png' alt="{{$vv.docFileSuffix}}">
                 {{else if  eq $vv.docFileSuffix "pdf"}}
-                <img class="doc-type-img" src='/images/pc/pdf.png' alt="doc-type">
+                <img class="doc-type-img" src='/images/pc/pdf.png' alt="{{$vv.docFileSuffix}}">
                 {{else if  eq $vv.docFileSuffix "ppt"}}
-                <img class="doc-type-img" src='/images/pc/ppt.png' alt="doc-type">
+                <img class="doc-type-img" src='/images/pc/ppt.png' alt="{{$vv.docFileSuffix}}">
                 {{else if  eq $vv.docFileSuffix "xls"}}
-                <img class="doc-type-img" src='/images/pc/excel.png' alt="doc-type">
+                <img class="doc-type-img" src='/images/pc/excel.png' alt="{{$vv.docFileSuffix}}">
                 {{else if  eq $vv.docFileSuffix "txt"}}
-                <img class="doc-type-img" src='/images/pc/txt.png' alt="doc-type">
+                <img class="doc-type-img" src='/images/pc/txt.png' alt="{{$vv.docFileSuffix}}">
                 {{end}}
               </div>
               <a class="doc-card-list-item-title cms-link ellipsis-2" target="_blank" href="/swordfish/docs/content/{{$vv.id}}" title="{{$vv.docName}}">{{$vv.docName}}</a>