Merge branch 'v2.0' into debug

src/views/Login.vue

@@ -54,7 +54,16 @@ async function onSubmit(){
     TelAreaCode:formData.telCode,
     IsRemember:Number(keepLogin.value)
   })
-  if(res.Ret!==200) return
+  if(![200,4013].includes(res.Ret)) return
+  if(res.Ret===4013){
+    await $confirmDialog({
+      header:'提示',
+      body: res.Msg,
+      confirmBtn:'知道了',
+      cancelBtn:null,
+    });
+    return
+  }
   setToken(res.Data.Authorization)
   router.replace('/etaChart/index')
 }

src/views/etaChart/components/chartList/Index.vue

@@ -9,13 +9,16 @@ const page=ref(1)
 const pageSize=ref(30)
 const total=ref(0)
 const list=ref([])
+const loading=ref(false)
 async function getTableData() {
+  loading.value=true
   const res = await apiETAChart.chartList({
     PageSize: pageSize.value,
     CurrentIndex: page.value,
     ChartClassifyId:classifyActived.value[0]?classifyActived.value[0]:0,
     SysUserIds:userVal.value?.join(',')||''
   })
+  loading.value=false
   if (res.Ret === 200) {
     const arr = res.Data.AllNodes || []
     list.value = arr
@@ -45,7 +48,7 @@ defineExpose({
 </script>
 
 <template>
-  <div class="chart-render-detail-list">
+  <div class="chart-render-detail-list" v-loading="loading">
     <div class="flex list-wrap">
       <ChartBox 
         v-for="item,index in list" 

src/views/user/favorite/components/CollectChart.vue

@@ -51,8 +51,8 @@ async function handleSave(){
     await $confirmDialog({
       header:'提示',
       body: res.Msg,
-      closeBtn:false,
-      confirmBtn:'知道了'
+      confirmBtn:'知道了',
+      cancelBtn:null,
     });
   }else{
     MessagePlugin.success('收藏成功')

src/views/user/favorite/components/MoveChart.vue

@@ -125,7 +125,7 @@ async function handleSave() {
   }
   const res=await apiETAChartUser.chartCollectBatchMove(params)
   if(res.Ret!==200) return
-  MessagePlugin.success('操作成功')
+  MessagePlugin.success('转移成功')
   show.value=false
   emits('change')
 }

src/views/user/favorite/etaChart.vue

@@ -107,7 +107,7 @@ async function handleCancelCollect(item,index){
           v-model="page"
           :pageSize="pageSize"
           :total="total"
-          :totalContent="false"
+          :totalContent="true"
           :showPageSize="false"
           @current-change="onPageChange"
         />