diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
index 4bcc15c02..e63eceb5a 100644
--- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
+++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
@@ -38,7 +38,7 @@
充值面额
- 充值记录
+
@@ -279,9 +279,9 @@
method: 'post',
data: this.order
}).then((res) => {
- // uni.navigateTo({
- // url: '/pagesHome/PaymentResults/PaymentResults'
- // })
+ uni.navigateTo({
+ url: '/pagesHome/PaymentResults/PaymentResults?type=1&orderNo=' + res.data.orderNo
+ })
})
},
diff --git a/pos-uni/pagesHome/PaymentResults/PaymentResults.vue b/pos-uni/pagesHome/PaymentResults/PaymentResults.vue
index 71c674af3..7bdd028a7 100644
--- a/pos-uni/pagesHome/PaymentResults/PaymentResults.vue
+++ b/pos-uni/pagesHome/PaymentResults/PaymentResults.vue
@@ -1,6 +1,6 @@
-
+
@@ -35,6 +35,41 @@
小程序码支付
+
+
+
+
+
+ 支付成功
+
+
+ 应收金额
+ ¥{{balanceOrder.orderAmount}}
+
+
+ 优惠金额
+ ¥{{balanceOrder.discountAmount}}
+
+
+ 实收金额
+ ¥{{balanceOrder.payAmount}}
+
+
+ 储值卡消费金额
+ ¥{{balanceOrder.balanceAmount}}
+
+
+ 支付方式
+ 支付宝支付
+ 微信支付
+ 银联二维码支付
+ 现金支付
+ 小程序码支付
+
+
返回
@@ -51,17 +86,25 @@
data() {
return {
titles: "支付结果",
- orderNo:"",
- oilOrder:{},
+ orderNo: "",
+ oilOrder: {},
+ balanceOrder: {},
}
},
onLoad(e) {
- this.orderNo = e.orderNo
+ if (e.type && e.type == 1) {
+ this.orderNo = e.orderNo
+ this.getBalanceOrder()
+ } else {
+ this.orderNo = e.orderNo
+ this.getOilOrder()
+ }
+
},
onShow() {
// this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束
- this.getOilOrder()
+
},
onPullDownRefresh() {
console.log("刷新");
@@ -78,18 +121,31 @@
},
methods: {
// 根据订单号查询订单信息
- getOilOrder(){
+ getOilOrder() {
request({
url: '/business/oilOrder/orderNo',
method: 'post',
- data:{orderNo:this.orderNo}
+ data: {
+ orderNo: this.orderNo
+ }
}).then((res) => {
this.oilOrder = res.data
})
},
+ getBalanceOrder() {
+ request({
+ url: 'business/marketingActivity/activeExchange/cardValueOrders/getOneByOrderNo',
+ method: 'post',
+ data: {
+ orderNo: this.orderNo
+ }
+ }).then((res) => {
+ this.balanceOrder = res.data
+ })
+ },
goback() {
uni.navigateTo({
- url:"/pages/index/index"
+ url: "/pages/index/index"
})
}
}