更改扫码api、添加邮箱绑定功能
diff --git a/pages/sub_medical/cashFlow.vue b/pages/sub_medical/cashFlow.vue
index efe1ff2..6f5091b 100644
--- a/pages/sub_medical/cashFlow.vue
+++ b/pages/sub_medical/cashFlow.vue
@@ -9,20 +9,23 @@
<view v-if="leftOright">
<scroll-view scroll-y :enable-back-to-top="true" @scrolltolower="" class="scrollView">
<view class="cashFlow-ul">
- <view class="cashFlow-ul-item">
+ <view class="cashFlow-ul-item" v-for = '(v,i) in unpay_list' :key='i' @click="toPath('/pages/sub_medical/pay?msg=' + JSON.stringify(v)+'&id=unpay')">
<view class="cashFlow-ul-item-left">
<view class="cashFlow-ul-item-left-top">
<u-image src="./images/pay.png" width="80" height="80"></u-image>
- <text>挂号费</text>
+ <text>{{v.mergingName}}</text>
</view>
<view class="cashFlow-ul-item-left-bottom">
- <text class="cashFlow-ul-item-left-bottom-bold">01</text>
- <text class="cashFlow-ul-item-left-bottom-normal">天内缴费，截止日期2020/10/28 23:59:59</text>
+ <!-- <text class="cashFlow-ul-item-left-bottom-bold">科类:</text> -->
+ <text class="cashFlow-ul-item-left-bottom-normal" style="margin-right: 50rpx;">科类：{{v.subjectName}}</text>
+ <!-- <text class="cashFlow-ul-item-left-bottom-bold"></text> -->
+ <text class="cashFlow-ul-item-left-bottom-normal">医生：{{v.doctorName}}</text>
</view>
</view>
<view class="cashFlow-ul-item-right">
- <text>￥23.5</text>
+ <text>￥{{v.mergingSubtotal}}</text>
</view>
+ <view class="cashFlow-ul-item-status" v-if="v.status == 'wip'">订单支付中</view>
</view>
</view>
</scroll-view>
@@ -30,20 +33,21 @@
<view v-if="!leftOright">
<scroll-view scroll-y :enable-back-to-top="true" @scrolltolower="" class="scrollView">
<view class="cashFlow-ul">
- <view class="cashFlow-ul-item">
+ <view class="cashFlow-ul-item" v-for = '(v,i) in payed_list' :key='i' @click="toPath('/pages/sub_medical/pay?msg=' + JSON.stringify(v) +'&id=payed')">
<view class="cashFlow-ul-item-left">
<view class="cashFlow-ul-item-left-top">
<u-image src="./images/pay.png" width="80" height="80"></u-image>
- <text>挂号费</text>
+ <text>{{v.mergingname}}</text>
</view>
<view class="cashFlow-ul-item-left-bottom">
<text class="cashFlow-ul-item-left-bottom-normal">缴费日期：</text>
- <text class="cashFlow-ul-item-left-bottom-normal">2020-10-28 12:30:59</text>
+ <text class="cashFlow-ul-item-left-bottom-normal">{{v.paytime}}</text>
</view>
</view>
<view class="cashFlow-ul-item-right">
- <text>￥23.5</text>
+ <text>￥{{v.mergingsubtotal}}</text>
</view>
+ <view class="cashFlow-ul-item-status" v-if="!v.notifyStatus">通知医院</view>
</view>
</view>
</scroll-view>
@@ -55,13 +59,55 @@
export default {
data() {
return {
- leftOright: true
+ leftOright: true,
+ unpay_list:[],
+ hospitalcode:'',
+ payed_list:[]
}
},
+ onLoad(options){
+ let hospitalcode = options.hospitalcode
+ this.hospitalcode = hospitalcode
+ // this.get_unpay_list(hospitalcode)
+ },
methods: {
+ get_unpay_list(code){
+ let that = this
+ let param = {
+ hospitalcode : code
+ }
+ that.$u.post('/medicalapi/unpayed/list',param).then(res=>{
+ that.unpay_list = res.data
+ })
+ },
+ get_payed_list(code){
+ let that = this
+ let param = {
+ hospitalcode : code,
+ pageno:1,
+ pagesize:100
+ }
+ that.$u.post('/medicalapi/payed/list',param).then(res=>{
+ let list = res.data
+ list.forEach(item=>{
+ item.paytime = item.transdate.substr(0, 4) +
+ "-" + item.transdate.substr(4, 2) + "-" + item.transdate.substr(6, 2) + " " + item.transtime.substr(0, 2) + ":" +
+ item.transtime.substr(2, 2) + ":" + item.transtime.substr(4, 2)
+ })
+ that.payed_list = list
+ })
+ },
changeTurnoverList(e) {
this.leftOright = e
+ if(e){
+ this.get_unpay_list(this.hospitalcode)
+ }else{
+ this.get_payed_list(this.hospitalcode)
+ }
},
+ },
+ onShow(){
+ this.get_unpay_list(this.hospitalcode)
}
}
</script>
@@ -117,14 +163,27 @@
align-items: center;
padding: 30rpx 20rpx;
border-radius: 10rpx;
+ margin-bottom: 30rpx;
+ position: relative;
+ &-status{
+ position: absolute;
+ bottom: 20rpx;
+ right: 20rpx;
+ font-size: 26rpx;
+ color: #18B566;
+ }
&-left{
display: flex;
flex-direction: column;
justify-content: space-between;
+ width: 75%;
&-top{
display: flex;
align-items: center;
text{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
font-size: 36rpx;
margin-left: 10rpx;
font-weight: bold;