diff --git a/api/member.js b/api/member.js
index 58dd7fc..9ff6717 100644
--- a/api/member.js
+++ b/api/member.js
@@ -29,9 +29,14 @@ export const getUserInfo = (data) => {
return http({
method: 'POST',
url: '/api/my/userInfo',
- data: data,
- header:{
- token:'014de5283d2930af6481ede591afd087'
- }
+ data: data
+ })
+}
+
+export const updateUserInfo = (data) => {
+ return http({
+ method: 'POST',
+ url: '/api/my/updateUserInfo',
+ data: data
})
}
\ No newline at end of file
diff --git a/pages/home/member.vue b/pages/home/member.vue
index f1ffd25..f5d7e91 100644
--- a/pages/home/member.vue
+++ b/pages/home/member.vue
@@ -1,309 +1,359 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ username }}
-
-
- ID:{{ dccode }}
-
-
+
+
+
+
+
+
+
+
+ {{ username }}
+
+
+
+
+
+
+ ID:{{ dccode }}
+
+
-
-
-
-
-
- 行情设置
-
-
-
- 通用设置
-
-
-
-
-
-
-
-
-
-
- 账号与安全
-
-
-
-
- 联系我们
-
-
-
-
- 新版本更新
- 有新版本可更新
-
-
-
-
-
-
- 意见反馈
-
-
-
-
- 关于DeepChart
-
-
-
-
-
+
+
+
+
+
+ 行情设置
+
+
+
+ 通用设置
+
+
+
+
+
+
+
+
+
+
+ 账号与安全
+
+
+
+
+
+ 关于DeepChart
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/about.vue b/pages/setting/about.vue
index 059f971..a7d3428 100644
--- a/pages/setting/about.vue
+++ b/pages/setting/about.vue
@@ -12,7 +12,7 @@
产品介绍
-
+
@@ -61,7 +61,7 @@
}
.bottom {
- height: 35vh;
+ height: 7vh;
background-color: white;
}
diff --git a/pages/setting/account.vue b/pages/setting/account.vue
index 8dbcfe8..0dd9f20 100644
--- a/pages/setting/account.vue
+++ b/pages/setting/account.vue
@@ -1,6 +1,6 @@
-
+
@@ -8,15 +8,15 @@
头像
-
-
+
+
昵称
- {{userInfoRes.dcname}}
-
+ {{ userInfoRes.dcname }}
+
@@ -27,13 +27,13 @@
- {{ userInfoRes.hasPwd === 0 ? '创建密码' : '修改密码' }}
+ {{ userInfoRes.hasPwd === 0 ? '创建密码' : '修改密码' }}
注销账号
-
+
绑定账号
@@ -77,13 +77,15 @@
// const dccode = ref('')
const userInfoRes = ref({})
const showLogout = ref(false)
+ const avatarUrl = ref('')
const userInfoPromise = getUserInfo()
userInfoPromise.then(res => {
if (res.code === 200) {
- userInfoRes.value.dccode = res.data.dccode;
- userInfoRes.value.dcname = res.data.dcname;
- userInfoRes.value.hasPwd = res.data.hasPassword;
+ userInfoRes.value.dccode = res.data.dccode
+ userInfoRes.value.dcname = res.data.dcname
+ userInfoRes.value.hasPwd = res.data.hasPassword
+ avatarUrl.value = res.data.avatar
console.log('用户信息', userInfoRes.value)
} else {
uni.showToast({
diff --git a/pages/setting/bind.vue b/pages/setting/bind.vue
index eeb7577..a431e75 100644
--- a/pages/setting/bind.vue
+++ b/pages/setting/bind.vue
@@ -5,7 +5,7 @@
-
+
邮箱
diff --git a/pages/setting/createPwd.vue b/pages/setting/createPwd.vue
index a151fd5..e28353a 100644
--- a/pages/setting/createPwd.vue
+++ b/pages/setting/createPwd.vue
@@ -4,7 +4,7 @@
邮箱
- 手机号
+
@@ -83,17 +83,16 @@
}
- const goToPwdNext = async () => {
- console.log('发请求之前的activeTab', activeTab.value)
- if (activeTab.value === 'email') {
- if (!userEmail.value) {
- uni.showToast({
- title: '请输入邮箱',
- icon: 'none'
- })
- return
- }
- } else {
+const goToPwdNext = async () => {
+ if (activeTab.value === 'email') {
+ if (!userEmail.value) {
+ uni.showToast({
+ title: '请输入邮箱',
+ icon: 'none'
+ })
+ return
+ }
+ }else{
if (!userPhone.value) {
uni.showToast({
title: '请输入手机号',
@@ -110,7 +109,6 @@
return
}
-
try {
let param;
if (activeTab.value === 'email') {
@@ -140,7 +138,7 @@
})
} else {
uni.showToast({
- title: res.msg || '验证失败',
+ title: res.message || '验证失败',
icon: 'none'
})
}
diff --git a/pages/setting/email.vue b/pages/setting/email.vue
index 6f0c8d9..3f8452c 100644
--- a/pages/setting/email.vue
+++ b/pages/setting/email.vue
@@ -49,11 +49,9 @@
} from "@/api/member"
import {
sendEmail,
- changeBind
+ changeBind,
+ validateCode
} from "@/api/setting/password"
- import {
- verifyCodeApi
- } from "@/api/start/login"
const iSMT = ref(0)
const email = ref('')
@@ -75,7 +73,7 @@
}
})
- const changeAccount = () => {
+ const changeAccount = async () => {
if (!userEmail) {
uni.showToast({
title: '请输入邮箱',
@@ -92,17 +90,18 @@
return
}
- const res1 = verifyCodeApi({
+ const res1 = await validateCode({
loginType: 'EMAIL',
- account: userEmail.value,
+ account: email.value,
verifyCode: verifyCode.value
})
-
+ console.log('校验码的结果',res1.code)
if (res1.code === 200) {
- const res2 = changeBind({
+ const res2 = await changeBind({
verificateType: 0,
account: userEmail.value
})
+ console.log('换绑的结果',res2.code)
if (res2.code === 200) {
uni.showToast({
title: '绑定成功',
@@ -111,6 +110,7 @@
uni.navigateTo({
url: '/pages/home/member'
})
+
} else {
uni.showToast({
title: '用户绑定失败',
@@ -142,7 +142,7 @@
}
}, 1000)
sendEmail({
- email: userEmail.value
+ email: email.value
})
}
diff --git a/pages/setting/general.vue b/pages/setting/general.vue
index d60d59d..00b4b7f 100644
--- a/pages/setting/general.vue
+++ b/pages/setting/general.vue
@@ -2,11 +2,11 @@
-
+
字体大小
@@ -18,12 +18,12 @@
-
+
@@ -107,7 +107,7 @@ onMounted(() => {