fixed conflicts

web/src/utils/dialog.js

@@ -0,0 +1,43 @@
+/**
+ * Util lib functions
+ */
+import {showConfirmDialog, showFailToast, showSuccessToast, showToast} from "vant";
+import {isMobile} from "@/utils/libs";
+import {ElMessage} from "element-plus";
+
+export function showLoginDialog(router) {
+    showConfirmDialog({
+        title: '登录',
+        message:
+            '此操作需要登录才能进行，前往登录？',
+    }).then(() => {
+        router.push("/login")
+    }).catch(() => {
+        // on cancel
+    });
+}
+
+export function showMessageOK(message) {
+    if (isMobile()) {
+        showSuccessToast(message)
+    } else {
+        ElMessage.success(message)
+    }
+}
+
+
+export function showMessageInfo(message) {
+    if (isMobile()) {
+        showToast(message)
+    } else {
+        ElMessage.info(message)
+    }
+}
+
+export function showMessageError(message) {
+    if (isMobile()) {
+        showFailToast(message)
+    } else {
+        ElMessage.error(message)
+    }
+}

web/src/utils/http.js

@@ -6,7 +6,7 @@
 // * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 import axios from 'axios'
-import {getAdminToken, getSessionId, getUserToken} from "@/store/session";
+import {getAdminToken, getSessionId, getUserToken, removeAdminToken, removeUserToken} from "@/store/session";
 
 axios.defaults.timeout = 180000
 axios.defaults.baseURL = process.env.VUE_APP_API_HOST
@@ -29,9 +29,14 @@ axios.interceptors.response.use(
         let data = response.data;
         if (data.code === 0) {
             return response
-        } else {
-            return Promise.reject(response.data)
+        } else if (data.code === 400) {
+            if (response.request.responseURL.indexOf("/api/admin") !== -1) {
+                removeAdminToken()
+            } else {
+                removeUserToken()
+            }
         }
+            return Promise.reject(response.data)
     }, error => {
         return Promise.reject(error)
     })