wxd / MShopWeApp

Commit 976393451ac2c934604e1d22fe205d1625c34490

Authored by yvan.ni
1 parent 42083fa5

商品分组的点击跳转

Inline Side-by-side
Showing 1 changed file with 14 additions and 6 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @9763934
... ... @@ -449,18 +449,26 @@ Component({
449 449  
450 450 item.prom_type = 0;
451 451 item.prom_id = 0;
452   - var url = "/api/weshop/activitylist/getGoodActInfo";
  452 + var url = "/api/weshop/activitylist/listGoodActInfo2New";
453 453 var req_data = {
454   - store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
  454 + store_id: os.stoid, goods_id: val.goods_id, user_id: user_id
455 455 };
456 456  
457 457 item.prom_type = 0;
458 458 item.prom_id = 0;
459 459 //获取商品的实际活动
460   - await getApp().request.promiseGet(url, { data: req_data }).then(res => {
461   - if (res.data.code == 0 && res.data.data && res.data.data.length == 1) {
462   - item.prom_type = res.data.data[0].prom_type;
463   - item.prom_id = res.data.data[0].act_id;
  460 + await getApp().request.promiseGet(url, { data: req_data }).then(ck_res => {
  461 + if (ck_res.data.code == 0 && ck_res.data.data && ck_res.data.data.length > 0) {
  462 +
  463 + var arr = ck_res.data.data;
  464 + //-- 预热也要计算 --
  465 + var arr2 = arr.filter(function (e) {
  466 + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
  467 + })
  468 + if (arr2.length == 1) {
  469 + item.prom_type = arr2[0].prom_type;
  470 + item.prom_id = arr2[0].act_id;
  471 + }
464 472 }
465 473 })
466 474  
... ...