Commit e57682a82591a95cdf8db78253ce23fdc30ba3d0

Authored by yvan.ni
1 parent 0d3bf03d

小程序自定义模板显示正确的商品价格和 销售数量

components/diy_goodsGroup/diy_goodsGroup.js
@@ -174,6 +174,9 @@ Component({ @@ -174,6 +174,9 @@ Component({
174 th.data.loading=0; 174 th.data.loading=0;
175 175
176 if(res.data.code==0 && res.data.data){ 176 if(res.data.code==0 && res.data.data){
  177 +
  178 + var goods = res.data.data;
  179 + /*--
177 var rData = th.data.requestData; 180 var rData = th.data.requestData;
178 if (rData == null) rData=[]; 181 if (rData == null) rData=[];
179 var now=ut.gettimestamp(); 182 var now=ut.gettimestamp();
@@ -187,6 +190,7 @@ Component({ @@ -187,6 +190,7 @@ Component({
187 new_arr.push(item); 190 new_arr.push(item);
188 } 191 }
189 rData = rData.concat(new_arr); 192 rData = rData.concat(new_arr);
  193 +
190 th.data.requestData = rData; 194 th.data.requestData = rData;
191 195
192 if(th.data.object.column==5){ 196 if(th.data.object.column==5){
@@ -198,8 +202,10 @@ Component({ @@ -198,8 +202,10 @@ Component({
198 th.setData({ goods_array: arr }); 202 th.setData({ goods_array: arr });
199 }else{ 203 }else{
200 th.setData({ goods_array: rData }); 204 th.setData({ goods_array: rData });
201 - }  
202 - 205 + }--*/
  206 +
  207 + th.set_good(goods);
  208 +
203 //---控制有没有加载更多的按钮--- 209 //---控制有没有加载更多的按钮---
204 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); } 210 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
205 else th.setData({ goods_btn: [1,2]}); 211 else th.setData({ goods_btn: [1,2]});
@@ -432,7 +438,20 @@ Component({ @@ -432,7 +438,20 @@ Component({
432 var item = {}; 438 var item = {};
433 var prom_id = null; 439 var prom_id = null;
434 //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => { 440 //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
435 - 441 +
  442 + var url="/api/weshop/activitylist/getGoodActInfo";
  443 + var req_data={
  444 + store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1
  445 + };
  446 +
  447 + //获取商品的实际活动
  448 + await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
  449 + if(res.data.code==0 && res.data.data && res.data.data.length==1){
  450 + item.prom_type=res.data.data[0].prom_type;
  451 + item.prom_id=res.data.data[0].act_id;
  452 + }
  453 + })
  454 +
436 item.goods_name = val.goods_name; 455 item.goods_name = val.goods_name;
437 item.goods_img = th.data.imghost + val.original_img; 456 item.goods_img = th.data.imghost + val.original_img;
438 item.market_price = val.market_price; 457 item.market_price = val.market_price;
@@ -451,24 +470,58 @@ Component({ @@ -451,24 +470,58 @@ Component({
451 470
452 prom_id = val.prom_id; 471 prom_id = val.prom_id;
453 472
454 - var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 473 + var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购
455 474
456 var url = ""; 475 var url = "";
457 - if (prom_type == 6) {  
458 - url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;  
459 - } else if (prom_type == 1) {  
460 - url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;  
461 - }  
462 - 476 +
  477 + switch (prom_type){
  478 + case 1:
  479 + var user_id=getApp().globalData.user_id;
  480 + if(!user_id) user_id=0;
  481 + url = "/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id;
  482 + break;
  483 + case 2:
  484 + url ="/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +val.goods_id+"/"+ prom_id
  485 + break;
  486 + case 4:
  487 + url ="/api/weshop/integralbuy/get/"+os.stoid +"/"+prom_id;
  488 + break;
  489 + case 6:
  490 + url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
  491 + break;
  492 + case 8:
  493 + var presell_id = prom_id;
  494 + var url1 = "/api/weshop/marketing/marketingPresellList/list";
  495 + var rd= {
  496 + store_id: os.stoid,
  497 + presell_id: presell_id,
  498 + goods_id: val.goods_id
  499 + }
  500 + //------获取预售从表----------
  501 + await getApp().request.promiseGet(url1, {
  502 + data: rd
  503 + }).then(res => {
  504 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  505 + var arr = res.data.data[0];
  506 + item.prom_price = arr.luck_goods_price;
  507 + item.sales_sum=arr.buy_goodnum
  508 + }
  509 + })
  510 + break;
  511 + default:
  512 + break
  513 + }
  514 +
463 if(url!=null && url!=''){ 515 if(url!=null && url!=''){
464 await getApp().request.promiseGet(url, {}).then(res => { 516 await getApp().request.promiseGet(url, {}).then(res => {
465 var prom =null; 517 var prom =null;
466 - if(res && res.data) res.data.data;  
467 - if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {  
468 - item.prom_price = res.data.data.price; 518 + if(res && res.data) prom=res.data.data;
  519 + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
  520 + item.prom_price = res.data.data.price;
  521 + if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
  522 + item.sales_sum=res.data.data.buy_num
469 } 523 }
470 th.data.requestData.push(item); 524 th.data.requestData.push(item);
471 -  
472 }) 525 })
473 }else{ 526 }else{
474 th.data.requestData.push(item); 527 th.data.requestData.push(item);