Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/views/Auth/AutoLogin.vue

@@ -50,9 +50,11 @@ const userLoginHandler = async ()=>{
             }
         //}
         result.value = response
-    } else
+    } else{
         result.value = { isSuccess:false, message:'无法获取到令牌信息'}
-    loading.close() 
+        loading.close() 
+    }
+       
 } 
 userLoginHandler()
 </script>

src/views/Editor/Canvas/index.vue

@@ -98,6 +98,7 @@
     >
       <LinkDialog @close="linkDialogVisible = false" />
     </Modal>
+    <el-tooltip></el-tooltip>
   </div>
   <SourceCard v-if="model!=1" scroll-id="canvas-view-wrap"></SourceCard>
 </template>