Merge branch '03/12permission' into dev

src/views/teamBuild/components/teamBaseInfo.vue

@@ -517,6 +517,8 @@ export default {
             confirmButtonText: "是",
             cancelButtonText: "否",
             type: "warning",
+            closeOnClickModal:false,
+            distinguishCancelAndClose:true
           })
             .then(async () => {
               // localStorage.setItem(
@@ -527,9 +529,15 @@ export default {
               console.log(b)
               return b;
             })
-            .catch(() => {
-              localStorage.removeItem(`${this.teamid}base`)
+            .catch((e) => {
+              console.log(e)
+              if(e == 'close'){
+                return false
+              }else{
+                    localStorage.removeItem(`${this.teamid}base`)
               return true
+              }
+
               // localStorage.setItem(`${this.teamid}base`,JSON.stringify(this.topFrom));
             })
         } else {