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

src/jfw/modules/subscribepay/src/service/index_p1.go

@@ -104,7 +104,7 @@ func (this *IndexSearch) GetIndexMessage() {
 		}
 		log.Println("areaCity:", areaCity)
 		var list *[]map[string]interface{}
-		if (nReq == 2 && areaCity != "") || len(_history) > 0 { //根据定位请求数据
+		if nReq == 2 || len(_history) > 0 { //根据定位请求数据
 			doSearchStr := getSimpleSql(areaCity, _history)
 			list = elastic.Get(search_index, search_type, doSearchStr)
 			util.BidListConvert("", list)

src/web/staticres/js/wxSupersearch.js

@@ -1958,6 +1958,7 @@ var SuperSearch = {
 		});
 	},
 	locationHomeData:function(){
+		SuperSearch.locationCount=1;//定位只查一次
 		wx.getLocation({
 		  	type: 'wgs84', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
 		  	success: function (res) {
@@ -1969,10 +1970,17 @@ var SuperSearch = {
                    geoc.getLocation(point, function(rs) {
                        	var addComp = rs.addressComponents;
                        	//alert('您现在所处位置:'+addComp.province + ", "+addComp.city + ", "+addComp.district + ", "+addComp.street + ", "+addComp.streetNumber);
-						SuperSearch.locationCount=1;//定位只查一次
 						SuperSearch.getHomeList(addComp.city,2);
                    });
-		  }
+		  	},
+			cancel:function(r){
+				//拒绝定位 地区参数为-：空
+				SuperSearch.getHomeList("",2);
+			},
+			fail:function(){
+				//定位失败 地区参数为-：空
+				SuperSearch.getHomeList("",2);
+			}
 		});
 	},
 	homePageShow:function(r){
@@ -2035,8 +2043,9 @@ var SuperSearch = {
 			}
 		}else{
 			if(!SuperSearch.isVip&&!SuperSearch.hasSubscribe&&SuperSearch.locationCount==0){
-				console.log("+++++++++++=")
-				SuperSearch.locationHomeData();
+				 setTimeout(function(){
+                        SuperSearch.locationHomeData();
+                },2000)
 				return
 			}
 		}

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

@@ -353,7 +353,7 @@
             <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
             <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
             <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
-            <p class="tips_text home_4" style="display: none;">本次推送信息已达上限，开通VIP订阅，获取更多订阅信息。</p>
+            <p class="tips_text home_4" style="display: none;">开通VIP订阅，获取更多订阅信息。</p>
             <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
             <div class="tips_btn home_toset" style="display: none;">
                 <a class="home_toset" >去设置</a>