Commit 78e3875d2c9fffee4840108d06faaf823e265e5d
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
7 changed files
with
4 additions
and
3 deletions
packageA/images/badge.png
0 → 100644
14.3 KB
packageA/images/no1.png
0 → 100644
7.71 KB
packageA/images/no2.png
0 → 100644
7.15 KB
packageA/images/no3.png
0 → 100644
7.04 KB
packageA/pages/distribution/main/main.wxml
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | <view> |
| 12 | 12 | <view class="flex ai-center jc_sb pd2622 bdb arrow-r" bindtap="goto"> |
| 13 | 13 | <view><text class="iconfont icon-jine pdr10 ctb"></text>可提现金额</view> |
| 14 | - <view class="ctb money" data-url="/pages/user/member/menber">{{filter.show_default(data.user_money)}}</view> | |
| 14 | + <view class="ctb money" data-url="/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view> | |
| 15 | 15 | </view> |
| 16 | 16 | |
| 17 | 17 | <view class="flex jc_sa t-c"> | ... | ... |
packageA/pages/distribution/rank/rank.wxml
| ... | ... | @@ -4,7 +4,8 @@ |
| 4 | 4 | <view> |
| 5 | 5 | <view class="t1">排行榜</view> |
| 6 | 6 | <view class="t2 pdt10 pdr40" wx:if="{{userRanking.rownum == 1}}">恭喜您当前排名第一！</view> |
| 7 | - <view class="t2 pdt10 pdr40" wx:elif="{{userRanking.distribut_money}}">您距离前一名还差<text class="money">{{userRanking.mindistribut_money - userRanking.distribut_money}}</text></view> | |
| 7 | + <view class="t2 pdt10 pdr40" wx:elif="{{userRanking.mindistribut_money}}">您距离前一名还差<text class="money">{{userRanking.mindistribut_money - userRanking.distribut_money}}</text></view> | |
| 8 | + <view class="t2 pdt10 pdr40" wx:elif="{{userRanking.underling_number}}">您距离前一名还差{{userRanking.underling_number}}人</view> | |
| 8 | 9 | <view class="t2 pdt10 pdr40" wx:else>好好努力，天天向上！</view> |
| 9 | 10 | </view> |
| 10 | 11 | <view><image class="badge" src="../../../images/badge.png"/></view> | ... | ... |