Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/jyutil/jyutil.go

@@ -145,13 +145,12 @@ func Getopenid(code string) (openid string) {
 	defer util.Catch()
 	recturl := fmt.Sprintf(config.Wxoauthinfo, code)
 	resp, err := http.Get(recturl)
-	defer resp.Body.Close()
 	if err != nil {
 		log.Println(err.Error())
 		return
 	}
+	defer resp.Body.Close()
 	bs, _ := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
 	data := map[string]interface{}{}
 	json.Unmarshal(bs, &data)
 	openid, _ = data["openid"].(string)

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

@@ -787,7 +787,7 @@ var SuperSearch = {
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 	
 		//全文or标题
-		if($("#supersearchPage #search_title").hasClass("on")){
+		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 			SuperSearch.reqParam.selectType="title";
 		}else{
 			SuperSearch.reqParam.selectType="all";

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

@@ -31,12 +31,11 @@ if(getUrlParam("f")=="push"){
 	}
 }
 $(function(){
-  
 	if(sessionStorage.getItem(sessionStorage.userId+"_searchTime")){
 		$("#kongH").addClass("kongH");
 		document.getElementsByClassName("icon_time")[0].style.display="block";
 		document.getElementsByClassName("time_choice")[0].style.display="none";
-    $(".showType_bg").hide();
+    	$(".showType_bg").hide();
 		initMobiscroll_()
 	}else{
     $(".showType_bg").show();
@@ -115,9 +114,9 @@ function initpage(){
 			hasNoDataByTime();
 			return
 		}
-    if(sessionStorage.closeAdvert=="true"){
-      closeAdvert=true;
-    }
+	    if(sessionStorage.closeAdvert=="true"){
+	      closeAdvert=true;
+	    }
 		pageIndex = sessionStorage.historypushPageIndexCache;
 		hasNextPage = sessionStorage.historypushHasNextPage=="true"?true:false;
 		scrollTop = sessionStorage.historypushScrollTop;
@@ -125,7 +124,7 @@ function initpage(){
 			words = sessionStorage.historypushWords.split(",");
 		}
 		dataCache = JSON.parse(sessionStorage.historypushDataCache);
-   	$("#list>*").remove();
+   		$("#list>*").remove();
 		$(".showType").css("display","flex");
 		structureHtml(dataCache,true);
 		//appendList($(listCache),$(tableCache));
@@ -191,6 +190,7 @@ function initpage(){
 			t_time_str=t_date.Format("yyyy年MM月dd日");
 			$("#starttime_").attr("date-value",ttt);
 			$("#starttime_").val(t_time_str);
+			isRightShow(t_time_str);
 			
 			document.getElementsByClassName("icon_time")[0].style.display="block";
 			if($(".icon_time").css("display")=='none') {
@@ -200,7 +200,7 @@ function initpage(){
 				document.getElementsByClassName("time_choice")[0].style.display="none";
 			}
 			$(".showType").css("display","flex");
-			$(".showType_bg").show();
+			$(".showType_bg").hide();
 		}
 		//$("#list").css("visibility","hidden");
 		dataCache = dataCache.concat(firstPage);

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

@@ -14,7 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}2211"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}22111"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->

src/web/staticres/js/wxSupersearch.js

@@ -753,7 +753,7 @@ var SuperSearch = {
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 	
 		//全文or标题
-		if($("#supersearchPage #search_title").hasClass("on")){
+		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 			SuperSearch.reqParam.selectType="title";
 		}else{
 			SuperSearch.reqParam.selectType="all";