From e57682a82591a95cdf8db78253ce23fdc30ba3d0 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 16 Nov 2021 09:26:51 +0800
Subject: [PATCH] 小程序自定义模板显示正确的商品价格和 销售数量

---
 components/diy_goodsGroup/diy_goodsGroup.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 67 insertions(+), 14 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 8d10972..fba57b3 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -174,6 +174,9 @@ Component({
                      th.data.loading=0;
 				
 					 if(res.data.code==0 && res.data.data){
+
+                            var goods = res.data.data;
+                            /*--
 						   var rData = th.data.requestData;
 						   if (rData == null) rData=[];
 						   var now=ut.gettimestamp();
@@ -187,6 +190,7 @@ Component({
 								new_arr.push(item);
 						   }   
 						   rData = rData.concat(new_arr);
+
 						   th.data.requestData = rData;
 						   
 						   if(th.data.object.column==5){
@@ -198,8 +202,10 @@ Component({
 							   th.setData({ goods_array: arr  });  
 						   }else{
 							   th.setData({ goods_array: rData  });  
-						   }
-												 
+						   }--*/
+
+                         th.set_good(goods);
+
 						 //---控制有没有加载更多的按钮---
 						 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
 						 else  th.setData({ goods_btn: [1,2]});                   
@@ -432,7 +438,20 @@ Component({
 			var item = {};
 			var prom_id = null;
 			//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
-							
+
+            var url="/api/weshop/activitylist/getGoodActInfo";
+            var req_data={
+                store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1
+            };
+
+            //获取商品的实际活动
+            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;
+                }
+            })
+
 			item.goods_name = val.goods_name;
 			item.goods_img = th.data.imghost + val.original_img;
 			item.market_price = val.market_price;
@@ -451,24 +470,58 @@ Component({
 							
 			prom_id = val.prom_id;
 					
-			var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单
+			var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
 					
 			var url = "";
-			if (prom_type == 6) {
-			  url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-			} else if (prom_type == 1) {
-			  url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
-			}
-					
+
+			 switch (prom_type){
+			 	case 1:
+                    var user_id=getApp().globalData.user_id;
+                    if(!user_id) user_id=0;
+                    url = "/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id;
+			 		break;
+			 	case 2:
+                    url ="/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +val.goods_id+"/"+ prom_id
+			 		break;
+                case 4:
+                    url ="/api/weshop/integralbuy/get/"+os.stoid +"/"+prom_id;
+                    break;
+                case 6:
+                     url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
+                     break;
+                case 8:
+                    var presell_id = prom_id;
+                    var url1 = "/api/weshop/marketing/marketingPresellList/list";
+                    var rd= {
+                        store_id: os.stoid,
+                        presell_id: presell_id,
+                        goods_id: val.goods_id
+                    }
+                    //------获取预售从表----------
+                    await getApp().request.promiseGet(url1, {
+                        data: rd
+                    }).then(res => {
+                        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                            var arr = res.data.data[0];
+                            item.prom_price = arr.luck_goods_price;
+                            item.sales_sum=arr.buy_goodnum
+                        }
+                    })
+                    break;
+			 	default:
+			 	 	break
+			 }
+
 			if(url!=null && url!=''){
 			 await getApp().request.promiseGet(url, {}).then(res => {
 			    var prom =null;
-			    if(res && res.data) res.data.data;
-			    if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
-			      item.prom_price = res.data.data.price;
+			    if(res && res.data) prom=res.data.data;
+			    if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+			       item.prom_price = res.data.data.price;
+			       if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
+                    item.sales_sum=res.data.data.buy_num
 			    }
 			    th.data.requestData.push(item);
-			    
 			  })
 			}else{
 			  th.data.requestData.push(item);
--
libgit2 0.21.4