Lijy пре 1 година
родитељ
комит
b5ae2011ff

+ 15 - 0
fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -3,12 +3,27 @@
 </template>
 
 <script setup lang="ts">
+import { onMounted, ref, provide, inject } from 'vue'
 import { useStore } from '@/store/index'
+interface GlobalPopup {
+  showSuccess: (msg: string, time: number) => void
+  showError: (msg: string, time: number) => void
+  showWarning: (msg: string, time: number) => void
+}
 const { setAsyncRoutesMark } = useStore()
 window.addEventListener('beforeunload', () => beforeunloadFn())
 const beforeunloadFn = (() => {
   setAsyncRoutesMark(false)
 })
+
+provide('globalPopup', {
+  showSuccess: (msg: string, time: number) => { console.log(msg, '执行成功', time) }, //!SECTION 成功
+  showError: (msg: string, time: number) => { console.log(msg, '执行成功'), time }, //!SECTION 失败
+  showWarning: (msg: string, time: number) => { console.log(msg, '执行成功'), time }, //!SECTION 警告
+})
+
+
+
 </script>
 
 <style>

+ 21 - 19
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from "vue";
+import { reactive, ref, inject } from "vue";
 import { useRouter } from "vue-router";
 import loginLogo from "@/assets/login/login_logo.png";
 import qiyeweixin from "@/assets/login/qiyeweixin.png";
@@ -51,6 +51,7 @@ import { post } from "@/utils/request";
 import { LOGIN } from "./api";
 const { setRouters } = useStore()
 const router = useRouter();
+const globalPopup = inject<GlobalPopup>('globalPopup')
 const ruleFormRef = ref<FormInstance>();
 const ruleForm = ref({
   username: "",
@@ -75,26 +76,27 @@ const login = (formEl: FormInstance | undefined) => {
     console.log(ruleForm.value);
     post(LOGIN, { ...ruleForm.value }).then(res => {
       console.log(res);
-      if(res.code == 'error') {
-        ElMessage.error({
-          message: "登录失败",
-          type: "error",
-          duration: 2000,
-        })
-        loginLoading.value = false;
-        return
-      }
-      ElMessage.success({
-        message: "登录成功",
-        type: "success",
-        duration: 2000,
-      })
-      setTimeout(() => {
-        loginLoading.value = false;
-      }, 1000)
+      globalPopup.showSuccess('登录成功')
+      // if(res.code == 'error') {
+      //   ElMessage.error({
+      //     message: "登录失败",
+      //     type: "error",
+      //     duration: 2000,
+      //   })
+      //   loginLoading.value = false;
+      //   return
+      // }
+      // ElMessage.success({
+      //   message: "登录成功",
+      //   type: "success",
+      //   duration: 2000,
+      // })
+      // setTimeout(() => {
+      //   loginLoading.value = false;
+      // }, 1000)
       // loginLoading.value = false;
     }).catch(err => {
-      console.log(err);
+      console.log(err)
       loginLoading.value = false;
     })
     return