Merge branch 'dev4.5.2' of http://127.0.0.1:8080/qmx/jy into dev4.5.2

src/jfw/front/shorturl.go

@@ -264,6 +264,31 @@ func (s *Short) Article(stype, id string) error {
 			}
 
 			s.T["obj"] = obj
+			if obj["entidlist"] != nil { //大会员中标企业跳转至画像
+				winner := util.ObjToString(obj["winner"])
+				s_winner := util.ObjToString(obj["s_winner"])
+				idObjs, _ := obj["entidlist"].([]interface{})
+				winnerId := ""
+				if names := strings.Split(s_winner, ","); len(names) > 1 {
+					index := 0
+					for i := 0; i < len(names); i++ {
+						if names[i] == winner {
+							index = i
+							break
+						}
+					}
+					if len(idObjs) > index {
+						winnerId = util.ObjToString(idObjs[index])
+					}
+				} else { //中标企业仅一个
+					if len(idObjs) > 0 {
+						winnerId = util.ObjToString(idObjs[0])
+					}
+				}
+				if winnerId != "" {
+					obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
+				}
+			}
 			if from_userid != "" && se.Decode4Hex(from_userid) != "" && from_userid != userId && util.ObjToString(obj["subtype"]) != "拟建" { //分享开打的
 				article_id := util.CommonDecodeArticle(stype, id)[0]
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, from_userid, userId)

src/jfw/front/supsearch.go

@@ -296,23 +296,32 @@ func (p *Pcsearch) PcSearchIndex() error {
 		}
 		//所有的再次分词查询 只查标题
 		if len([]rune(s_word)) > 3 && int(count) < bidsearch.SearchPageSize_PC {
-			secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-			findfields := `"title"`
-			qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
-			secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
-			if secRel != nil {
-				public.BidListConvert(industry, secRel)
-			}
-			if list != nil {
-				list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-			} else {
-				list = secRel
+			secondSearch := false
+			for _, item := range queryItems {
+				if item == "title" {
+					secondSearch = true
+					break
+				}
 			}
-			if len(*secRel) > 0 {
-				if secondKWS != "" {
-					s_word += "+" + secondKWS
+			if secondSearch {
+				secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+				findfields := `"title"`
+				qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
+				secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
+				if secRel != nil {
+					public.BidListConvert(industry, secRel)
+				}
+				if list != nil {
+					list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+				} else {
+					list = secRel
+				}
+				if len(*secRel) > 0 {
+					if secondKWS != "" {
+						s_word += "+" + secondKWS
+					}
+					secondFlag = "T"
 				}
-				secondFlag = "T"
 			}
 		}
 		//		s_word = strings.Replace(s_word, "+", " ", -1)

src/jfw/front/swordfish.go

@@ -189,24 +189,33 @@ func (m *Front) PcAjaxReq() {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && int(count) < bidsearch.SearchPageSize_PC && start == 0 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
-					secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
-					if secRel != nil {
-						public.BidListConvert(industry, secRel)
-					}
-					if list != nil {
-						list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-					} else {
-						list = secRel
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
+						}
 					}
-					if len(*secRel) > 0 {
-						if secondKWS != "" {
-							s_word += "+" + secondKWS
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(area, publishtime, subtype, "", buyerclass))
+						secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, 2*bidsearch.SearchPageSize_PC, 0, false)
+						if secRel != nil {
+							public.BidListConvert(industry, secRel)
+						}
+						if list != nil {
+							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+						} else {
+							list = secRel
+						}
+						if len(*secRel) > 0 {
+							if secondKWS != "" {
+								s_word += "+" + secondKWS
+							}
+							secondFlag = "T"
+							pcAjaxFlag = "T"
 						}
-						secondFlag = "T"
-						pcAjaxFlag = "T"
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "pc", "超级搜索", map[string]interface{}{
@@ -482,30 +491,39 @@ func (m *Front) WxsearchlistPaging() {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && listSize < bidsearch.SearchPageSize_WX && pageNum == 1 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, "", buyerclass))
-					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, filed, 0, 2*bidsearch.SearchPageSize_WX, 0, false)
-					if secRel != nil && len(*secRel) > 0 {
-						public.BidListConvert(industry, secRel)
-						for _, v := range *secRel {
-							v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
 						}
-						if list != nil {
-							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-						} else {
-							list = secRel
-						}
-						secondFlag = "T"
-						if len(*list) > bidsearch.SearchPageSize_WX && selectType == "title" {
-							secondList = (*list)[bidsearch.SearchPageSize_WX:]
-							if len(secondList) > bidsearch.SearchPageSize_WX {
-								secondList = secondList[:bidsearch.SearchPageSize_WX]
+					}
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, "", buyerclass))
+						secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, filed, 0, 2*bidsearch.SearchPageSize_WX, 0, false)
+						if secRel != nil && len(*secRel) > 0 {
+							public.BidListConvert(industry, secRel)
+							for _, v := range *secRel {
+								v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+							}
+							if list != nil {
+								list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+							} else {
+								list = secRel
+							}
+							secondFlag = "T"
+							if len(*list) > bidsearch.SearchPageSize_WX && selectType == "title" {
+								secondList = (*list)[bidsearch.SearchPageSize_WX:]
+								if len(secondList) > bidsearch.SearchPageSize_WX {
+									secondList = secondList[:bidsearch.SearchPageSize_WX]
+								}
+								*list = (*list)[:bidsearch.SearchPageSize_WX]
 							}
-							*list = (*list)[:bidsearch.SearchPageSize_WX]
+						} else {
+							secondKWS = ""
 						}
-					} else {
-						secondKWS = ""
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "wx", "超级搜索", map[string]interface{}{

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

@@ -318,30 +318,39 @@ func (m *Front) WxsearchlistPaging() {
 					listSize = len(*list)
 				}
 				if len([]rune(s_word)) > 3 && listSize < bidsearch.SearchPageSize_APP && pageNum == 1 {
-					secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
-					findfields := `"title"`
-					qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, winner, buyerclass))
-					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, 2*bidsearch.SearchPageSize_APP, 0, false)
-					if secRel != nil && len(*secRel) > 0 {
-						public.BidListConvert(industry, secRel)
-						for _, v := range *secRel {
-							v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
+					secondSearch := false
+					for _, item := range queryItems {
+						if item == "title" {
+							secondSearch = true
+							break
 						}
-						if list != nil {
-							list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
-						} else {
-							list = secRel
-						}
-						secondFlag = "T"
-						if len(*list) > bidsearch.SearchPageSize_APP && selectType == "title" {
-							secondList = (*list)[bidsearch.SearchPageSize_APP:]
-							if len(secondList) > bidsearch.SearchPageSize_APP {
-								secondList = secondList[:bidsearch.SearchPageSize_APP]
+					}
+					if secondSearch {
+						secondKWS = jy.HttpEs(s_word, "ik_smart", public.DbConf.Elasticsearch.Main.Address)
+						findfields := `"title"`
+						qstr := bidsearch.GetSearchQuery(secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, findfields, bidsearch.GetBidSearchQuery(scope, publishtime, subtype, winner, buyerclass))
+						secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, 2*bidsearch.SearchPageSize_APP, 0, false)
+						if secRel != nil && len(*secRel) > 0 {
+							public.BidListConvert(industry, secRel)
+							for _, v := range *secRel {
+								v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 							}
-							*list = (*list)[:bidsearch.SearchPageSize_APP]
+							if list != nil {
+								list = public.MapArrSortMerge(*list, *secRel, "_id", "publishtime")
+							} else {
+								list = secRel
+							}
+							secondFlag = "T"
+							if len(*list) > bidsearch.SearchPageSize_APP && selectType == "title" {
+								secondList = (*list)[bidsearch.SearchPageSize_APP:]
+								if len(secondList) > bidsearch.SearchPageSize_APP {
+									secondList = secondList[:bidsearch.SearchPageSize_APP]
+								}
+								*list = (*list)[:bidsearch.SearchPageSize_APP]
+							}
+						} else {
+							secondKWS = ""
 						}
-					} else {
-						secondKWS = ""
 					}
 				}
 				public.SaveUserSearchLog(m.Request, util.ObjToString(m.GetSession("userId")), -1, "app", "超级搜索", map[string]interface{}{

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -134,7 +134,7 @@ var SuperSearch = {
     "searchvalue": "",
     "subtype": "",
     "scope": "",
-    "publishtime": "",
+    "publishtime": "lately-30",
     "selectType": "",
     "minprice":"",
     "maxprice":"",
@@ -809,7 +809,7 @@ var SuperSearch = {
       "searchvalue": "",
       "subtype": "",
       "scope": "",
-      "publishtime": "",
+      "publishtime": "lately-30",
       "selectType": "",
       "minprice":"",
       "maxprice":"",

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

@@ -980,8 +980,11 @@ function hasNoData() {
         $(".findnull_").css("display", "none")
     }
     if(!NoDataShow) {
-        $(".findnull_").css("display", "none")
-        $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        if(!myInfo.haskey){
+            $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        } else {
+            $(".findnull_").css("display", "block").siblings('.empty').hide()
+        }
     }
 }
 

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -754,7 +754,7 @@
                             </div>
                             <div class="collection">
                                 <industry-component v-show="isActiveForTab['行业']" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
-                                <date-component :times="times" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
+                                <date-component :times="times" :rootopen="!conditionMap[1][5].disabled" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="isActiveForTab['类型']" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
                                 <cate-component v-show="!isWaitBuy && isActiveForTab['采购单位']" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>
@@ -1321,7 +1321,7 @@
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 				</span><br>
-            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
+<!--            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>-->
         </div>
         <div class="text-center" id="feedback" style="width:100%;">
             <div class="jy_sprite_main sprite_jyyjfk" style="transform: scale(1.21);margin-top: 15px;"></div>

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

@@ -321,6 +321,8 @@
 
                         </script>
                     </div>
+                    <!-- 标签列表 -->
+                    <div class="collec_list"></div>
                     <div class="tool_bottom">
                         <script>
                             var l_publishtime = {{.T.obj.l_publishtime}};

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

@@ -333,21 +333,23 @@ func GetDataExportSearchCountBySieveCondition(scd *SieveCondition, elasticAddres
 				searchTextSize = len([]rune(scd.Keyword[0].Keyword))
 			}
 			if searchTextSize > 3 && count < 50 {
-				var res *[]map[string]interface{}
-				if count > 0 {
-					res = doSearch(qstr, 0, count, "")
-				}
-				secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress)
-				scd.Keyword[0].Keyword = secondKWS
-				scd.SelectType = "title"
-				qstr = getDataExportSql(scd)
-				res2 := doSearch(qstr, 0, 100, "")
-				result := len(*delRepeatMapArr(res, res2))
-				if result > 100 {
-					result = 100
+				if strings.Index(scd.SelectType, "title") > -1 {
+					var res *[]map[string]interface{}
+					if count > 0 {
+						res = doSearch(qstr, 0, count, "")
+					}
+					secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress)
+					scd.Keyword[0].Keyword = secondKWS
+					scd.SelectType = "title"
+					qstr = getDataExportSql(scd)
+					res2 := doSearch(qstr, 0, 100, "")
+					result := len(*delRepeatMapArr(res, res2))
+					if result > 100 {
+						result = 100
+					}
+					log.Printf("GetDataExportSearchCountUseId-%s-count:%d-分词-sql:%s\n", scd.Id, result, qstr)
+					return result
 				}
-				log.Printf("GetDataExportSearchCountUseId-%s-count:%d-分词-sql:%s\n", scd.Id, result, qstr)
-				return result
 			}
 			return
 		}
@@ -479,15 +481,17 @@ func GetDataExportSearchResult(bid mg.MongodbSim, elasticAddress string, scd *Si
 				searchTextSize = len([]rune(scd.Keyword[0].Keyword))
 			}
 			if searchTextSize > 3 && num < 50 {
-				secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress)
-				scd.Keyword[0].Keyword = secondKWS
-				scd.SelectType = "title"
-				qstr = getDataExportSql(scd)
-				log.Printf("GetDataExportSearchResult-%s-分词查询-sql:%s\n", scd.Id, qstr)
-				res2 := doSearch(qstr, 0, 100, "")
-				res = *delRepeatMapArr(&res, res2)
-				if len(res) > 100 {
-					res = res[:100]
+				if strings.Index(scd.SelectType, "title") > -1 {
+					secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", elasticAddress)
+					scd.Keyword[0].Keyword = secondKWS
+					scd.SelectType = "title"
+					qstr = getDataExportSql(scd)
+					log.Printf("GetDataExportSearchResult-%s-分词查询-sql:%s\n", scd.Id, qstr)
+					res2 := doSearch(qstr, 0, 100, "")
+					res = *delRepeatMapArr(&res, res2)
+					if len(res) > 100 {
+						res = res[:100]
+					}
 				}
 			}
 		}

src/jfw/modules/common/src/qfw/util/jy/subvipPortrait.go

@@ -43,7 +43,6 @@ func (this *BigVipBaseMsg) isVisitEnt(mysql *mysql.Mysql, entId string) bool {
 		PortraitRecordTable), this.Uid, entId, now.Year(), int(now.Month())) == 0 {
 		return false
 	}
-	redis.Put(PowerCacheDb, fmt.Sprintf(UsePortraitVisited, this.Uid, int(now.Month()), entId), 1, 60*60*5)
 	return true
 }
 

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -836,7 +836,7 @@ var vMainSearchComponent = new Vue({
       conditionStrMap: {
         subtype: '',
         scope: '',
-        publishtime: '',
+        publishtime: 'lately-30',
         selectType: '',
         minprice: '',
         maxprice: '',

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

@@ -240,7 +240,8 @@ var vm = new Vue({
                         this.initSelectTagList()
                         this.resetListState()
                     } else {
-                        this.showToast(res.error_msg)
+                        // this.showToast(res.error_msg)
+                        this.showToast('标签已经存在，无需添加')
                     }
                 }.bind(this)
             })

src/web/staticres/js/pc_detail_tags.js

@@ -295,7 +295,8 @@ function addTagsAjax (name) {
         }
         getUserTags()
       } else {
-        toastFn(r.error_msg, 1000)
+        // toastFn(r.error_msg, 1000)
+        toastFn('标签已经存在，无需添加', 1000)
       }
     }
   })

src/web/staticres/js/wxSupersearch.js

@@ -113,7 +113,7 @@ var SuperSearch = {
     "searchvalue": "",
     "subtype": "",
     "scope": "",
-    "publishtime": "",
+    "publishtime": "lately-30",
     "selectType": "",
     "minprice":"",
     "maxprice":"",
@@ -782,7 +782,7 @@ var SuperSearch = {
       "searchvalue": "",
       "subtype": "",
       "scope": "",
-      "publishtime": "",
+      "publishtime": "lately-30",
       "selectType": "",
       "minprice":"",
       "maxprice":"",

src/web/templates/pc/entsearchindex.html

@@ -105,7 +105,7 @@
                                 trigger="hover">
                                 <div class="popover-content" v-if="entUseInfo.used < entUseInfo.total" key="popover-content">
                                     <p>超级订阅用户，每购买一个省，每月可看50个画像。</p>
-                                    <p>您当前订阅了${getVipSubText}，如需查看更多，请前往订阅更多省份。<span class="popover-link" @click="openVipPage('popover-link')">前往</span></p>
+                                    <p v-show="false">您当前订阅了${getVipSubText}，如需查看更多，请前往订阅更多省份。<span class="popover-link" @click="openVipPage('popover-link')">前往</span></p>
                                 </div>
                                 <div class="popover-content" v-else key="popover-content">
                                     <p>超级订阅用户，每购买一个省，每月可看50个画像。</p>

src/web/templates/pc/index.html

@@ -122,7 +122,8 @@
 			<div class="search">
 				<form method="post" action="/jylab/supsearch/index.html" id="zbIndex">
 					<input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息" id="keywords" value="" />
-					<input type="hidden" name="searchvalue">
+          <input type="hidden" name="searchvalue">
+          <input type="hidden" name="publishtime" value="lately-30">
 					<input class="btn" type="button" onclick="zbSeatch('zbIndex')" />
 				</form>
         <div class="index_search_thikn">

src/web/templates/pc/supsearch.html

@@ -1164,7 +1164,7 @@ $(function(){
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 					</span><br>
-					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>
+<!--					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>-->
 				</div>
 			</div>
 			<div class="working" style="display: none;">
@@ -1686,7 +1686,8 @@ function addTagsAjax (name) {
         }
         getUserTags()
       } else {
-        toastFn(r.error_msg, 1000)
+        // toastFn(r.error_msg, 1000)
+        toastFn('标签已经存在，无需添加', 1000)
       }
     }
   })

src/web/templates/weixin/search/tabSearch.html

@@ -618,9 +618,13 @@
                                         <p>开通超级订阅，全国企业随手查，<br>搜索信息更高效！</p>
                                     </div>
                                     <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="!isWaitBuy && conditionMap[activeTabIndex]">
-                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked}">
-                                            <div>@@item.title@@</div>
-                                            <i v-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
+                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked, 'disabled': item.disabled}">
+                                            <div class="row-item-group">
+                                                <span>@@item.title@@</span>
+                                                <div v-if="item.tag" class="tip-tag">@@item.tag@@</div>
+                                            </div>
+                                            <div class="disabled-tag" v-if="item.disabled === true">开通</div>
+                                            <i v-else-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
                                             <div class="more-icon-box" v-else>
                                                 <i  class="j-icon base-icon icon-tick-circle"></i>
                                                 <i  class="j-icon base-icon icon-tick-circle-fill"></i>
@@ -758,7 +762,7 @@
                             </div>
                             <div class="collection">
                                 <industry-component v-show="isActiveForTab['行业']" :key="'industry' + industryComponentKey" ref="industryComponent"></industry-component>
-                                <date-component :times="times" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
+                                <date-component :times="times" :rootopen="!conditionMap[1][5].disabled" :selectdate="selectDate" v-show="isActiveForTab['时间']" :key="'date' + dateComponentKey" ref="dateComponent"></date-component>
                                 <notice-component v-show="isActiveForTab['类型']" :key="'notice' + noticeComponentKey" ref="noticeComponent"></notice-component>
                                 <cate-component v-show="!isWaitBuy && isActiveForTab['采购单位']" :key="'cate' + cateComponentKey" ref="cateComponent"></cate-component>
                             </div>

src/web/templates/weixin/wxsearchlist.html

@@ -674,7 +674,7 @@ body{
 <div>
 	<div class="selLable" id="selLable" >
 		<div class="com-title"><!--height:30px; margin-top:20px;-->
-			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>
+<!--			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>-->
 		</div>
 	</div>
 	<div class="wxsearch">