Merge branch 'develop' into test

3 years ago · 7de68e36c3
1 changed files with 3 additions and 1 deletions
--- a/src/views/dataOverview/index.vue
+++ b/src/views/dataOverview/index.vue
@ -119,7 +119,7 @@
                    </div>
                    <div class="teamInfo">
                        <div class="teamName">{{item.username}}</div>
-                        <div class="teamMoney">7月打款业绩：{{item.team_integral | capitalize}}</div>
+                        <div class="teamMoney">{{list.today_month}}月打款业绩：{{item.team_integral | capitalize}}</div>
                        <div class="teamNum">团队人数：{{item.team_num}}</div>
                    </div>
                </div>
@ -354,6 +354,8 @@
                            height: 26px;
                            line-height: 26px;
                            margin-bottom: 10px;
+                                overflow: hidden;
+    width: 320px;
                        }

                        .teamMoney {