Merge branch 'feature/v4.7.62' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.62

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

@@ -676,7 +676,7 @@ func (u *Use) IsAdd() {
 			if entId > 0 && bigPower.EntInfo[entId] != nil {
 				userInfo.EntName = bigPower.EntInfo[entId].Name
 				userInfo.EntRoleId = bigPower.EntInfo[entId].RoleId
-				//是否是商机管理有效用户：1、管理员；2、员工已分配功能
+				//是否是商机管理有效用户：1、管理员和员工已分配功能
 				userInfo.EntNiche = bigPower.EntInfo[entId].Status == 1 && bigPower.EntInfo[entId].IsPower
 				userInfo.EntIsNew = bigPower.EntInfo[entId].IsNew && userInfo.EntNiche
 				//有商机管理服务的用户 就不是商机管理用户

src/jfw/modules/common/src/qfw/util/dataexport/dataexport.go

@@ -307,6 +307,9 @@ func getDataExportSql(scd *SieveCondition) string {
 			if v.Keyword != "" {
 				if strings.Contains(v.Keyword, "+") {
 					for _, vk := range strings.Split(v.Keyword, "+") {
+						if len(vk) == 0 {
+							continue
+						}
 						//单个字 搜索范围 有全文或者附件 无标题 例如：学 虚拟机 detail  搜索的时候加上标题
 						if scd.Comeinfrom == "supersearchPage" && DetailFileORTitle(selectType) && len([]rune(elastic.ReplaceYH(vk))) == 1 {
 							queryItem = strings.ReplaceAll(selectType+",title", ",", "\",\"")
@@ -318,6 +321,9 @@ func getDataExportSql(scd *SieveCondition) string {
 					}
 				} else if strings.Contains(v.Keyword, " ") {
 					for _, vk := range strings.Split(v.Keyword, " ") {
+						if len(vk) == 0 {
+							continue
+						}
 						//单个字 搜索范围 有全文或者附件 无标题 例如：学 虚拟机 detail  搜索的时候加上标题
 						if scd.Comeinfrom == "supersearchPage" && DetailFileORTitle(selectType) && len([]rune(elastic.ReplaceYH(vk))) == 1 {
 							queryItem = strings.ReplaceAll(selectType+",title", ",", "\",\"")
@@ -348,6 +354,9 @@ func getDataExportSql(scd *SieveCondition) string {
 					// 附加词处理分词
 					if strings.Contains(vv, "+") {
 						for _, vk := range strings.Split(vv, "+") {
+							if len(vk) == 0 {
+								continue
+							}
 							//单个字 搜索范围 有全文或者附件 无标题 例如：学 虚拟机 detail  搜索的时候加上标题
 							if scd.Comeinfrom == "supersearchPage" && DetailFileORTitle(selectType) && len([]rune(elastic.ReplaceYH(vk))) == 1 {
 								queryItem = strings.ReplaceAll(selectType+",title", ",", "\",\"")
@@ -359,6 +368,10 @@ func getDataExportSql(scd *SieveCondition) string {
 						}
 					} else if strings.Contains(vv, " ") {
 						for _, vk := range strings.Split(vv, " ") {
+							if len(vk) == 0 {
+								continue
+							}
+
 							//单个字 搜索范围 有全文或者附件 无标题 例如：学 虚拟机 detail  搜索的时候加上标题
 							if scd.Comeinfrom == "supersearchPage" && DetailFileORTitle(selectType) && len([]rune(elastic.ReplaceYH(vk))) == 1 {
 								queryItem = strings.ReplaceAll(selectType+",title", ",", "\",\"")
@@ -382,6 +395,9 @@ func getDataExportSql(scd *SieveCondition) string {
 					continue
 				} // 处理每组里面的空格分词
 				for _, notKeySplit := range strings.Split(vv, " ") {
+					if len(notKeySplit) == 0 {
+						continue
+					}
 					//单个字 搜索范围 有全文或者附件 无标题 例如：学 虚拟机 detail  搜索的时候加上标题
 					if scd.Comeinfrom == "supersearchPage" && DetailFileORTitle(selectType) && len([]rune(elastic.ReplaceYH(notKeySplit))) == 1 {
 						queryItem = strings.ReplaceAll(selectType+",title", ",", "\",\"")

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

@@ -147,7 +147,7 @@
   color: #ffffff;
   background-color: #2cb7ca;
   text-align: center;
-  font-size: 18px;
+  font-size: 16px;
   border: 2px solid #2cb7ca;
   border-left: none;
   cursor: pointer;
@@ -984,7 +984,7 @@ position: absolute;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div{
-  padding-bottom: 10px;
+  /* padding-bottom: 10px; */
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div:nth-child(1){
@@ -1001,7 +1001,7 @@ position: absolute;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div:last-child{
-  padding-bottom: 8px;
+  /* padding-bottom: 8px; */
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right a {
@@ -1392,9 +1392,10 @@ position: absolute;
 }
 .search-type .search-type-dialog{
   position: absolute;
-  bottom: -62px;
+  bottom: -70px;
   left: 50%;
   width: 104px;
+  padding: 4px 0;
   border: 1px solid #2CB7CA;
   border-radius: 4px;
   transform: translateX(-50%);
@@ -1435,6 +1436,9 @@ position: absolute;
   background: rgba(0, 0, 0, 0.75)!important;
   border-radius: 4px!important;
 }
+.el-tooltip__popper .popper__arrow{
+  opacity: 0.85!important;
+}
 .tooltip-help-btn{
   width: 15px;
   height: 15px;
@@ -1670,4 +1674,7 @@ position: absolute;
 .q-mark-buyer{
   width: 16px;
   height: 16px;
+}
+.change-search-input{
+  padding: 16px 24px 10px 32px;
 }

src/web/staticres/css/dev2/superSearch-inside.css

@@ -282,7 +282,7 @@
   background-color: #2cb7ca;
   border-color: #2cb7ca;
   color: #fff;
-  padding: 7px 24px!important;
+  padding: 10px 24px!important;
   border-radius: 8px;
 }
 .publish-button .el-badge__content {

src/web/templates/pc/supsearch.html

@@ -751,7 +751,7 @@ var IframeOnClick = {
         <span class="search-tab-item badge-recommend nologin-hide" :class="{'tab-active': searchTab === 2}" @click="onSearchTab(2)">超前项目</span>
       </div>
 			<!--搜索-->
-			<div class="searchInput clearfix">
+			<div class="searchInput clearfix" :class="{'change-search-input': showAddKeyword || keywordMult}">
         <div class="searchInput-left">
           <form action="/jylab/{{.T.module}}/index.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return beforeSubmit('F')">
             <input class="searchname" autocomplete="off" type="search" id="searchinput" value="{{.T.keywords}}" name="keywords" placeholder="请输入您想要查询的招标信息，多个关键词用空格隔开" />
@@ -1426,9 +1426,9 @@ var IframeOnClick = {
         >
         </el-pagination>
         <div class="nologin-hide">
-          <div class="over-run-tips" v-if="!vipState && listState.allCount >= 500">为您展示前500条，点击<span class="highlight-text" @click="onFreeTaste">免费体验查看更多信息</span></div>
+          <div class="over-run-tips" v-if="!vipState && listState.allCount >= 500">为您展示前500条，点击<span class="highlight-text" @click="onFreeTaste">查看更多信息</span></div>
         </div>
-        <div class="over-run-tips" v-if="vipState  && listState.allCount >= 500">为您展示前5000条，可细化筛选条件查看更多信息</div>
+        <div class="over-run-tips" v-if="vipState  && listState.allCount >= 5000">为您展示前5000条，可细化筛选条件查看更多信息</div>
       </div>
 		</div>