wxd / MShopWeApp

Commit aa55995716ff7df62348b9a7712939f7eaf1af2a

Authored by yvan.ni
1 parent aab08626

1. 提交订单页面显示购买等级卡优惠 

2.   积分购，拼团的普通购买再来一单的功能的bug优化
Inline Side-by-side
Showing 3 changed files with 22 additions and 4 deletions
pages/cart/cart2/cart2.js
  View file @aa55995
@@ -393,7 +393,7 @@ Page({ @@ -393,7 +393,7 @@ Page({
393 if (arr[j].pickup_id == pcid) { 393 if (arr[j].pickup_id == pcid) {
394 arr[j].goods.push(item); 394 arr[j].goods.push(item);
395 //-- 把等级卡会优惠多少钱装进去 -- 395 //-- 把等级卡会优惠多少钱装进去 --
396 - if(item.cut_price) arr[j].card_cut_price+=arr[j].cut_price; 396 + if(item.cut_price) arr[j].card_cut_price+=item.cut_price;
397 find = 1;break; 397 find = 1;break;
398 } 398 }
399 } 399 }
pages/user/order_detail/order_detail.js
  View file @aa55995
@@ -751,6 +751,7 @@ Page({ @@ -751,6 +751,7 @@ Page({
751 b_item.price=good.shop_price; 751 b_item.price=good.shop_price;
752 b_item.goods_sn=good.goods_sn; 752 b_item.goods_sn=good.goods_sn;
753 b_item.sku=good.sku; 753 b_item.sku=good.sku;
  754 + b_item.is_integral_normal=g_item.is_integral_normal;
754 755
755 //--判断商品当前的活动情况-- 756 //--判断商品当前的活动情况--
756 switch(good.prom_type){ 757 switch(good.prom_type){
@@ -1016,6 +1017,14 @@ Page({ @@ -1016,6 +1017,14 @@ Page({
1016 newd['guide_id']=g_item.guide_id; 1017 newd['guide_id']=g_item.guide_id;
1017 newd['guide_type']=g_item.guide_type; 1018 newd['guide_type']=g_item.guide_type;
1018 } 1019 }
  1020 +
  1021 + if(g_item.is_integral_normal){
  1022 + newd['is_integral_normal']=g_item.is_integral_normal;
  1023 + }
  1024 + if(g_item.is_pd_normal){
  1025 + newd['is_pd_normal']=g_item.is_pd_normal;
  1026 + }
  1027 +
1019 1028
1020 var b_cart_goods=null; 1029 var b_cart_goods=null;
1021 await getApp().request.promiseGet("/api/weshop/cart/page", { 1030 await getApp().request.promiseGet("/api/weshop/cart/page", {
pages/user/order_list/order_list.js
  View file @aa55995
@@ -835,20 +835,21 @@ Page({ @@ -835,20 +835,21 @@ Page({
835 b_item.pickup_id=item.pickup_id; 835 b_item.pickup_id=item.pickup_id;
836 b_item.price=good.shop_price; 836 b_item.price=good.shop_price;
837 b_item.goods_sn=good.goods_sn; 837 b_item.goods_sn=good.goods_sn;
838 - b_item.sku=good.sku; 838 + b_item.sku=good.sku;
  839 + b_item.is_integral_normal=g_item.is_integral_normal;
839 840
840 //--判断商品当前的活动情况-- 841 //--判断商品当前的活动情况--
841 switch(good.prom_type){ 842 switch(good.prom_type){
842 case 1: 843 case 1:
843 var flash=null; 844 var flash=null;
844 - getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, { 845 + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
845 }).then(res=>{ 846 }).then(res=>{
846 if (res.data.code== 0) { 847 if (res.data.code== 0) {
847 flash=res.data.data; 848 flash=res.data.data;
848 } 849 }
849 }) 850 })
850 //----已经结束----- 851 //----已经结束-----
851 - if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time > timestamp ) { 852 + if (flash && flash.is_end == 0 && flash.end_time>timestamp && flash.start_time<timestamp ) {
852 prom=flash; 853 prom=flash;
853 b_item.price=prom.price; // 854 b_item.price=prom.price; //
854 } 855 }
@@ -1101,6 +1102,14 @@ Page({ @@ -1101,6 +1102,14 @@ Page({
1101 newd['guide_id']=g_item.guide_id; 1102 newd['guide_id']=g_item.guide_id;
1102 newd['guide_type']=g_item.guide_type; 1103 newd['guide_type']=g_item.guide_type;
1103 } 1104 }
  1105 +
  1106 + if(g_item.is_integral_normal){
  1107 + newd['is_integral_normal']=g_item.is_integral_normal;
  1108 + }
  1109 + if(g_item.is_pd_normal){
  1110 + newd['is_pd_normal']=g_item.is_pd_normal;
  1111 + }
  1112 +
1104 1113
1105 var b_cart_goods=null; 1114 var b_cart_goods=null;
1106 await getApp().request.promiseGet("/api/weshop/cart/page", { 1115 await getApp().request.promiseGet("/api/weshop/cart/page", {