diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 98033f9..3623e3c 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1230,19 +1230,19 @@ Page({ }) //调用接口判断订单优惠, - const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) - if (res.data.code == 0 && res.data.data) { - var r_data = res.data.data; - if (r_data.ladderLists) { - var act_id = r_data.ladderLists[0].form_id; - //-- 判断会员能不能参与阶梯促销 -- - const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) - if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { - b_item.prom_type = 10; - b_item.prom_id = data.data.data.id; - } - } - } + // const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) + // if (res.data.code == 0 && res.data.data) { + // var r_data = res.data.data; + // if (r_data.ladderLists) { + // var act_id = r_data.ladderLists[0].form_id; + // //-- 判断会员能不能参与阶梯促销 -- + // const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) + // if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { + // b_item.prom_type = 10; + // b_item.prom_id = data.data.data.id; + // } + // } + // } if(!good){ err_text+= g_item['goods_name']+"未找到商品\n"; continue; @@ -1357,7 +1357,6 @@ Page({ }) break; case 10: - let user_id = getApp().globalData.userInfo.user_id; var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; await getApp().request.promiseGet(url, {}).then(res => { @@ -1707,7 +1706,8 @@ Page({ store_id: os.stoid, user_id: oo.user_id, goods_id: g_item.goods_id, - pick_id: g_item.pickup_id, + pick_id: g_item.pickup_id, + state:0, }, }).then(res=>{ //-------如果购物车中有相关的数据-------