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

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>

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/templates/weixin/search/tabSearch.html

@@ -762,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>