更改扫码api、添加邮箱绑定功能
diff --git a/pages/sub_medical/payResult.vue b/pages/sub_medical/payResult.vue
index bd09b48..e36fd54 100644
--- a/pages/sub_medical/payResult.vue
+++ b/pages/sub_medical/payResult.vue
@@ -1,23 +1,23 @@
<template>
<view class="payResult">
- <view class="payResult-status" v-if="msg.billstatus ==2">
+ <view class="payResult-status" v-if="msg.billstatus ==1">
<icon type="success" size="60" color="#3599FB"></icon>
<text class="payResult-status-text">支付成功</text>
</view>
- <view class="payResult-status" v-if="msg.billstatus !=2">
+ <view class="payResult-status" v-if="msg.billstatus ==0">
<icon type="warn" size="60"></icon>
<text class="payResult-status-text">支付失败</text>
</view>
- <view class="payResult-money" v-if="msg.billstatus ==2"><text>-￥{{msg.amount?msg.amount:'0.00'}}</text></view>
+ <view class="payResult-money" v-if="msg.billstatus ==1"><text>-￥{{msg.mergingSubtotal?msg.mergingSubtotal:'0.00'}}</text></view>
<view class="payResult-msg">
<u-cell-group>
- <u-cell-item title="商户名" :value="msg.shopname?msg.shopname:'未知商户'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
- <u-cell-item title="交易方式" :value="msg.billname?msg.billname:'未知方式'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
+ <u-cell-item title="医院名称" :value="msg.hospitalName?msg.hospitalName:'未知医院'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
+ <u-cell-item title="交易方式" value="大理市民卡" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
<u-cell-item title="交易时间" :value="msg.paytime?msg.paytime:'未知时间'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
- <u-cell-item title="订单号" :value="msg.refno?msg.refno:'未知订单号'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
+ <u-cell-item title="订单号" :value="msg.billNo?msg.billNo:'未知订单号'" :arrow="false" bg-color="#FFFFFF"></u-cell-item>
</u-cell-group>
</view>
- <u-button class="btn":custom-style="btn" @tap="goBack">返回首页</u-button>
+ <u-button class="btn":custom-style="btn" @tap="goBack">返回待缴费列表</u-button>
</view>
</template>
@@ -39,17 +39,28 @@
},
onLoad(options) {
let that = this;
- if (options.data) {
- let msg = JSON.parse(options.data);
- msg.amount = msg.amount.toFixed(2);
- that.msg = msg
+ let msg = JSON.parse(options.msg)
+ let status = options.status
+ let date = options.date
+ switch(status){
+ case 'fail':
+ msg.billstatus = 0;
+ break
+ case 'success':
+ msg.billstatus = 1;
+ break
+ case 'wip': //订单状态等待中 需查询
+ msg.billstatus = 2;
+ break
}
+ msg.paytime = date
+ that.msg = msg
},
methods: {
goBack() {
- uni.switchTab({
- url: '/pages/sub_tabbar/index'
- });
+ uni.navigateBack({
+ delta:2
+ })
}
}
}
@@ -73,6 +84,12 @@
margin-top: 30rpx;
}
}
+ &-money{
+ padding: 30rpx;
+ font-size: 50rpx;
+ text-align: right;
+ color: #2FA8E1;
+ }
&-msg{
margin-top: 50rpx;
}