Merge branch 'router'

# Conflicts:
#	src/views/TeamCenter/Layout.vue

src/views/TeamCenter/Layout.vue

@@ -62,10 +62,9 @@ if(menus.value.length==0){
 }
 
 watch(() => router.currentRoute.value.path, (toPath) => {
-    // if(userInfo.value.isp){
-    //     menus.value = useMenu.getUserMenu.filter(x=> {return x.url!='/a/l'})
-    // } else menus.value = useMenu.getTeamMenu
-    menus.value = useMenu.getUserMenu.filter(x=> {return x.url!='/a/l'})
+    if(userInfo.value.isp){
+        menus.value = useMenu.getTeamMenu.filter(x=> {return x.url!='/a/l'})
+    } else menus.value = useMenu.getTeamMenu
     if(!menus.value) return
     menus.value.forEach((x,i)=>{
         if(x.url==router.currentRoute.value.path){

src/views/TeamCenter/Member.vue

@@ -129,7 +129,7 @@
   <el-dialog v-model="removeVisible" title="移除成员" style="width:400px;">
       <main>
         <el-alert type="warning" show-icon :closable="false">
-            <template #title>
+            <template #header>
                 <span class="text-normal text-dark">你正在移除成员<span class="text-weight-bolder">{{ removeMemberModel.name }}</span>，移除后，该成员将无法访问本团队/企业，其在「我的空间」中的所有内容将被清空，且不可恢复，请谨慎操作</span>
             </template>
         </el-alert>
@@ -145,7 +145,7 @@
   <el-dialog v-model="exchangeVisible" title="转让管理员" style="width:400px;">
       <main>
         <el-alert type="warning" show-icon :closable="false">
-            <template #title>
+            <template #header>
                 <span class="text-normal text-dark">你正在转让超级管理员，转让后你将失去团队/企业管理的最高权限，请谨慎操作</span>
             </template>
         </el-alert>

src/views/components/Team/ExitTenant.vue

@@ -2,7 +2,7 @@
     <el-dialog v-model="removeVisible" title="退出团队/企业" style="width:400px;" @close="closed">
       <main>
         <el-alert type="warning" show-icon :closable="false">
-            <template #title>
+            <template #header>
                 <span class="text-normal text-dark">你正在退出<span class="text-weight-bolder">{{ userInfo.company }}</span>，退出后，你将无法访问本团队/企业，其在「我的空间」中的所有内容将被清空，且不可恢复，请谨慎操作</span>
             </template>
         </el-alert>

src/views/components/Team/InviteMember.vue

@@ -40,7 +40,7 @@
                     <div style="border-left: 1px dashed #000; margin-left: 8px;margin-right: 9px; height:98px;"></div>
                     <div class="col q-ml-md">
                         <el-alert type="info" :closable="false">
-                            <template #title>
+                            <template #header>
                                 <div class="row items-center">
                                     <div class="col">请按参考模板填写内容；字段不符合规则，则不予以导入</div>
                                     <div class="text-primary row items-center cusor-pointer q-ml-md" @click="goDownload">