Commit 6271a5dd72d2f54f7d95be1f85c643b57b82e82a
1 parent
0c718bcb
阶梯购再来一单优化
Showing
1 changed file
with
15 additions
and
15 deletions
pages/user/order_list/order_list.js
| @@ -1230,19 +1230,19 @@ Page({ | @@ -1230,19 +1230,19 @@ Page({ | ||
| 1230 | }) | 1230 | }) |
| 1231 | 1231 | ||
| 1232 | //调用接口判断订单优惠， | 1232 | //调用接口判断订单优惠， |
| 1233 | - const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) | ||
| 1234 | - if (res.data.code == 0 && res.data.data) { | ||
| 1235 | - var r_data = res.data.data; | ||
| 1236 | - if (r_data.ladderLists) { | ||
| 1237 | - var act_id = r_data.ladderLists[0].form_id; | ||
| 1238 | - //-- 判断会员能不能参与阶梯促销 -- | ||
| 1239 | - const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) | ||
| 1240 | - if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { | ||
| 1241 | - b_item.prom_type = 10; | ||
| 1242 | - b_item.prom_id = data.data.data.id; | ||
| 1243 | - } | ||
| 1244 | - } | ||
| 1245 | - } | 1233 | + // const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {}) |
| 1234 | + // if (res.data.code == 0 && res.data.data) { | ||
| 1235 | + // var r_data = res.data.data; | ||
| 1236 | + // if (r_data.ladderLists) { | ||
| 1237 | + // var act_id = r_data.ladderLists[0].form_id; | ||
| 1238 | + // //-- 判断会员能不能参与阶梯促销 -- | ||
| 1239 | + // const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}) | ||
| 1240 | + // if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) { | ||
| 1241 | + // b_item.prom_type = 10; | ||
| 1242 | + // b_item.prom_id = data.data.data.id; | ||
| 1243 | + // } | ||
| 1244 | + // } | ||
| 1245 | + // } | ||
| 1246 | if(!good){ | 1246 | if(!good){ |
| 1247 | err_text+= g_item['goods_name']+"未找到商品\n"; | 1247 | err_text+= g_item['goods_name']+"未找到商品\n"; |
| 1248 | continue; | 1248 | continue; |
| @@ -1357,7 +1357,6 @@ Page({ | @@ -1357,7 +1357,6 @@ Page({ | ||
| 1357 | }) | 1357 | }) |
| 1358 | break; | 1358 | break; |
| 1359 | case 10: | 1359 | case 10: |
| 1360 | - | ||
| 1361 | let user_id = getApp().globalData.userInfo.user_id; | 1360 | let user_id = getApp().globalData.userInfo.user_id; |
| 1362 | var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; | 1361 | var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; |
| 1363 | await getApp().request.promiseGet(url, {}).then(res => { | 1362 | await getApp().request.promiseGet(url, {}).then(res => { |
| @@ -1707,7 +1706,8 @@ Page({ | @@ -1707,7 +1706,8 @@ Page({ | ||
| 1707 | store_id: os.stoid, | 1706 | store_id: os.stoid, |
| 1708 | user_id: oo.user_id, | 1707 | user_id: oo.user_id, |
| 1709 | goods_id: g_item.goods_id, | 1708 | goods_id: g_item.goods_id, |
| 1710 | - pick_id: g_item.pickup_id, | 1709 | + pick_id: g_item.pickup_id, |
| 1710 | + state:0, | ||
| 1711 | }, | 1711 | }, |
| 1712 | }).then(res=>{ | 1712 | }).then(res=>{ |
| 1713 | //-------如果购物车中有相关的数据------- | 1713 | //-------如果购物车中有相关的数据------- |