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

src/jfw/public/historypush.go

@@ -309,8 +309,6 @@ func (h *historyPush) halfYearAgoDatas(userId string, firstPushTime int64) (push
 func (h *historyPush) getJyPushs(datas []map[string]interface{}) (pushCas []*jy.PushCa) {
 	pushCas = []*jy.PushCa{}
 	for _, v := range datas {
-		keys := v["matchkeys"].(string)
-		//		for id_k, id_v := range strings.Split(util.ObjToString(v["pushinfo"]), ",") {
 		pushCas = append(pushCas, &jy.PushCa{
 			Date:       util.Int64All(v["date"]),
 			InfoId:     util.ObjToString(v["infoid"]),
@@ -319,14 +317,10 @@ func (h *historyPush) getJyPushs(datas []map[string]interface{}) (pushCas []*jy.
 			Area:       util.ObjToString(v["area"]),
 			City:       util.ObjToString(v["city"]),
 			Buyerclass: util.ObjToString(v["buyerclass"]),
-			Keys:       strings.Split(keys, " "),
+			Keys:       strings.Split(util.ObjToString(v["matchkeys"]), " "),
 			Type:       util.IntAll(v["type"]),
 			Isvip:      util.IntAll(v["isvip"]),
 		})
-		//		if len(pushCas) == 4000 {
-		//			return
-		//		}
-		//		}
 	}
 	return
 }

src/web/staticres/js/wxSupersearch.js

@@ -20,6 +20,7 @@ var SuperSearch = {
 	industry: "",
 	sortArray: "",
 	limitFlag: false,
+	localFalg:false,
 	reqParam: {
 		"searchvalue": "",
 		"subtype": "",
@@ -2045,9 +2046,12 @@ var SuperSearch = {
 			}
 		}else{
 			if(!SuperSearch.isVip&&!SuperSearch.hasSubscribe&&SuperSearch.locationCount==0){
-				 setTimeout(function(){
+				 var locatInterval = setInterval(function(){
+					if(SuperSearch.localFalg){
+						clearInterval(locatInterval);
                         SuperSearch.locationHomeData();
-                },2000)
+					}
+                },500)
 				return
 			}
 		}
@@ -2069,10 +2073,12 @@ var SuperSearch = {
 			if(SuperSearch.isVip){
 				window.location.href="/front/vipsubscribe/toSetPage"
 			}else{
+				sessionStorage.removeItem("keysetindexToHistory");
 				window.location.href="/swordfish/historypush"
 			}
 		})
 		$(".tips_all .GetAll").click(function(){
+			sessionStorage.removeItem("keysetindexToHistory");
 			window.location.href="/swordfish/historypush"
 		})
 		$(".home_todetails").click(function(){
@@ -2092,6 +2098,7 @@ var SuperSearch = {
 					}
 				}else{
 					$(".home_1").show();
+					$(".home_toset a").text("去订阅");
 					$(".home_toset").show();
 				}
 			}else{

src/web/staticres/wxswordfish/share.js

@@ -65,6 +65,10 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 		    });
 		}
 		wx.ready(function () {
+			//搜索页 定位
+			if(window.location.pathname.indexOf("/jylab/mainSearch")>-1){
+				SuperSearch.localFalg = true;
+			}
 			if(isentry == 1){//信息三级页
 				desc = titleTemp;
 				otherDesc = otherTitleTemp;

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

@@ -20,10 +20,10 @@
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
 <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
-<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}111"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}9"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}522"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}9"></script>
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -1102,6 +1102,7 @@
 	    });
 	    //剑鱼标讯
 	    $(".tab_container a:eq(2)").on('click', function () {
+			sessionStorage.removeItem("keysetindexToHistory");
 			window.location.href='/swordfish/historypush';
 	    });
 	    //APP下载跳转到关于剑鱼标讯