Merge branch 'guoqiang' into develop

src/views/dataOverview/index.vue

@@ -156,6 +156,7 @@
                     query: {
                         type: type,
                         level_id: id,
+                        today_month:this.list.today_month,
                     }
                 })
             },

src/views/teamList/index.vue

@@ -14,7 +14,7 @@
                         </div>
                         <div class="teamInfo">
                             <div class="teamName">{{item.username}}</div>
-                            <div class="teamMoney">7月打款业绩：{{item.team_integral | capitalize}}</div>
+                            <div class="teamMoney">{{today_month}}月打款业绩：{{item.team_integral | capitalize}}</div>
                             <div class="teamNum">团队人数：{{item.team_num}}</div>
                         </div>
                     </div>
@@ -45,6 +45,7 @@
                 error: false,
                 type:'',
                 level_id:'',
+                today_month:this.$route.query.today_month,
             }
         },
         filters: {