Merge branch 'bug_7884' into debug

src/views/myETA/ChooseChart.vue

@@ -82,9 +82,8 @@ async function getChartList(){
     }else if(type.value==7){
         res=await apiIntervalAnalysis.searchChart(params)
     }
-    
+    listState.loading=false
     if(res.Ret==200){
-        listState.loading=false
         if(!res.Data){
             listState.finished=true
             return
@@ -92,16 +91,18 @@ async function getChartList(){
 
         listState.finished=res.Data.Paging.IsEnd
         const arr=res.Data.List||[]
-        listState.list=[...listState.list,...arr]
+        listState.list=listState.page == 1 ? arr : [...listState.list,...arr]
     }
 }
 
 function onLoad(){
+    listState.loading=true
     listState.page++
     getChartList()
 }
 
 function refreshList(){
+    listState.loading=true
     listState.list=[]
     listState.page=1
     listState.finished=false