解决数据下拉加载的bug,调整专区样式,完善充值记录
This commit is contained in:
@@ -3,6 +3,7 @@ import { getRechargeList } from "../../service/recharge";
|
||||
import { getTenementMeterList } from "../../service/meter";
|
||||
import { getYears, alertInfo, loadingFunc } from "../../utils/index";
|
||||
import request from "../../utils/request";
|
||||
import Dialog from '@vant/weapp/dialog/dialog';
|
||||
const { OK } = request;
|
||||
Page({
|
||||
|
||||
@@ -79,6 +80,14 @@ Page({
|
||||
})
|
||||
this.init(currentYear, codeId, pay)
|
||||
},
|
||||
showAnswer() {
|
||||
Dialog.alert({
|
||||
title: '提示',
|
||||
message: '只统计已完成充值的数据,处理中和已退回不计入总额内',
|
||||
}).then(() => {
|
||||
// on close
|
||||
});
|
||||
},
|
||||
onChangeMeter(e) {
|
||||
const { id, code, } = e;
|
||||
const { year, pay } = this.data;
|
||||
|
@@ -5,7 +5,9 @@
|
||||
"van-icon": "@vant/weapp/icon/index",
|
||||
"custom-status-bar": "/components/customStatusBar/index",
|
||||
"custom-picker": "/components/picker/index",
|
||||
"empty": "/components/empty/index"
|
||||
"empty": "/components/empty/index",
|
||||
"van-dialog": "@vant/weapp/dialog/index",
|
||||
"van-divider": "@vant/weapp/divider/index"
|
||||
},
|
||||
"navigationStyle": "custom"
|
||||
}
|
@@ -34,6 +34,13 @@
|
||||
<view class="rechargeStatus rechargeBack" wx:elif="{{item.orderStatus === 2}}"> 已退回 </view>
|
||||
<view class="rechargeStatus rechargeSuccess" wx:else> 充值成功 </view>
|
||||
</view>
|
||||
<view class="allMoney"> 总计<van-icon name="question-o" bind:click="showAnswer" style="font-size: 40rpx; margin-left: 8rpx;margin-right:8rpx;" />:{{amount}} </view>
|
||||
<van-divider
|
||||
contentPosition="center"
|
||||
>
|
||||
没有更多了
|
||||
</van-divider>
|
||||
<view style="height: 40rpx;"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view wx:else>
|
||||
@@ -47,4 +54,5 @@
|
||||
bind:ok="onOk"
|
||||
bind:cancel="onCancel"
|
||||
type="{{type}}"
|
||||
/>
|
||||
/>
|
||||
<van-dialog id="van-dialog" />
|
||||
|
@@ -69,10 +69,10 @@
|
||||
}
|
||||
|
||||
.allMoney {
|
||||
flex: 1;
|
||||
font-size: 34rpx;
|
||||
margin-top: 24rpx;
|
||||
margin-bottom: 20rpx;
|
||||
text-align: right;
|
||||
color: #fff;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.type {
|
||||
|
Reference in New Issue
Block a user