This commit is contained in:
2023-09-15 17:14:36 +08:00
parent 0dcf23bfde
commit a626d36591
22 changed files with 383 additions and 206 deletions

View File

@@ -17,7 +17,8 @@ Page({
logsArr : [],
page : { current: 1 },
pageLoding : false,
needSign : false
needSign : false,
examine : ''
},
/**
@@ -40,10 +41,11 @@ Page({
wx.$api.user.account({
page: this.data.page.current
}).then(res => {
let { all_in, balance, frozen, need_sign, logs } = res.data
let { all_in, balance, frozen, need_sign, examine, logs } = res.data
this.setData({
account : { all_in, balance, frozen },
needSign : need_sign,
examine : examine,
logsArr : logs.page.current == 1 ? logs.data : this.data.logsArr.concat(logs.data),
page : logs.page,
pageLoding : !logs.page.has_more

View File

@@ -18,6 +18,23 @@
</view>
</view>
<!-- 进图条 -->
<view class="bar" wx:if="{{examine.show}}">
<view class="bar-title">销售补贴考核进度</view>
<view class="bar-line">
<view class="progress" style="width: 100%"></view>
<view class="progress-box" style="width: {{examine.amount < examine.need ? examine.amount : '100'}}%">
<view class="progress-box-name {{examine.amount == 0 ? 'active' : ''}}" wx:if="{{examine.need != examine.amount}}">{{examine.amount}}</view>
</view>
<!-- <view class="progress" style="width: {{examine.need}}%">
<view class="progress-box" style="width: {{examine.amount < examine.need ? examine.amount : '100'}}%">
<view class="progress-box-name {{examine.amount == 0 ? 'active' : ''}}" wx:if="{{examine.need != examine.amount}}">{{examine.amount}}</view>
</view>
<view class="progress-name">{{examine.need}}</view>
</view> -->
</view>
</view>
<!-- 收益明细 -->
<view class="detailed active">
<view class="listTitle">收益明细</view>

View File

@@ -13,6 +13,16 @@ page { background-color: #f6f6f6; }
.tab-name{ font-size: 28rpx; color: gray; }
.tab-number { font-size: 34rpx; font-weight: bold; margin-top: 5rpx; }
/* 进度条 */
.bar {margin: 30rpx; background-color: #ffffff; border-radius: 20rpx;box-sizing: border-box; padding: 30rpx;}
.bar-title {font-weight: 600; margin-bottom: 30rpx;}
.bar-line {width: 100%; height: 60rpx; overflow: hidden;position: relative;}
.progress {height: 20rpx; background-color: #ffb0c2;position: absolute; left: 0; top: 0;}
.progress-box {position: absolute; background-color: #dc3159; height: 20rpx;}
.progress-box-name {right: 0rpx;top: 35rpx;position: absolute; font-size: 24rpx; color: #dc3159;}
.progress-box-name.active {right: -15rpx;}
.progress-name {position: absolute;right: 0rpx;top: 35rpx; font-size: 24rpx; color: rgb(146, 146, 146);}
/* 收益明细 */
.listTitle { padding: 30rpx 30rpx 0; font-weight: 600; box-sizing: border-box; font-size: 30rpx; }
.list { padding: 30rpx; box-sizing: border-box;}