商品分组的点击跳转

yvan.ni
1 parent 42083fa5
Showing 1 changed file with 14 additions and 6 deletions
components/diy_goodsGroup/diy_goodsGroup.js
@@ -449,18 +449,26 @@ Component({
         item.prom_type = 0;
 				item.prom_id = 0;
-				var url = "/api/weshop/activitylist/getGoodActInfo";
+				var url = "/api/weshop/activitylist/listGoodActInfo2New";
 				var req_data = {
-					store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
+					store_id: os.stoid, goods_id: val.goods_id,  user_id: user_id
         };
         item.prom_type = 0;
         item.prom_id = 0;
 				//获取商品的实际活动
-				await getApp().request.promiseGet(url, { data: req_data }).then(res => {
-					if (res.data.code == 0 && res.data.data && res.data.data.length == 1) {
-						item.prom_type = res.data.data[0].prom_type;
-						item.prom_id = res.data.data[0].act_id;
+				await getApp().request.promiseGet(url, { data: req_data }).then(ck_res => {
+					if (ck_res.data.code == 0 && ck_res.data.data && ck_res.data.data.length > 0) {
+
+						var arr = ck_res.data.data;
+						//-- 预热也要计算 --
+						var arr2 = arr.filter(function (e) {
+							return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+						})
+						if (arr2.length == 1) {
+							item.prom_type = arr2[0].prom_type;
+							item.prom_id = arr2[0].act_id;
+						}
 					}
 				})