search

@@ -66,7 +66,9 @@ Page({
   onUnload: function () {
 
   },
+  city:null,
   getHistory(){
+    this.city=util.cache('CACHE_LOCALTION_KEY')
     App.Customer.GetHistorySearch().then(res=>{
       let mks=[]
       res.data.forEach(h=>{
@@ -240,14 +242,7 @@ Page({
           },'./detail')
         })
       }else{
-        //let pages = getCurrentPages();
-        //let p = pages[pages.length - 2];
-        //p.setSuggestion(item)
         this.setSuggestion({fun:'setSuggestion',suggestion:item})
-        this.setData({
-          backfill: item.title
-        });
-        //wx.navigateBack();
       }
     }else{
       wx.navigateTo({
@@ -314,17 +309,40 @@ Page({
       this.selectComponent('#as').show(e.detail.seller);
     }
   },
-  setSuggestion(data){//只通知前页变更数据
-    /*
-    let pages = getCurrentPages();
-    let p = pages[pages.length - 2];
-    if(p.route=='pages/reserve/index'){
-      PubSub.emit('searchParam',data)
-    }else{
-      PubSub.emit('searchParamList',data)
-    }
-    */
+  async hasInCity(suggestion){
+    return new Promise((success,fail)=>{
+      if(this.city){
+        qqmapsdk.reverseGeocoder({
+          location: {
+            latitude: suggestion.latitude,
+            longitude: suggestion.longitude
+          },
+          success:(res)=>{
+            if(res.status!=0) return success({flag:true,'msg':'1001'})
+            console.log('qqmapsdk.reverseGeocoder',res.result.address_component.city,this.city.city.name)
+            if(res.result.address_component.city==this.city.city.name){
+              return success({flag:true,msg:''})
+            }
+            success({flag:false,msg:''})
+          },
+          fail:()=>{
+            success({flag:true,msg:'1002'})
+          },
+        })
+      }else{
+        success({flag:true,msg:'1003'})
+      }
+    })
+  },
+  async setSuggestion(data){//只通知前页变更数据
     let suggestion=data.suggestion
+    //地址解析
+    wx.showLoading()
+    let hasInCity=await this.hasInCity(suggestion)
+    console.log('hasInCity',hasInCity)
+    if(!hasInCity.flag){
+      return util.toast('该位置不在当前城市，建议换个位置','none');
+    }
     wx.navigateTo({
       url:util.http_build_query({
         hasSuggestion:1,

@@ -738,6 +738,12 @@
           "pathName": "pages/taocan/orderHis",
           "query": "id=0000000011",
           "scene": null
+        },
+        {
+          "name": "pages/reserve/searchKeyword",
+          "pathName": "pages/reserve/searchKeyword",
+          "query": "lat=39.65157&lng=118.15044&keyword=1&multiIndex=0&city={\"code\":\"130200\",\"pid\":\"130000\",\"name\":\"唐山市\",\"status\":\"1\",\"last_date\":\"1598949575\"}&hows={\"params\":{\"pnum\":{\"index\":5,\"val\":6,\"type\":\"pnum\"},\"date\":{\"index\":1,\"val\":1607399207,\"type\":\"date\"},\"dur\":{\"index\":2,\"val\":3,\"type\":\"dur\"}},\"paramObj\":{\"when_date\":\"2020-12-08\",\"several\":6,\"daily\":3},\"paramStr\":\"12月08日（明天） 晚餐 6位\"}&filter={\"consumeStr\":\"¥101-220\",\"min\":\"101\",\"max\":\"220\",\"active\":\"101,220\"}",
+          "scene": null
         }
       ]
     }