diff --git a/app/src/pages/user_data/user_data.vue b/app/src/pages/user_data/user_data.vue
index 21340317..0d754827 100644
--- a/app/src/pages/user_data/user_data.vue
+++ b/app/src/pages/user_data/user_data.vue
@@ -17,7 +17,7 @@
>
账号
{{ userInfo?.username }}
-
+
@@ -27,14 +27,14 @@
>
昵称
{{ userInfo?.nickname }}
-
+
性别
{{ userInfo?.sex }}
-
+
diff --git a/app/src/pages/user_set/user_set.vue b/app/src/pages/user_set/user_set.vue
index 29d9c498..bd909b81 100644
--- a/app/src/pages/user_set/user_set.vue
+++ b/app/src/pages/user_set/user_set.vue
@@ -2,8 +2,8 @@
-
-
+
+
{{ userInfo.nickname }}
账号:{{ userInfo.username }}
@@ -19,7 +19,7 @@
登录密码
-
+
绑定微信
@@ -41,16 +41,26 @@
-
- 关于我们
-
-
- {{ appStore.config.version }}
-
-
-
-
-
+
+
+ 关于我们
+
+
+ {{ appStore.config.version }}
+
+
+
+
+
+
+
+
+ 退出登录
+
+
+
+
+
@@ -59,9 +69,11 @@ import { getUserInfo } from '@/api/user'
import { onShow } from '@dcloudio/uni-app'
import { reactive, ref } from 'vue'
import { useAppStore } from '@/stores/app'
+import { useUserStore } from '@/stores/user'
import { AgreementEnum } from '@/enums/agreementEnums'
const appStore = useAppStore()
+const userStore = useUserStore()
const userInfo = ref({})
const list = ref([
{
@@ -72,13 +84,14 @@ const list = ref([
}
])
const show = ref(false)
+
+// 获取用户信息
const getUser = async () => {
const res = await getUserInfo()
- console.log(res, 'res')
-
userInfo.value = res
}
+// 修改/忘记密码
const handleClick = (index: number) => {
switch (index) {
case 0:
@@ -90,6 +103,21 @@ const handleClick = (index: number) => {
}
}
+// 退出登录
+const logoutHandle = () => {
+ uni.showModal({
+ content: '是否退出登录?',
+ confirmColor: '#4173FF',
+ success: ({
+ cancel
+ }) => {
+ if (cancel) return
+ userStore.login()
+ uni.redirectTo({ url: '/pages/login/login' })
+ }
+ })
+}
+
onShow(() => {
getUser()
})
@@ -98,11 +126,11 @@ onShow(() => {