Merge remote-tracking branch 'origin/developer' into developerA

src/views/user/record/list.vue

@@ -347,20 +347,20 @@ export default {
     // tab切换
     handleClick(tab, event) {
       if (tab.name === 'first') {
-        this.tabsCurrent = this.listQuery.todayType = 0
         if (this.$route.query.type) {
           this.handleInfo()
         } else {
           this.listQuery = Object.assign({}, defaultListQuery)
         }
+        this.tabsCurrent = this.listQuery.todayType = 0
         this.getList()
       } else if (tab.name === 'second') {
-        this.tabsCurrent = this.listQuery.todayType = 1
         if (this.$route.query.type) {
           this.handleInfo()
         } else {
           this.listQuery = Object.assign({}, defaultListQuery)
         }
+        this.tabsCurrent = this.listQuery.todayType = 1
         this.getList()
       }
     },