Commit 7a70bfe03f9d1c84806c53e38f99f72595e1e259
1 parent
936600b2
1。 秒杀再来一单的功能,提交订单时候无法提交的bug优化
Showing
2 changed files
with
14 additions
and
1 deletions
pages/user/order_detail/order_detail.js
@@ -902,6 +902,8 @@ Page({ | @@ -902,6 +902,8 @@ Page({ | ||
902 | if(prom){ | 902 | if(prom){ |
903 | req_data.prom_type= good.prom_type; | 903 | req_data.prom_type= good.prom_type; |
904 | req_data.prom_id= good.prom_id; | 904 | req_data.prom_id= good.prom_id; |
905 | + b_item.prom_type=good.prom_type; | ||
906 | + b_item.prom_id=good.prom_id; | ||
905 | 907 | ||
906 | //------判断活动是否抢光----- | 908 | //------判断活动是否抢光----- |
907 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | 909 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + |
@@ -1024,6 +1026,11 @@ Page({ | @@ -1024,6 +1026,11 @@ Page({ | ||
1024 | if(g_item.is_pd_normal){ | 1026 | if(g_item.is_pd_normal){ |
1025 | newd['is_pd_normal']=g_item.is_pd_normal; | 1027 | newd['is_pd_normal']=g_item.is_pd_normal; |
1026 | } | 1028 | } |
1029 | + if(g_item.prom_type){ | ||
1030 | + newd['prom_type']=g_item.prom_type; | ||
1031 | + newd['prom_id']=g_item.prom_id; | ||
1032 | + } | ||
1033 | + | ||
1027 | 1034 | ||
1028 | 1035 | ||
1029 | var b_cart_goods=null; | 1036 | var b_cart_goods=null; |
pages/user/order_list/order_list.js
@@ -987,7 +987,8 @@ Page({ | @@ -987,7 +987,8 @@ Page({ | ||
987 | if(prom){ | 987 | if(prom){ |
988 | req_data.prom_type= good.prom_type; | 988 | req_data.prom_type= good.prom_type; |
989 | req_data.prom_id= good.prom_id; | 989 | req_data.prom_id= good.prom_id; |
990 | - | 990 | + b_item.prom_type=good.prom_type; |
991 | + b_item.prom_id=good.prom_id; | ||
991 | //------判断活动是否抢光----- | 992 | //------判断活动是否抢光----- |
992 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + | 993 | await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + |
993 | os.stoid + "/" + good.prom_type + "/" + good.prom_id, { | 994 | os.stoid + "/" + good.prom_type + "/" + good.prom_id, { |
@@ -1110,6 +1111,11 @@ Page({ | @@ -1110,6 +1111,11 @@ Page({ | ||
1110 | newd['is_pd_normal']=g_item.is_pd_normal; | 1111 | newd['is_pd_normal']=g_item.is_pd_normal; |
1111 | } | 1112 | } |
1112 | 1113 | ||
1114 | + if(g_item.prom_type){ | ||
1115 | + newd['prom_type']=g_item.prom_type; | ||
1116 | + newd['prom_id']=g_item.prom_id; | ||
1117 | + } | ||
1118 | + | ||
1113 | 1119 | ||
1114 | var b_cart_goods=null; | 1120 | var b_cart_goods=null; |
1115 | await getApp().request.promiseGet("/api/weshop/cart/page", { | 1121 | await getApp().request.promiseGet("/api/weshop/cart/page", { |