Commit ccd7cd1b authored by 吴颖's avatar 吴颖

Merge branch 'wuying' into 'master'

Wuying

See merge request !53
parents cfd9b38d 17c57a67
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="item-one"> <view class="item-one">
<view class="num">{{detail ? detail.total_revenue: 0}}</view> <view class="num">{{detail ? detail.sales_revenue: 0}}</view>
<view class="small">已结算</view> <view class="small">已结算</view>
</view> </view>
<van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="1"/> <van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="1"/>
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="item-one"> <view class="item-one">
<view class="num">{{detail? detail.sales_revenue: 0}}</view> <view class="num">{{detail? detail.total_revenue: 0}}</view>
<view class="small">已结算</view> <view class="small">已提现</view>
</view> </view>
<van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="2" /> <van-icon class="question_icon" name="question-o" catchtap="showPopup" data-index="2" />
......
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