Merge branch 'feature/v4.8.63' into dev/4.8.63_zsy

src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230911032646-c7a25edb885d
+	app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 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 v0.0.0-20230911032646-c7a25edb885d h1:uSr/OJCLEnquTTF5rUnxlcPD1gwoCiTi1nAd+e0Cx8E=
-app.yhyue.com/moapp/jypkg v0.0.0-20230911032646-c7a25edb885d/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72 h1:I+4DXMoVxSYstaIiYWuoK4jNfeM9J4Tr1g6qiMoqL+o=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/modules/app/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230802005656-6379ddc03ee0
+	app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1
@@ -18,7 +18,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/RoaringBitmap/roaring v1.5.0 // indirect

src/jfw/modules/app/src/go.sum

@@ -9,14 +9,14 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 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 v0.0.0-20230802005656-6379ddc03ee0 h1:EC5n/8wE9PnSSZxTTuAjDngI9YC41MPsRShbI8Z8v8Y=
-app.yhyue.com/moapp/jypkg v0.0.0-20230802005656-6379ddc03ee0/go.mod h1:VaHDi3twSg4G84k2+UFOe7ZCw5EqUZVAkW2N2dHeMbU=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72 h1:I+4DXMoVxSYstaIiYWuoK4jNfeM9J4Tr1g6qiMoqL+o=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 h1:hrBqrsf2QHTrnoR9VTV4w7g2akDfbpQ+umNQvkkNs+Y=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=

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

@@ -138,7 +138,8 @@ var vNode = {
             isHaveTop: false, // 是否需要置顶tab
             setHeight: 0, // 置顶高度
             setHeightActive: '',
-            loadingEmpty: false
+            loadingEmpty: false,
+            isShowAll: false
         }
     },
     computed: {
@@ -523,6 +524,7 @@ var vNode = {
         },
         // 开始分析
         setAjaxFilters (data) {
+          this.isShowAll = true
           // 清除老数据，初始化页面
           this.setModuleState()
           this.filterData = data
@@ -1320,7 +1322,7 @@ var vNode = {
                 listCount: this.listCount,
                 isHaveTop: this.isHaveTop,
                 loadingEmpty: this.loadingEmpty
-                }
+              }
             // console.log(data)
             sessionStorage.setItem('searchItem', this.filterData.searchItem)
             sessionStorage.setItem('$data-analysis-result_' + this.filterData.searchItem,JSON.stringify(data))

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

@@ -416,8 +416,8 @@
                 const id = utils.getParam('id')
                 const sid = utils.getParam('sId')
                 if(id || sid) {
-                  data.id = id
-                  data.infoid = sid
+                  data.id = id || sid
+                  data.infoid = sid || id
                 }
                 var that = this;
                 $.ajax({
@@ -604,15 +604,17 @@
                 var that = this;
                 var anaBuyerContent = []
                 var anaBuyer = ''
-                if(that.analysisFilterData.buyerContent) {
-                  anaBuyerContent = that.analysisFilterData.buyerContent.reduce((acc, item) => acc.concat(item.key), []).flat();
-                }
-                if(that.analysisFilterData.filters) {
-                  if(that.analysisFilterData.filters.buyer) {
-                    anaBuyer = that.analysisFilterData.filters.buyer
+                if (this.analysisFilterData) {
+                  if(that.analysisFilterData.buyerContent) {
+                    anaBuyerContent = that.analysisFilterData.buyerContent.reduce((acc, item) => acc.concat(item.key), []).flat();
                   }
-                  if(that.analysisFilterData.filters.pname) {
-                    that.project.pName = that.analysisFilterData.filters.pname
+                  if(that.analysisFilterData.filters) {
+                    if(that.analysisFilterData.filters.buyer) {
+                      anaBuyer = that.analysisFilterData.filters.buyer
+                    }
+                    if(that.analysisFilterData.filters.pname) {
+                      that.project.pName = that.analysisFilterData.filters.pname
+                    }
                   }
                 }
                 $.ajax({

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

@@ -359,7 +359,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="jy-empty" v-if="listCount.pCount === 0 && isShow.isShowAll">
+                    <div class="jy-empty" v-if="listCount.pCount === 0 && isShowAll">
                       <div class="jy-empty-img"></div>
                       <p class="jy-empty-text" style="padding-bottom: 0.32rem;">
                         对不起，没有匹配到同类项目<br/>

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -3434,6 +3434,11 @@
       })
     }
     $(function(){
+      setTimeout(function(){
+        try {
+          JyObj.hiddenBottom('0')
+        } catch (error) {}
+      }, 500)
       var u = navigator.userAgent;
       var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
       var isPageHide = false;

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

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230911032646-c7a25edb885d
+	app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.4

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

@@ -9,10 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf h1:/Tk5haITmGc5c3/
 app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 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 v0.0.0-20230901083756-4a2b88d5bf6f h1:R+30KpHwY/OgDAzaWjknnB8Djux+XO0XmQcuG62Z2qY=
-app.yhyue.com/moapp/jypkg v0.0.0-20230901083756-4a2b88d5bf6f/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
-app.yhyue.com/moapp/jypkg v0.0.0-20230911032646-c7a25edb885d h1:uSr/OJCLEnquTTF5rUnxlcPD1gwoCiTi1nAd+e0Cx8E=
-app.yhyue.com/moapp/jypkg v0.0.0-20230911032646-c7a25edb885d/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72 h1:I+4DXMoVxSYstaIiYWuoK4jNfeM9J4Tr1g6qiMoqL+o=
+app.yhyue.com/moapp/jypkg v0.0.0-20230914072228-8fb2a5dd1b72/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/modules/subscribepay/src/go.mod

@@ -5,9 +5,9 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230911091435-88ab01ace30b
+	app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.3
 	github.com/shopspring/decimal v1.3.1

src/jfw/modules/subscribepay/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b h1:Wtytm2QqQWtBV+s
 app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 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 v0.0.0-20230911091435-88ab01ace30b h1:R9+pbsrxvLjlsIPRgMj0hxSz6VYDstqijFk0k8GWcmQ=
-app.yhyue.com/moapp/jypkg v0.0.0-20230911091435-88ab01ace30b/go.mod h1:SJnjdte+Hc5Akxp+YOfu8Mjx7G0kvKVv04LZwuM0l5s=
+app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25 h1:2q7b1auPihIJD3Ewsd7Zi8ESeLkxuP57avWL8UoBr9U=
+app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -21,8 +21,8 @@ bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d h1:
 bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230225061813-384daf716c9d/go.mod h1:UKLwPLx9be595yaiIwqqdKSloKK/Kdf/wTLr4XUClV0=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13/go.mod h1:vDEKni2rnCraKgKnnCEIwsFmO92GxnpfKmNQ+83wKP0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 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=

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

@@ -775,4 +775,23 @@
 
 .right-side-box {
   display: none;
-}
+}
+.mini-custom{
+  display: none;
+  position: fixed;
+  right: 84px;
+  bottom: 80px;
+  max-height: 674px;
+  min-height: 400px;
+  width: 460px;
+  height: calc(100% - 40px);
+  box-shadow: 0 0 20px 0 rgba(8, 31, 38, 0.12);
+  border-radius: 8px;
+  overflow: hidden;
+  z-index: 9999;
+}
+@media screen and (max-height: 800px) {
+  .mini-custom{
+    bottom: 20px;
+  }
+}

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

@@ -33,6 +33,7 @@ $(function () {
   getNowUserInfo()
 })
 
+var customerUrl = ''
 /**
  * 前往剑鱼客服
  * conf.openNewWindow 新窗口打开
@@ -44,11 +45,17 @@ function goCustomerUrl (conf) {
     data: JSON.stringify({type: 'PC', isFind: true}),
     success: function(res) {
       if (res && res.data && res.data.url) {
-        if (conf && conf.openNewWindow) {
-          window.open(res.data.url)
-        } else {
-          location.href = res.data.url
-        }
+        // if (conf && conf.openNewWindow) {
+        //   window.open(res.data.url)
+        // } else {
+        //   location.href = res.data.url
+        // }
+        customerUrl = location.origin + res.data.url
+        var url = location.origin + res.data.url + '&from=aside'
+        // var url = '/page_pc_social/customer?userId=455b495c5c&userType=1&from=aside'
+        var iframe = '<iframe id="custom-iframe" src="'  + url + '" name="_blank" marginwidth="0" marginheight="0"  frameborder="0" width="100%" height="100%"></iframe>'
+        // 发送消息到 iframe
+        $('.mini-custom').prepend(iframe).show()
         return
       }
     }
@@ -142,6 +149,22 @@ function scrollSideIconHide(el) {
 $(function () {
   scrollSideIconHide()
   localStorage.removeItem('kf-shunt-data')
+  // 接收聊天子页面发来的消息
+  window.addEventListener('message', function(event) {
+    console.log(event);
+    // 子页面发送来得消息是关闭或是全屏操作时 关闭当前侧边栏会话窗口
+    if (event.data && event.data.action) {
+      if (event.data.action === 'close') {
+        $('.mini-custom').hide()
+        $('#custom-iframe').remove()
+      } else if (event.data.action ==='fullScreen') {
+        $('.mini-custom').hide(function(){
+          $('#custom-iframe').remove()
+          window.open(customerUrl + '&mini=1')
+        })
+      }
+    }
+  }, false);
 })
 /**
  * 全局客服事件拦截（用于旧客服业务 open-customer 改造）

src/web/templates/common/pcbottom.html

@@ -173,6 +173,8 @@
         </div>
     </div>
 </div>
+<!-- 客服iframe容器 -->
+<div class="mini-custom" id="mini-custom"></div>
 <!--E-侧边栏-->
 
 <script>

src/web/templates/pc/biddetail_rec.html

@@ -1756,7 +1756,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
     <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/third-party-verify.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/public-pc/js/article-content.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/advanced-project-table.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script>
+    <!-- <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script> -->
     <script>
       $(function () {
         var cdnPrefix = (window.goTemplateData && window.goTemplateData.cdn) || ''

src/web/templates/pc/index.html

@@ -227,10 +227,12 @@
                     <li class="provice">
                       {{range $yi, $xi := $x}}
                         {{if eq $yi 0}}
-                        <a class="tab-link tab-label" href="{{$xi.url}}" target="_blank">{{ $xi.city }}</a>
-                        <div class="childlist">
+                          <a class="tab-link tab-label" href="{{$xi.url}}" target="_blank">{{ $xi.city }}</a>
+                          <div class="childlist">
                           {{else}}
-                          <span><a class="tab-link" href="{{$xi.url}}" target="_blank">{{$xi.city}}</a></span>
+                            {{ if not (or (eq $xi.city "新星市") (eq $xi.city "石河子市") (eq $xi.city "阿拉尔市") (eq $xi.city "图木舒克市") (eq $xi.city "五家渠市") (eq $xi.city "北屯市") (eq $xi.city "铁门关市") (eq $xi.city "双河市") (eq $xi.city "可克达拉市") (eq $xi.city "昆玉市") (eq $xi.city "胡杨河市")) }}
+                            <span><a class="tab-link" href="{{$xi.url}}" target="_blank">{{$xi.city}}</a></span>
+                            {{end}}
                           {{end}}
                         {{end}}
                       </div>
@@ -638,7 +640,7 @@
 <!--  <script src='{{Msg "seo" "cdn"}}/js/pc-message-index.js?v={{Msg "seo" "version"}}'></script>-->
     <script src='{{Msg "seo" "cdn"}}/js/pc-message-new.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index.js?v={{Msg "seo" "version"}}'></script>
-  <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script>
+  <!-- <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script> -->
   <script>
     try {
       var cdnPrefix = (window.goTemplateData && window.goTemplateData.cdn) || ''

src/web/templates/pc/tags/detail.html

@@ -309,7 +309,7 @@
   <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/third-party-verify.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/tags/js/no-login-detail.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/common-module/mainSearch/js/advanced-project-table.js?v={{Msg "seo" "version"}}'></script>
-  <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script>
+<!--  <script src='{{Msg "seo" "cdn"}}/common-module/chat/jy-chat-mini.umd.js?auto=false&v={{Msg "seo" "version"}}'></script>-->
   <script>
     $(function () {
       try {