Commit 4e55ec6f authored by 石盼盼's avatar 石盼盼

Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !74
parents 26482dd8 5cc35689
......@@ -36,8 +36,8 @@
<view class="content1_body">
<block wx:for="{{profitList}}" wx:key='index'>
<view class="content1_body_th flex-h flex-vc">
<view style="width:30%">{{time.time(item.created_at)}}</view>
<view style="width:30%">{{item.amount}}</view>
<view style="width:30%;text-align:center">{{time.time(item.created_at)}}</view>
<view style="width:30%;text-align:center">{{item.amount}}</view>
<view class="text-line-one" style="width:40%">{{item.remark}}</view>
</view>
</block>
......@@ -73,14 +73,14 @@
</view>
<view class="content1" wx:if='{{withdrawList.length > 0}}'>
<view class="content1_head flex-h flex-vc">
<view style="width:50%">日期</view>
<view style="width:50%">提现金额</view>
<view style="width:50%;text-align:center">日期</view>
<view style="width:50%;text-align:center">提现金额</view>
</view>
<view class="content1_body">
<block wx:for="{{withdrawList}}" wx:key='index'>
<view class="content1_body_th flex-h flex-vc">
<view style="width:50%">{{time.time(item.created_at)}}</view>
<view style="width:50%">{{item.amount}}</view>
<view style="width:50%;text-align:center">{{time.time(item.created_at)}}</view>
<view style="width:50%;text-align:center">{{item.amount}}</view>
</view>
</block>
</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment