Commit 5a4577c58bb450e1fa99395e3caee160f5b45e1a
1 parent
0b5ac12c
预售的尾款的支付的优化
Showing
1 changed file
with
10 additions
and
5 deletions
packageC/pages/presell/cart/cart.js
| @@ -487,10 +487,8 @@ Page({ | @@ -487,10 +487,8 @@ Page({ | ||
| 487 | //-----获取商品------ | 487 | //-----获取商品------ | 
| 488 | async get_buy_goods(ord, o_sn) { | 488 | async get_buy_goods(ord, o_sn) { | 
| 489 | 489 | ||
| 490 | - | ||
| 491 | - | ||
| 492 | if(this.data.is_fwk){ | 490 | if(this.data.is_fwk){ | 
| 493 | - this.get_buy_card(o_sn); | 491 | + this.get_buy_card(o_sn,ord); | 
| 494 | return false; | 492 | return false; | 
| 495 | } | 493 | } | 
| 496 | 494 | ||
| @@ -826,7 +824,7 @@ Page({ | @@ -826,7 +824,7 @@ Page({ | ||
| 826 | 824 | ||
| 827 | 825 | ||
| 828 | //-- 服务卡项购买的时候 -- | 826 | //-- 服务卡项购买的时候 -- | 
| 829 | - async get_buy_card(o_sn){ | 827 | + async get_buy_card(o_sn,ord){ | 
| 830 | 828 | ||
| 831 | let order = null, | 829 | let order = null, | 
| 832 | order_goods = null, | 830 | order_goods = null, | 
| @@ -846,6 +844,13 @@ Page({ | @@ -846,6 +844,13 @@ Page({ | ||
| 846 | order_sn: o_sn, | 844 | order_sn: o_sn, | 
| 847 | }; | 845 | }; | 
| 848 | 846 | ||
| 847 | + if(!o_sn){ | ||
| 848 | + delete data.order_sn; | ||
| 849 | + data.order_id=ord; | ||
| 850 | + } | ||
| 851 | + | ||
| 852 | + | ||
| 853 | + | ||
| 849 | // 请求数据 | 854 | // 请求数据 | 
| 850 | let res= await app.promiseGet(url, { | 855 | let res= await app.promiseGet(url, { | 
| 851 | data: data, | 856 | data: data, | 
| @@ -970,7 +975,7 @@ Page({ | @@ -970,7 +975,7 @@ Page({ | ||
| 970 | goods.goods_name =goods.serviceName; | 975 | goods.goods_name =goods.serviceName; | 
| 971 | }); | 976 | }); | 
| 972 | 977 | ||
| 973 | - var g_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + order_goods.card_id + "&pre_id=" + pre_arr.id; | 978 | + var g_url = "/packageC/pages/presell/cardInfo/goodsInfo?goods_id=" + order_goods.card_id + "&pre_id=" + pre_arr.id; | 
| 974 | if (act.is_end || th.data.act.end_time < ut.gettimestamp()) { | 979 | if (act.is_end || th.data.act.end_time < ut.gettimestamp()) { | 
| 975 | g_url = "/packageA/pages/goods/goodsInfo/goodsInfo?goods_id=" + order_goods.card_id; | 980 | g_url = "/packageA/pages/goods/goodsInfo/goodsInfo?goods_id=" + order_goods.card_id; | 
| 976 | } | 981 | } | 
