diff --git a/Utils/Api.js b/Utils/Api.js index ab1c603..5acc0da 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -304,3 +304,25 @@ export const getAgentSalesPriceCount = params => { export const sendUserPass = params => { return POSTBREST('POST', `${brestBase}/secUser/sendUserPass`, params).then(res => res.data); } + + + + +// 话费 +//积分支付 +export const orderToGoldPayunion = params => { + return POST('POST', `${base}/outRechargeOrder/orderToGoldPay`, params).then(res => res.data); +} + +//提交订单 +export const addOrderPay = params => { + return POST('POST', `${base}/outRechargeOrder/addOrder`, params).then(res => res.data); +} +//话费充值查询 +export const getListOutRechargePrice = params => { + return POST('GET', `${base}/outRechargePrice/getListOutRechargePrice`, params).then(res => res.data); +} +//提交订单 +export const orderToUNionPay = params => { + return POST('POST', `${base}/outRechargeOrder/orderToPay`, params).then(res => res.data); +} \ No newline at end of file diff --git a/pages.json b/pages.json index 0a18386..8719eb2 100644 --- a/pages.json +++ b/pages.json @@ -463,8 +463,7 @@ } } - - ], + ], "subpackages": [{ "root": "subPages", "pages": [{ @@ -478,7 +477,42 @@ "navigationBarTextStyle": "white" } - }] + }, + { + "path": "recharge/recharge", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "话费充值", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, + { + "path": "recharge-centre/recharge-centre", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "话费充值", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + },{ + "path": "unionComfirmation/unionComfirmation", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "确认订单", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + } + ] }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 1d83b62..61549d5 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -651,7 +651,7 @@ return; } uni.navigateTo({ - url: '/pages/tabBar/order/order?id=3' + url: '../../../subPages/recharge/recharge' }) } else { diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue new file mode 100644 index 0000000..2753370 --- /dev/null +++ b/subPages/recharge-centre/recharge-centre.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/subPages/recharge/recharge.vue b/subPages/recharge/recharge.vue new file mode 100644 index 0000000..3e148c7 --- /dev/null +++ b/subPages/recharge/recharge.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/subPages/static/upay1.jpg b/subPages/static/upay1.jpg new file mode 100644 index 0000000..b9057d0 Binary files /dev/null and b/subPages/static/upay1.jpg differ diff --git a/subPages/static/upay2.jpg b/subPages/static/upay2.jpg new file mode 100644 index 0000000..284ca7d Binary files /dev/null and b/subPages/static/upay2.jpg differ diff --git a/subPages/static/upay3.jpg b/subPages/static/upay3.jpg new file mode 100644 index 0000000..6a2c5f3 Binary files /dev/null and b/subPages/static/upay3.jpg differ diff --git a/subPages/static/upay4.jpg b/subPages/static/upay4.jpg new file mode 100644 index 0000000..c32e4eb Binary files /dev/null and b/subPages/static/upay4.jpg differ diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue new file mode 100644 index 0000000..93eb04b --- /dev/null +++ b/subPages/unionComfirmation/unionComfirmation.vue @@ -0,0 +1,826 @@ + + + + +