Commit 7a6db64f31c88a3bb81522a74e6212394ce18084
1 parent
ef713bf5
积分权限购买接口参数增加user_id
Showing
5 changed files
with
10 additions
and
10 deletions
packageC/pages/presell/cart/cart.js
| @@ -2670,7 +2670,7 @@ Page({ | @@ -2670,7 +2670,7 @@ Page({ | ||
| 2670 | 2670 | ||
| 2671 | if (gg.prom_type == 4) { | 2671 | if (gg.prom_type == 4) { |
| 2672 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { | 2672 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
| 2673 | - data: { store_id: os.stoid, goods_id: gg.goods_id } | 2673 | + data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, } |
| 2674 | }).then(res => { | 2674 | }).then(res => { |
| 2675 | if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { | 2675 | if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { |
| 2676 | prom = res.data.data.pageData[0]; | 2676 | prom = res.data.data.pageData[0]; |
| @@ -2765,7 +2765,7 @@ Page({ | @@ -2765,7 +2765,7 @@ Page({ | ||
| 2765 | 2765 | ||
| 2766 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { | 2766 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { |
| 2767 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { | 2767 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { |
| 2768 | - data: { store_id: os.stoid, goods_id: goodsinfo.goods_id } | 2768 | + data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, } |
| 2769 | }).then(res => { | 2769 | }).then(res => { |
| 2770 | if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { | 2770 | if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { |
| 2771 | prom = res.data.data.pageData[0]; | 2771 | prom = res.data.data.pageData[0]; |
packageD/pages/shop/order_detail/order_detail.js
| @@ -535,7 +535,7 @@ Page({ | @@ -535,7 +535,7 @@ Page({ | ||
| 535 | 535 | ||
| 536 | if(gg.prom_type==4){ | 536 | if(gg.prom_type==4){ |
| 537 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ | 537 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ |
| 538 | - data:{store_id:os.stoid,goods_id:gg.goods_id} | 538 | + data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,} |
| 539 | }).then(res=>{ | 539 | }).then(res=>{ |
| 540 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ | 540 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ |
| 541 | prom=res.data.data.pageData[0]; | 541 | prom=res.data.data.pageData[0]; |
| @@ -659,7 +659,7 @@ Page({ | @@ -659,7 +659,7 @@ Page({ | ||
| 659 | 659 | ||
| 660 | if(goodsinfo.prom_type==4 && !good.is_integral_normal){ | 660 | if(goodsinfo.prom_type==4 && !good.is_integral_normal){ |
| 661 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ | 661 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ |
| 662 | - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} | 662 | + data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,} |
| 663 | }).then(res=>{ | 663 | }).then(res=>{ |
| 664 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ | 664 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ |
| 665 | prom=res.data.data.pageData[0]; | 665 | prom=res.data.data.pageData[0]; |
pages/cart/cart2_inte/cart2_inte.js
| @@ -540,7 +540,7 @@ Page({ | @@ -540,7 +540,7 @@ Page({ | ||
| 540 | break; | 540 | break; |
| 541 | case 4: //-- 积分购 -- | 541 | case 4: //-- 积分购 -- |
| 542 | getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { | 542 | getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { |
| 543 | - data: { store_id: os.stoid, goods_id: gg.goods_id }, | 543 | + data: { store_id: os.stoid, goods_id: gg.goods_id, user_id: to.globalData.user_id, }, |
| 544 | success: async function (tt) { | 544 | success: async function (tt) { |
| 545 | if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) { | 545 | if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) { |
| 546 | var inte_data = tt.data.data.pageData[0]; | 546 | var inte_data = tt.data.data.pageData[0]; |
pages/user/order_detail/order_detail.js
| @@ -585,7 +585,7 @@ Page({ | @@ -585,7 +585,7 @@ Page({ | ||
| 585 | 585 | ||
| 586 | if(gg.prom_type==4){ | 586 | if(gg.prom_type==4){ |
| 587 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ | 587 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ |
| 588 | - data:{store_id:os.stoid,goods_id:gg.goods_id} | 588 | + data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,} |
| 589 | }).then(res=>{ | 589 | }).then(res=>{ |
| 590 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ | 590 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ |
| 591 | prom=res.data.data.pageData[0]; | 591 | prom=res.data.data.pageData[0]; |
| @@ -709,7 +709,7 @@ Page({ | @@ -709,7 +709,7 @@ Page({ | ||
| 709 | 709 | ||
| 710 | if(goodsinfo.prom_type==4 && !good.is_integral_normal){ | 710 | if(goodsinfo.prom_type==4 && !good.is_integral_normal){ |
| 711 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ | 711 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ |
| 712 | - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} | 712 | + data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,} |
| 713 | }).then(res=>{ | 713 | }).then(res=>{ |
| 714 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ | 714 | if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ |
| 715 | prom=res.data.data.pageData[0]; | 715 | prom=res.data.data.pageData[0]; |
pages/user/order_list/order_list.js
| @@ -651,7 +651,7 @@ Page({ | @@ -651,7 +651,7 @@ Page({ | ||
| 651 | var order = e; | 651 | var order = e; |
| 652 | var order_goods = e.order_goods; | 652 | var order_goods = e.order_goods; |
| 653 | var user_id = getApp().globalData.userInfo.user_id; | 653 | var user_id = getApp().globalData.userInfo.user_id; |
| 654 | - | 654 | + |
| 655 | //如果使用预存的话,要重新效验下预存金额是否足够 | 655 | //如果使用预存的话,要重新效验下预存金额是否足够 |
| 656 | if(order.pre_cut && order.pre_json){ | 656 | if(order.pre_cut && order.pre_json){ |
| 657 | let pickup_id=order.pickup_id | 657 | let pickup_id=order.pickup_id |
| @@ -976,7 +976,7 @@ Page({ | @@ -976,7 +976,7 @@ Page({ | ||
| 976 | 976 | ||
| 977 | if (gg.prom_type == 4) { | 977 | if (gg.prom_type == 4) { |
| 978 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { | 978 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { |
| 979 | - data: { store_id: os.stoid, goods_id: gg.goods_id } | 979 | + data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, } |
| 980 | }).then(res => { | 980 | }).then(res => { |
| 981 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 981 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
| 982 | prom = res.data.data.pageData[0]; | 982 | prom = res.data.data.pageData[0]; |
| @@ -1097,7 +1097,7 @@ Page({ | @@ -1097,7 +1097,7 @@ Page({ | ||
| 1097 | 1097 | ||
| 1098 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { | 1098 | if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { |
| 1099 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { | 1099 | await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { |
| 1100 | - data: { store_id: os.stoid, goods_id: goodsinfo.goods_id } | 1100 | + data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, } |
| 1101 | }).then(res => { | 1101 | }).then(res => { |
| 1102 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { | 1102 | if (res.data.code == 0 && res.data.data && res.data.data.pageData) { |
| 1103 | prom = res.data.data.pageData[0]; | 1103 | prom = res.data.data.pageData[0]; |