Commit 32e4e09c9ce286deb7d15278fc3eeb9a4af89035
1 parent
168c1a57
fix立即购买再一单多商品问题
Showing
2 changed files
with
29 additions
and
19 deletions
packageA/pages/details_serviceCard/details_serviceCard.js
@@ -236,7 +236,7 @@ Page({ | @@ -236,7 +236,7 @@ Page({ | ||
236 | // var action= t.currentTarget.dataset.action; | 236 | // var action= t.currentTarget.dataset.action; |
237 | var action = 'add'; // | 237 | var action = 'add'; // |
238 | // if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; | 238 | // if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; |
239 | - | 239 | + var user_id = getApp().globalData.user_id; |
240 | th.setData({ | 240 | th.setData({ |
241 | open_ind_store: ind | 241 | open_ind_store: ind |
242 | }); | 242 | }); |
@@ -261,6 +261,13 @@ Page({ | @@ -261,6 +261,13 @@ Page({ | ||
261 | // th.buyNow(newd); | 261 | // th.buyNow(newd); |
262 | } else { | 262 | } else { |
263 | 263 | ||
264 | + var len = details.list.length; | ||
265 | + | ||
266 | + for (let i = 0; i < len; i++) { | ||
267 | + | ||
268 | + | ||
269 | + | ||
270 | + | ||
264 | var newd = { | 271 | var newd = { |
265 | // service_id: th.data.data.id, | 272 | // service_id: th.data.data.id, |
266 | // service_sn:th.data.data.service_sn, | 273 | // service_sn:th.data.data.service_sn, |
@@ -271,14 +278,14 @@ Page({ | @@ -271,14 +278,14 @@ Page({ | ||
271 | // store_id:os.stoid, | 278 | // store_id:os.stoid, |
272 | // money:th.data.data.shop_price, | 279 | // money:th.data.data.shop_price, |
273 | 280 | ||
274 | - service_id: details.list[0].card_id, | ||
275 | - service_sn: details.list[0].service_sn, | ||
276 | - service_name: details.list[0].service_name, | ||
277 | - goods_num: details.list[0].qty, | ||
278 | - pick_id: details.list[0].pickup_id, | ||
279 | - user_id: this.data.userInfo.user_id, | 281 | + service_id: details.list[i].card_id, |
282 | + service_sn: details.list[i].service_sn, | ||
283 | + service_name: details.list[i].service_name, | ||
284 | + goods_num: details.list[i].qty, | ||
285 | + pick_id: details.list[i].pickup_id, | ||
286 | + user_id: user_id, | ||
280 | store_id: app.globalData.setting.stoid, | 287 | store_id: app.globalData.setting.stoid, |
281 | - money: details.list[0].price, | 288 | + money: details.list[i].price, |
282 | }; | 289 | }; |
283 | if (getApp().globalData.guide_id) { | 290 | if (getApp().globalData.guide_id) { |
284 | newd['guide_id'] = getApp().globalData.guide_id; | 291 | newd['guide_id'] = getApp().globalData.guide_id; |
@@ -286,14 +293,14 @@ Page({ | @@ -286,14 +293,14 @@ Page({ | ||
286 | }; | 293 | }; |
287 | // 秒杀:单独购买的情况下,加入购物车显示的是零售价,否则显示秒杀活动价 | 294 | // 秒杀:单独购买的情况下,加入购物车显示的是零售价,否则显示秒杀活动价 |
288 | if(details.list[0].prom_type == 1) { | 295 | if(details.list[0].prom_type == 1) { |
289 | - newd['prom_type'] = details.list[0].prom_type; | ||
290 | - newd['prom_id'] = details.list[0].prom_id; | 296 | + newd['prom_type'] = details.list[i].prom_type; |
297 | + newd['prom_id'] = details.list[i].prom_id; | ||
291 | }; | 298 | }; |
292 | 299 | ||
293 | - var prom_id = details.list[0].prom_id > 0 ? details.list[0].prom_id : 0; | ||
294 | - var card_id = details.list[0].card_id; | ||
295 | - var prom_type = details.list[0].prom_type > 0 ? details.list[0].prom_type : 0; | ||
296 | - var is_pd_normal = details.list[0].is_pd_normal; | 300 | + var prom_id = details.list[i].prom_id > 0 ? details.list[i].prom_id : 0; |
301 | + var card_id = details.list[i].card_id; | ||
302 | + var prom_type = details.list[i].prom_type > 0 ? details.list[i].prom_type : 0; | ||
303 | + var is_pd_normal = details.list[i].is_pd_normal; | ||
297 | // 库存 | 304 | // 库存 |
298 | var redisNums = 0; | 305 | var redisNums = 0; |
299 | // 限购数 | 306 | // 限购数 |
@@ -318,7 +325,7 @@ Page({ | @@ -318,7 +325,7 @@ Page({ | ||
318 | }); | 325 | }); |
319 | 326 | ||
320 | // 获取限购数 | 327 | // 获取限购数 |
321 | - var user_id = getApp().globalData.user_id; | 328 | + |
322 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {}).then(res => { | 329 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {}).then(res => { |
323 | if (res.data.code == 0) { | 330 | if (res.data.code == 0) { |
324 | limitNum = res.data.data.buy_limit; | 331 | limitNum = res.data.data.buy_limit; |
@@ -340,7 +347,7 @@ Page({ | @@ -340,7 +347,7 @@ Page({ | ||
340 | app.request.get("/api/weshop/cartService/page", { | 347 | app.request.get("/api/weshop/cartService/page", { |
341 | data: { | 348 | data: { |
342 | store_id: app.globalData.setting.stoid, | 349 | store_id: app.globalData.setting.stoid, |
343 | - user_id: this.data.userInfo.user_id, | 350 | + user_id: user_id, |
344 | service_id: details.list[0].card_id, | 351 | service_id: details.list[0].card_id, |
345 | pick_id: details.list[0].pickup_id, | 352 | pick_id: details.list[0].pickup_id, |
346 | }, | 353 | }, |
@@ -348,7 +355,7 @@ Page({ | @@ -348,7 +355,7 @@ Page({ | ||
348 | //-------如果购物车中有相关的数据--------- | 355 | //-------如果购物车中有相关的数据--------- |
349 | if (re.data.data.total > 0) { | 356 | if (re.data.data.total > 0) { |
350 | var item = re.data.data.pageData[0]; | 357 | var item = re.data.data.pageData[0]; |
351 | - var totalNum = details.list[0].qty + item.goods_num; | 358 | + var totalNum = details.list[i].qty + item.goods_num; |
352 | 359 | ||
353 | if (prom_type == 1 && !is_pd_normal) { | 360 | if (prom_type == 1 && !is_pd_normal) { |
354 | // 秒杀购物车购买 修正数量 | 361 | // 秒杀购物车购买 修正数量 |
@@ -369,7 +376,7 @@ Page({ | @@ -369,7 +376,7 @@ Page({ | ||
369 | var updata = { | 376 | var updata = { |
370 | id: item.id, | 377 | id: item.id, |
371 | goods_num: totalNum, | 378 | goods_num: totalNum, |
372 | - money: details.list[0].price, | 379 | + money: details.list[i].price, |
373 | store_id: app.globalData.setting.stoid, | 380 | store_id: app.globalData.setting.stoid, |
374 | }; | 381 | }; |
375 | 382 | ||
@@ -411,6 +418,9 @@ Page({ | @@ -411,6 +418,9 @@ Page({ | ||
411 | }); | 418 | }); |
412 | 419 | ||
413 | } | 420 | } |
421 | + | ||
422 | + | ||
423 | + } | ||
414 | }, | 424 | }, |
415 | 425 | ||
416 | 426 |
packageA/pages/goodsInfo/goodsInfo.js