diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index a30d88b..81a9eea 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1137,10 +1137,10 @@ Page({ map.set(item.prom_id+"",ob); } } - if(item.is_gift==1){ var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; - getApp().request.delete(url, {}); + //getApp().request.delete(url, {}); + await getApp().request.promiseDelete(url, {}) // 要用同步让赠品删除 list.goods.splice(i,1); } } diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index e673f98..4f5b5f6 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -747,7 +747,7 @@ Page({ cart_item.shipping_price = 0; //--有不包邮区域,且不免运费,全场的计算-- - if(no_ex_id && freight_free>0 && o_price>freight_free && cart_item.exp_type == 0 && (by_qc.region_list || by_qc.goods_list) ){ + if(no_ex_id && freight_free>0 && o_price>=freight_free && cart_item.exp_type == 0 && (by_qc.region_list || by_qc.goods_list) ){ //如果有设置不包邮区域的时候 if(by_qc.region_list!="" && by_qc.region_list!=null && by_qc.region_list!=undefined ){ if(th.check_by_area(by_qc.region_list)){ diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index bd4bd2f..997e781 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -47,14 +47,13 @@ Page({ is_pl_time:0, requestData:null, //风格三的商品数据列表 分页 stylePage:1, //商品列表分页标识 - //风格三使用 url: t.globalData.setting.imghost, currentPage: 1, requestData: null, allData: null, openFilterModal: !1, - baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id=1&is_recommend=1", + baseUrl: "api/weshop/goods/page?1=1&orderField=goods_id&orderType=desc&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1", requestUrl: "", tabname: "goods_id", //排序的字段 adname: "desc", //升降的字段 @@ -643,7 +642,7 @@ Page({ var that = this; that.data.requestUrl = t; e.get("/api/weshop/goods/page?1=1", { - data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: 1, is_recommend: 1 }, + data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 }, success: function (data) { console.log(data.data.data.pageData) that.setData({ @@ -705,7 +704,7 @@ Page({ console.log("page:=" + page) var s = this e.get("/api/weshop/goods/page?1=1", { - data: { page: page, cat_id: cid, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: 1, is_recommend: 1 }, + data: { page: page, cat_id: cid, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 }, success: function (e) { console.log(e.data.data.pageData) s.setData({ @@ -767,7 +766,7 @@ Page({ requestData: [] }); s.setData({ - timer: setInterval(function () { + timer:setInterval(function () { if (countDownNum == 0) { clearInterval(s.data.timer); //关闭定时器之后,可作其他处理 diff --git a/utils/request.js b/utils/request.js index c87ca77..c7bd5b6 100644 --- a/utils/request.js +++ b/utils/request.js @@ -206,6 +206,27 @@ module.exports = { }) }) }, + + //---promise的使用delete---- + promiseDelete:function(url,data){ + var th=this; + if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url; + return new Promise((resolve, reject) => { + data.isShowLoading && th.showLoading(); + wx.request({ + url, + method: 'DELETE', + header: {"content-type": "application/x-www-form-urlencoded" }, + data:data.data, + success(res) { + data.isShowLoading && th.hideLoading(); + resolve(res); + }, + fail(err) { data.isShowLoading && th.hideLoading(); reject(err); } + }) + }) + }, + //--------具有时间限制的读取接口---------- time_limit_get(time,url,data){ var req=this.get(url,data);