diff --git a/index.html b/index.html
index 67efe4b..0d6e425 100644
--- a/index.html
+++ b/index.html
@@ -1,10 +1,10 @@
-
+
- 询盘报价系统
+ 商户订单处理系统
diff --git a/package.json b/package.json
index c658f2a..e268700 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
- "dev": "vite --host 0.0.0.0",
+ "dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
diff --git a/src/api/index.js b/src/api/index.js
index d5778bb..8c847d4 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -3,7 +3,6 @@ import service from '@/service'
export const wechatPlatform = (platform) => {
return service({
method: 'get',
- url: `/auth/wechatPlatform/${platform}`,
- data: {}
+ url: `/auth/wechatPlatform/${platform}`
})
}
diff --git a/src/api/user.js b/src/api/user.js
index 02c56ea..bb5f520 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -19,23 +19,20 @@ export const verifyToken = () => {
export const getSMSCode = (mobile) => {
return service({
method: 'get',
- url: '/store/getSMSCode?mobile=' + mobile,
- data: {}
+ url: `/store/getSMSCode?mobile=${mobile}`
})
}
export const verifyEmail = (email,code) => {
return service({
method: 'get',
- url: `/accessory/checkMailVerifyCode?$email=${email}&$code=${code}`,
- data: {}
+ url: `/accessory/checkMailVerifyCode?email=${email}&code=${code}`
})
}
export const getEmailCode = (email) => {
return service({
method: 'get',
- url: '/accessory/mailVerifyCode?email=' + email,
- data: {}
+ url: `/accessory/mailVerifyCode?email=${email}`
})
}
diff --git a/src/components/AutoLogout.vue b/src/components/AutoLogout.vue
index 45b6ea4..b119b10 100644
--- a/src/components/AutoLogout.vue
+++ b/src/components/AutoLogout.vue
@@ -7,13 +7,12 @@
import { useRouter } from "vue-router";
import { useUserStore } from "@/store";
import { removeToken } from "@/utils";
- import * as envUtils from "@/utils/env";
const router = useRouter();
const userStore = useUserStore();
// 设置无操作超时时间(毫秒)
- let TIMEOUT = 1800*1000; // 从配置文件读取
+ let TIMEOUT = 3600 * 1000; // 从配置文件读取
let timer;
const resetTimer = () => {
@@ -22,17 +21,12 @@
};
const logout = () => {
- userStore.clearInfo(); // 调用store中的登出方法
+ userStore.logout(); // 调用store中的登出方法
removeToken();
router.push("/login"); // 跳转到登录页
};
onMounted(() => {
- // 监听用户活动事件
- let time = envUtils.getRuntimeConfig('VITE_APP_AUTO_LOGOUT_TIME',envUtils.getAutoLogoutTime())
- if (time) {
- TIMEOUT = time * 1000
- }
window.addEventListener("mousemove", resetTimer);
window.addEventListener("keypress", resetTimer);
// 初始化定时器
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 479b47a..ea14434 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -194,13 +194,12 @@
import { login, verifyToken,getSMSCode,getEmailCode,verifyEmail } from '@/api/user'
import { useUserStore } from '@/store'
import { ElMessage } from 'element-plus'
-
+
const router = useRouter()
const user_store = useUserStore()
-
const activeName = ref('first')
- const appId = ref('') // wxa0a92798871387ba
+ const appId = ref('')
const impower_style = `
.impowerBox qrcode {width: 200px;margin-top:10px;border: 0;}
.impowerBox .title {display: none;}
@@ -233,9 +232,7 @@
}
})
- const handleClick = (tab, event) => {
- console.log(tab, event)
- }
+ const handleClick = (tab, event) => {}
const username = ref('')
const password = ref('')
@@ -247,7 +244,7 @@
const {data: res} = await login({username: username.value, password: password.value})
if(res.error == 0) {
setToken(res.data.token)
- user_store.userInfo = res.data.user
+ user_store.setInfo(res.data.user)
ElMessage.success('登录成功')
router.push('/home')
} else {
@@ -268,7 +265,7 @@
const {data: res} = await login({mobile: mobile.value, code: code.value,type: 'mobile'})
if(res.error == 0) {
setToken(res.data.token)
- user_store.userInfo = res.data.user
+ user_store.setInfo(res.data.user)
ElMessage.success('登录成功')
router.push('/home')
} else {
@@ -283,7 +280,6 @@
return
}
const {data: res} = await getSMSCode(mobile.value)
- console.log(res)
if(res.error == 0) {
sms_btn.value = true
sms_input.value = true
@@ -320,7 +316,7 @@
const {data: res} = await login({email: email.value, code: ecode.value,type: 'email'})
if(res.error == 0) {
setToken(res.data.token)
- user_store.userInfo = res.data.user
+ user_store.setInfo(res.data.user)
ElMessage.success('登录成功')
router.push('/home')
} else {
@@ -335,7 +331,6 @@
return
}
const {data: res} = await getEmailCode(email.value)
- console.log(res)
if(res.error == 0) {
mail_btn.value = true
mail_input.value = true