Merge branch 'feature/v4.8.70' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.70_wmh

src/db.json

@@ -36,14 +36,27 @@
       "size": 30,
       "version": "v7",
       "userName": "",
-      "password": ""
+      "password": "",
+      "esIndex": "bidding",
+      "esType": "bidding"
     },
     "other": {
       "address": "http://192.168.3.241:9205,http://192.168.3.149:9200",
       "size": 30,
       "version": "v7",
       "userName": "",
-      "password": ""
+      "password": "",
+      "esIndex": "bidding_year",
+      "esType": "bidding_year"
+    },
+    "free": {
+      "address": "http://192.168.3.241:9205,http://192.168.3.149:9200",
+      "size": 30,
+      "version": "v7",
+      "userName": "",
+      "password": "",
+      "esIndex": "bidding",
+      "esType": "bidding"
     }
   },
   "redis": {

src/go.mod

@@ -6,8 +6,8 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
+	app.yhyue.com/moapp/jypkg v1.0.6
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/ClickHouse/clickhouse-go v1.5.4
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0
@@ -24,7 +24,7 @@ require (
 	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-20230225125145-431a4f70093a // indirect
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/RoaringBitmap/roaring v1.5.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

src/go.sum

@@ -9,18 +9,18 @@ app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O
 app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/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 v1.0.4-0.20231109032304-2da6db20132a h1:mUqyzXj24uoi9gE9P+EVoiMi/deUHH2+0jbTnwLhOZ0=
-app.yhyue.com/moapp/jypkg v1.0.4-0.20231109032304-2da6db20132a/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
+app.yhyue.com/moapp/jypkg v1.0.6 h1:96kLs49jrUsdeFtuGf24UdqFjpnlR6G03j0AUvUPuGI=
+app.yhyue.com/moapp/jypkg v1.0.6/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
 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-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.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 h1:14Yxzutsej7LQe3jnN61wuRX9qjAZ4FtdWMA27ewQ3w=
+bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e h1:bncHHkJLqiDW1ZN6MVe+3bj3i0LxWgFkfqge6Gk7lB4=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e/go.mod h1:+6ZjaqpCr+ih1GYOh6ZhoDri9ZjiuxxSHvR7ovvhLx0=
 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/jfw/front/searchOptimize.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/config"
+	"jy/src/jfw/jyutil"
 	"log"
 	"net/http"
 	"strconv"
@@ -297,7 +298,16 @@ func (so *SearchOptimize) GetBidSearchList(isCache bool) (count, total int64, li
 			Limit:      util.If(isCache, util.If(so.IsPay, bidsearch.SearchMaxPageCount_PAYED, bidsearch.SearchMaxPageCount_PC).(int), so.PageSize).(int), //缓存数据： 付费或未登录用户一次性5000条，100页数据；免费用户一次性500条，10页数据；实时数据：每页50条数据请求
 			Count:      util.If(strings.Contains(so.SelectType, "detail"), 115, 0).(int),                                                                  //高亮正文数量
 			HighLight:  util.If(strings.Contains(so.SelectType, "detail"), true, false).(bool),                                                            //是否高亮正文
-			IsLogin:    so.UserId != "",
+			State: func(userId string, isPay bool) (state int) {
+				state = 1
+				if userId != "" {
+					state = 2
+					if isPay {
+						state = 3
+					}
+				}
+				return
+			}(so.UserId, so.IsPay),
 		}
 		var repl *[]map[string]interface{}
 		total, repl = biddingSearch.GetAllByNgramWithCount()
@@ -764,11 +774,18 @@ type SearchByES struct {
 	Limit      int
 	Count      int
 	HighLight  bool
-	IsLogin    bool
+	State      int //1:noLogin;2:free;3:pay
 }
 
 // GetAllByNgramWithCount  获取es查询结果及总数量
 func (e *SearchByES) GetAllByNgramWithCount() (int64, *[]map[string]interface{}) {
+	var (
+		jyES = jyutil.GetES(e.State)
+	)
+	if jyES.EsIndex != "" {
+		e.Index = jyES.EsIndex
+		e.IType = jyES.EsType
+	}
 	if e.Query != "" {
 		queryStr := e.Query
 		if e.HighLight {
@@ -787,12 +804,13 @@ func (e *SearchByES) GetAllByNgramWithCount() (int64, *[]map[string]interface{})
 		if e.Start > -1 {
 			queryStr = queryStr[:len(queryStr)-1] + `,"from":` + strconv.Itoa(e.Start) + `,"size":` + strconv.Itoa(e.Limit) + "}"
 		}
-		log.Println("queryStr:", queryStr)
-		if e.IsLogin {
-			return elastic.GetWithCount(e.Index, e.IType, e.Query, queryStr)
-		} else {
-			return pc.Other.GetWithCount(e.Index, e.IType, e.Query, queryStr)
-		}
+		log.Println(e.Index, e.IType, "--queryStr:", queryStr)
+		//if e.IsLogin {
+		//	return elastic.GetWithCount(e.Index, e.IType, e.Query, queryStr)
+		//} else {
+		//	return pc.Other.GetWithCount(e.Index, e.IType, e.Query, queryStr)
+		//}
+		return jyES.Es.GetWithCount(e.Index, e.IType, e.Query, queryStr)
 	} else {
 		return 0, nil
 	}

src/jfw/jyutil/jyutil.go

@@ -1,6 +1,7 @@
 package jyutil
 
 import (
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jypkg/compatible"
 	"encoding/json"
@@ -329,3 +330,31 @@ func AdditionalFilterGeneric(keyWords string) (additionalWords string) {
 	}
 	return additionalWords
 }
+
+type JyES struct {
+	Es      elastic.Es
+	EsIndex string
+	EsType  string
+}
+
+// GetES es 分类 1:noLogin;2:free;3:pay
+func GetES(state int) *JyES {
+	var ESInfo = &JyES{
+		Es: elastic.VarEs,
+	}
+	switch state {
+	case 1:
+		ESInfo = &JyES{
+			Es:      public.Other,
+			EsIndex: public.DbConf.Elasticsearch.Other.EsIndex,
+			EsType:  public.DbConf.Elasticsearch.Other.EsType,
+		}
+	case 2:
+		ESInfo = &JyES{
+			Es:      public.Free,
+			EsIndex: public.DbConf.Elasticsearch.Free.EsIndex,
+			EsType:  public.DbConf.Elasticsearch.Free.EsType,
+		}
+	}
+	return ESInfo
+}

src/web/staticres/css/dev2/biddingSearch.css

@@ -1668,18 +1668,18 @@ position: absolute;
   border: 1px solid #2CB7CA;
 }
 .liLuceneList .bid-list-tags .icon-collect,
-.liLuceneList .bid-list-tags .icon-canbiao,
+.liLuceneList .bid-list-tags .icon-canbiao-img,
 .liLuceneList .bid-list-tags .icon-shoulu{
   position: relative;
   width: 54px;
   background-size: 20px 20px;
   background-position: left center;
 }
-.liLuceneList .bid-list-tags .icon-canbiao{
+.liLuceneList .bid-list-tags .icon-canbiao-img{
     width: 60px;
 }
 .liLuceneList .bid-list-tags .icon-collect::after,
-.liLuceneList .bid-list-tags .icon-canbiao::after,
+.liLuceneList .bid-list-tags .icon-canbiao-img::after,
 .liLuceneList .bid-list-tags .icon-shoulu::after{
   position: absolute;
   content: '收藏';
@@ -1692,7 +1692,7 @@ position: absolute;
 .liLuceneList .bid-list-tags .icon-shoulu.icon-a-Property1yishoulu::after{
   width: 42px;
 }
-.liLuceneList .bid-list-tags .icon-canbiao::after {
+.liLuceneList .bid-list-tags .icon-canbiao-img::after {
     content: '参标';
 }
 .liLuceneList .bid-list-tags .icon-shoulu::after {
@@ -1701,11 +1701,11 @@ position: absolute;
 .liLuceneList .bid-list-tags .icon-collect.checked{
   width: 68px;
 }
-.liLuceneList .bid-list-tags .icon-canbiao.checked{
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked{
     width: 88px;
 }
 .liLuceneList .bid-list-tags .icon-collect.checked::after,
-.liLuceneList .bid-list-tags .icon-canbiao.checked::after,
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked::after,
 .liLuceneList .bid-list-tags .icon-shoulu.checked::after{
   position: absolute;
   content: '已收藏';
@@ -1716,7 +1716,7 @@ position: absolute;
   color: #1D1D1D;
 }
 
-.liLuceneList .bid-list-tags .icon-canbiao.checked::after{
+.liLuceneList .bid-list-tags .icon-canbiao-img.checked::after{
     content: '终止参标';
     width: 88px !important;
 }

src/web/staticres/css/dev2/newBidSearch.css

@@ -221,7 +221,7 @@
   background-size: 20px;
 }
 .icon-collect,
-.icon-canbiao{
+.icon-canbiao-img{
   display: inline-block;
   width: 20px;
   height: 20px;
@@ -236,11 +236,11 @@
   background-size: contain;
 }
 
-.icon-canbiao {
+.icon-canbiao-img {
   background-image: url(/images/canbiao.png);
 }
 
-.icon-canbiao.checked {
+.icon-canbiao-img.checked {
   background-image: url(/images/canbiao-active.png);
 }
 

src/web/staticres/dataExport/css/conditions.css

@@ -1279,4 +1279,47 @@ input.sm {
   color: #1d1d1d;
   background-color: #ececec;
 }
-/* E P289数据导出迭代优化 E*/
+/* E P289数据导出迭代优化 E*/
+
+/* loading */
+body .loading_ {
+  height: 100%;
+  width: 100%;
+  position: fixed;
+  background: #382f3d;
+  z-index: 999999999990;
+opacity: .7;
+    margin-top: 20px;
+}
+body .loading_ > p {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  height: 60px;
+  width: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 0.36rem;
+  color: rgba(44, 183, 202, 0.8);
+}
+body .loading_ p span {
+  position: absolute;
+  display: block;
+  height: 40px;
+  width: 40px;
+  margin: 10px;
+  border-radius: 50%;
+  -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
+  animation: loading_ ease 1s infinite;
+  left: 0;
+  top: 0;
+}
+@keyframes loading_ {
+0% {
+  transform: rotate(0deg); }
+100% {
+  transform: rotate(360deg); }
+}

src/web/staticres/dataExport/css/previewData.css

@@ -36,11 +36,11 @@ body{
     white-space: nowrap;
 }
 
-.d_body .d_gj tr:nth-child(1) td,.d_gj tr:nth-child(2) td{
+.d_body .d_gj tr:nth-child(1) td, .d_body .d_gj tr:nth-child(2) td{
   background-color: transparent;
 }
 
-.d_body .d_bz tr:nth-child(1) td,.d_bz tr:nth-child(2) td{
+.d_body .d_bz tr:nth-child(1) td, .d_body .d_bz tr:nth-child(2) td{
   background-color: transparent;
 }
 
@@ -210,6 +210,11 @@ body{
 
 .d_bz tr:nth-child(odd).multi_packet_tr, .d_gj tr:nth-child(odd).multi_packet_tr{
   background: transparent;
+  height: 26px;
+}
+.d_bz tr:nth-child(even).multi_packet_tr, .d_gj tr:nth-child(even).multi_packet_tr{
+  background: transparent;
+  height: 26px;
 }
 .d_gj tr.multi_packet_tr td{
   border-left: none;
@@ -304,8 +309,11 @@ th {
 }
 
 .d_body .el-table .set-table-line{
+  display: flex;
+  justify-content: center;
+  align-items: center;
   width: 100%;
-  height: 24px;
+  min-height: 24px;
   border-bottom: 1px solid #e6e6e6;
 }
 .d_body .el-table .set-table-line:last-child{

src/web/staticres/frontRouter/pc/collection/css/index-pc.css

@@ -39,7 +39,7 @@
     background-repeat: no-repeat;
     background-size: contain;
 }
-.icon-canbiao {
+.icon-canbiao-img {
     background:transparent url(/images/canbiao.png) no-repeat center;
     background-size: contain;
 }
@@ -47,7 +47,7 @@
     margin-right:0px !important;
 }
 
-.icon-canbiao-active {
+.icon-canbiao-img-active {
     background:transparent url(/images/canbiao-active.png) no-repeat center;
     background-size: contain;
 }

src/web/staticres/js/superSearch.js

@@ -369,7 +369,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
             }
             // 分类标签、收藏
             listHtml += '<div class="bid-list-tags">'
-                +'<div>'
+                +'<div class="bid-list-tags-left">'
                 if (datas[i].site == '剑鱼信息发布平台') {
                   listHtml += '<span class="tags-item tags-publish">用户发布</span>'
                 }
@@ -415,9 +415,9 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
                   listHtml+='<span class="tags-item tags-file">'+'有附件'+'</span>'
                 }
                 listHtml+='</div>'
-                listHtml+='<div>'
+                listHtml+='<div class="bid-list-tags-right">'
                 // 是否参标（2022/05/12）
-                 listHtml += '<i class="icon-canbiao" style="display:none" dataid="'+datas[i]._id+'" ></i>'
+                 listHtml += '<i class="icon-canbiao-img" style="display:none" dataid="'+datas[i]._id+'" ></i>'
 
                 // // 是否收藏
                 var resource = inResourceBIiframe
@@ -1917,14 +1917,14 @@ function getBidIsJoin () {
         if(data.length > 0) {
           Bidrenewal_Dialog.initBidrenewalDialog = true // 加载参标状态更新弹窗
          }
-        $('.icon-canbiao').removeClass('checked')
+        $('.icon-canbiao-img').removeClass('checked')
         data.forEach(function (item, index) {
           if(!inResourceBIiframe) {
-            $('.icon-canbiao[dataid="' + item.id + '"]').show()
+            $('.icon-canbiao-img[dataid="' + item.id + '"]').show()
           }
-          // $('.icon-canbiao[dataid="' + item + '"]').css("display","inline-block");
+          // $('.icon-canbiao-img[dataid="' + item + '"]').css("display","inline-block");
           if(item.value) {
-            $('.icon-canbiao[dataid="' + item.id + '"]').addClass('checked')
+            $('.icon-canbiao-img[dataid="' + item.id + '"]').addClass('checked')
           }
         })
       }
@@ -1936,7 +1936,7 @@ function getBidIsJoin () {
 function joinBidsClick() {
   // console.log(vipState, '是否是超级订阅用户')
   // 单个参标点击事件
-  $('.icon-canbiao').unbind('click').on('click',function(e) {
+  $('.icon-canbiao-img').unbind('click').on('click',function(e) {
     // 登录判断
     if (!loginflag) {
       openLoginDig()

src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -197,7 +197,7 @@
                       <!-- <i class="j-icon icon-delete-gray" style="width: 24px;height: 24px;"></i> -->
                     </div>
                     <div class="dialog-content">
-                      <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加<span style="color: #2ABED1;">客服微信</span></span>
+                      <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加<span style="color: #2ABED1;">客服微信</span><span>进行定制化导出</span></span>
                       <div class="custom-wx"></div>
                       <p style="color: #1D1D1D;">客服微信</p>
                       <button class="continue-export-btn">继续导出20000条</button>
@@ -228,7 +228,7 @@
                             </div>
                             <div class="append-container">
                                 <button class="bi-report-inject-button" :disabled="item.added" v-if="biEnv" @click.prevent.stop="biAddProject(item)">${ item.added ? '已添加' : '添加' }</button>
-                                <span class="j-icon i-canbiao" v-if="!biEnv && item.joinBid !== undefined" :class="item.joinBid ? 'icon-canbiao-active' : 'icon-canbiao'" @click.prevent.stop="joinBidAction(item)"></span>
+                                <span class="j-icon i-canbiao" v-if="!biEnv && item.joinBid !== undefined" :class="item.joinBid ? 'icon-canbiao-img-active' : 'icon-canbiao-img'" @click.prevent.stop="joinBidAction(item)"></span>
                                 <span class="j-icon" v-if="!biEnv" :class="item.star ? 'icon-star-active' : 'icon-star'" @click.prevent.stop="unStarThis(item)"></span>
                             </div>
                         </div>

src/web/templates/pc/dataExport_sieve.html

@@ -622,6 +622,9 @@
 </head>
 <body>
 {{include "/common/pchead.html"}}
+<div class="loading_" style="display:none;">
+  <p><span></span></p>
+</div>
 <section id="conditions-box" class="conditions-box w" style="min-height: calc(100vh - 364px);">
     <!-- 数据导出功能文案 -->
     <div class="dataExportFun">
@@ -742,7 +745,7 @@
                     <p class="f-l-c-item" v-if="item.area || item.city">区域：<em class="i-value">${formatRegion(item.area,item.city)}</em></p>
                     <p class="f-l-c-item" v-if="item.industry">行业：<em class="i-value">${formatIndustry(item.industry)}</em></p>
                     <p class="f-l-c-item" v-if="item.buyerclass">采购单位类型：<em class="i-value">${formatBuyerClass(item.buyerclass)}</em></p>
-                    <p class="f-l-c-item" v-if="item.keyword">关键词：<em class="i-value">${formatKeyword(item.keyword)}</em></p>
+                    <p class="f-l-c-item" v-if="item.keywords">关键词：<em class="i-value">${formatKeyword(item.keywords)}</em></p>
                     <p class="f-l-c-item" v-if="item.selectType">关键词匹配方式：<em class="i-value">${formatScope(item.selectType, 'CN')}</em></p>
                     <p class="f-l-c-item">
                       <span v-if="item.minprice || item.maxprice">金额：<em class="i-value">${formatPriceScope(item.minprice, item.maxprice)}</em></span>
@@ -1377,6 +1380,7 @@
       <span>您选择的数据超过了导出数据最大值20,000，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加</span>
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
+        <span>进行定制化导出</span>
         <div class="custom-service-wximg" style="display: none;">
           <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
@@ -1397,6 +1401,7 @@
       <span>您选择的数据超过了导出数据最大值20,000，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加</span>
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
+        <span>进行定制化导出</span>
         <div class="custom-service-wximg" style="display: none;">
           <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
@@ -2012,7 +2017,10 @@
       formatKeyword: function(arr) {
         let keyword = ''
         if (arr) {
-          arr = JSON.parse(JSON.parse(arr))
+          arr= JSON.parse(arr)
+          if (typeof arr === 'string') {
+            arr = JSON.parse(arr)
+          }
           arr.forEach(function(v, i) {
             let key = ''
             let append = ''
@@ -3091,6 +3099,7 @@
     })
 
     $("#sieve").click(function () {
+        $('.loading_').show()
         dataNode.loading = true
         $("#sieve").addClass("sussecc");
         $("#reset").removeClass("sussecc");
@@ -3153,6 +3162,7 @@
         setLocalStorage(param);
         // console.log(param);
         $.post("/front/dataExport/sieveData", param, function (res) {
+          $('.loading_').hide()
           if(res.error_code == 0) {
             dataNode._data.dataInfo = res.data
             if(res.data.list) {
@@ -3204,6 +3214,8 @@
               dataNode._data.tableShow = false
               dataNode._data.noDataDialog = true
             }
+          } else {
+            $('.loading_').hide()
           }
         }, 'json');
     });

src/web/templates/pc/supsearch.html

@@ -1760,7 +1760,7 @@
           <!-- <i class="j-icon icon-delete-gray" style="width: 24px;height: 24px;"></i> -->
         </div>
         <div class="dialog-content">
-          <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加<span style="color: #2ABED1;">客服微信</span></span>
+          <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ，请优化条件后导出。您也可联系客服：400-108-6670 ，或添加<span style="color: #2ABED1;">客服微信</span><span>进行定制化导出</span></span>
           <div class="custom-wx"></div>
           <p style="color: #1D1D1D;">客服微信</p>
           <button onclick="toPaydataExport()" class="continue-export-btn">继续导出20000条</button>