Merge branch 'master' into feature/v4.8.25

src/jfw/front/tags.go

@@ -649,7 +649,7 @@ func (this *Tags) GetBidding(industry, area, city, stype, keyword string, reques
 			var datas *[]map[string]interface{}
 			var startPage int
 			currentPage := 5
-			limitcount := 50
+			limitcount := qu.IntAllDef(config.Seoconfig["tagsLimitCount"], 50)
 			count := elastic.Count(INDEX, TYPE, query1)
 			if keyword == "" {
 				r := rand.New(rand.NewSource(time.Now().UnixNano()))
@@ -661,7 +661,7 @@ func (this *Tags) GetBidding(industry, area, city, stype, keyword string, reques
 				datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, bidField, startPage, limitcount)
 			} else {
 				log.Println(keyword, area, city, industry)
-				_, _, datas = bidsearch.GetPcBidSearchData(keyword, area, city, "", stype, industry, "", "", "", "", "", "", "", 0, true, []string{"title", "detail"}, bidField, "", false, false, "", 50, "")
+				_, _, datas = bidsearch.GetPcBidSearchData(keyword, area, city, "", stype, industry, "", "", "", "", "", "", "", 0, true, []string{"title", "detail"}, bidField, "", false, false, "", limitcount, "")
 
 				if datas != nil && len(*datas) > limitcount {
 					*datas = (*datas)[0:limitcount]

src/seo.json

@@ -4491,5 +4491,6 @@
 	"seoKeywordSuffix":"",
 	"seoLetterPageSize":1000,
 	"seoAreaSuffix":"政府采购网",
-  "appNewUserTime":1668155814
+  "appNewUserTime":1668155814,
+  "tagsLimitCount":300
 }

src/web/templates/pc/dataExport_sieve.html

@@ -1028,7 +1028,7 @@
           <table v-if="dataType === '2'" class="d_gj thead_gj" cellspacing="0" cellpadding="0">
             <tr>
               <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
-                <span v-if="index===13&&dataType === '2'||index===14&&dataType === '2'">${item.title}<br/>(万元)</span>
+                <span v-if="index===14&&dataType === '2'||index===15&&dataType === '2'">${item.title}<br/>(万元)</span>
                 <span v-else>${item.title}</span>
               </td>
             </tr>
@@ -1081,7 +1081,7 @@
         <table v-if="dataType === '2'" id="d_gj" class="d_gj" cellspacing="0" cellpadding="0">
             <tr id="firstTrGj">
               <td :rowspan="item.rowspan" :colspan="item.colspan" v-for="(item, index) in title" :key="index">
-                <span v-if="index===13&&dataType === '2'||index===14&&dataType === '2'">${item.title}<br/>(万元)</span>
+                <span v-if="index===14&&dataType === '2'||index===15&&dataType === '2'">${item.title}<br/>(万元)</span>
                 <span v-else>${item.title}</span>
               </td>
             </tr>