燕云提的qa提的俩个问题

yvan.ni
1 parent ca8977ef
Showing 3 changed files with 24 additions and 3 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
utils/request.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);
            }
         }
@@ -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)){
@@ -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);