Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 4a428c7e 921ab91a
Showing 1 changed file with 4 additions and 6 deletions
pages/goods/search/search.js
@@ -146,7 +146,6 @@ Page({
                 for(let i in res.data.data.pageData){
                     let item=res.data.data.pageData[i];
                     item.original_img = th.data.url + item.original_img;
-
                     var url="/api/weshop/activitylist/getGoodActInfo";
                     var req_data={
                         store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1
@@ -184,7 +183,7 @@ Page({
                             var rd= {
                                 store_id: oo.stoid,
                                 presell_id: presell_id,
-                                goods_id: val.goods_id
+                                goods_id: item.goods_id
                             }
                             //------获取预售从表----------
                             await getApp().request.promiseGet(url1, {
@@ -220,14 +219,13 @@ Page({
                     }
                     th.data.requestData.push(item);
                     e.setData({requestData: e.data.requestData});
-                    e.closeSearchModal();
                 }
             }
-
+            e.closeSearchModal();
         })
-
     },
     onReachBottom: function() {
+        this.data.currentPage++
         this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl);
     },
     openFilterModal: function() {
@@ -289,7 +287,7 @@ Page({
     search: function(t) {
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
         this.data.key_str=t;
-				this.historyRecord();
+		this.historyRecord();
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },