diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 728c4a6..1c75694 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -4,7 +4,7 @@ { "customPlaygroundType" : "local", "packageName" : "io.dcloud.HBuilder", - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/pages/home/member.vue b/pages/home/member.vue index 5ea9e75..f1ffd25 100644 --- a/pages/home/member.vue +++ b/pages/home/member.vue @@ -16,10 +16,10 @@ ID:{{ dccode }} - + @@ -81,6 +81,8 @@ import { } from '@element-plus/icons-vue' import footerBar from '../../components/footerBar.vue' import {getUserInfo} from "@/api/member" +import { useUserStore } from "../../stores/modules/userInfo" +const userStore = useUserStore() const type = ref('member') const iSMT = ref(0) @@ -90,7 +92,7 @@ const dccode = ref('') const userInfoRes = ref()// 用户身份信息 userInfoRes.value = getUserInfo() userInfoRes.value.then(res => { - username.value = res.data.username + username.value = res.data.dcname dccode.value = res.data.dccode console.log('用户信息', userInfoRes.value) }) @@ -136,6 +138,7 @@ onMounted(() => { // 状态栏高度 iSMT.value = uni.getSystemInfoSync().statusBarHeight console.log('??????????????', iSMT.value) + console.log('通信来的用户身份',userStore.userInfo) }) @@ -146,7 +149,7 @@ onMounted(() => { } .top { - height: 47vh; + height: 50vh; background-color: white; } @@ -159,8 +162,8 @@ onMounted(() => { } .image-bell { - width: 13px; - height: 16px; + width: 26rpx; + height: 32rpx; } .msg { @@ -171,7 +174,7 @@ onMounted(() => { } .msg-left { - width: 33.6vw; + width: 252rpx; display: flex; justify-content: center; align-items: center; @@ -185,7 +188,7 @@ onMounted(() => { } .msg-center { - width: 51.7vw; + width: 388rpx; padding-left: 2.5vh; display: flex; flex-direction: column; @@ -204,11 +207,10 @@ onMounted(() => { .image-editName { width: 40rpx; height: 40rpx; - margin-left: 2vw; + margin-left: 15rpx; } .msg-right { - width: 14.7vw; display: flex; flex-direction: column; justify-content: center; @@ -232,6 +234,7 @@ onMounted(() => { justify-content: center; background-color: rgb(243, 243, 243); border-radius: 8%; + margin-bottom: 1vh; } .setting-icon { diff --git a/pages/setting/about.vue b/pages/setting/about.vue index d8146b1..2a0d56a 100644 --- a/pages/setting/about.vue +++ b/pages/setting/about.vue @@ -4,7 +4,7 @@ - + diff --git a/pages/setting/email.vue b/pages/setting/email.vue index cc39b5b..6f0c8d9 100644 --- a/pages/setting/email.vue +++ b/pages/setting/email.vue @@ -7,14 +7,14 @@ - + 已绑邮箱:{{ email }} - + @@ -27,8 +27,8 @@ - - + + @@ -51,11 +51,16 @@ sendEmail, changeBind } from "@/api/setting/password" + import { + verifyCodeApi + } from "@/api/start/login" + const iSMT = ref(0) const email = ref('') const gettingCode = ref(false) const time = ref(60) const userEmail = ref('') + const verifyCode = ref('') const userInfoPromise = getUserInfo() userInfoPromise.then(res => { @@ -71,20 +76,54 @@ }) const changeAccount = () => { - const res = changeBind({ - verificateType: 0, - account: userEmail.value - }) - if(res.code === 200){ + if (!userEmail) { uni.showToast({ - title: '绑定成功', - icon: 'none', + title: '请输入邮箱', + icon: 'none' + }) + return + } + + if (!verifyCode) { + uni.showToast({ + title: '请输入验证码', + icon: 'none' + }) + return + } + + const res1 = verifyCodeApi({ + loginType: 'EMAIL', + account: userEmail.value, + verifyCode: verifyCode.value + }) + + if (res1.code === 200) { + const res2 = changeBind({ + verificateType: 0, + account: userEmail.value }) - }else { + if (res2.code === 200) { + uni.showToast({ + title: '绑定成功', + icon: 'none', + }) + uni.navigateTo({ + url: '/pages/home/member' + }) + } else { + uni.showToast({ + title: '用户绑定失败', + icon: 'none', + }) + } + } else { uni.showToast({ - title: '用户绑定失败', + title: '验证失败,请检查验证码', icon: 'none', }) + + return } } @@ -182,4 +221,9 @@ align-items: center; justify-content: center; } + + .image { + width: 40rpx; + height: 40rpx; + } \ No newline at end of file diff --git a/pages/setting/introduce.vue b/pages/setting/introduce.vue index 6a5d07a..bb291d2 100644 --- a/pages/setting/introduce.vue +++ b/pages/setting/introduce.vue @@ -4,7 +4,7 @@ - + @@ -73,4 +73,9 @@ text-align: justify; text-justify: inter-character;/* 两端对齐哈哈哈哈 */ } + + .image{ + width:334rpx; + height:310rpx; + } \ No newline at end of file diff --git a/pages/setting/market.vue b/pages/setting/market.vue index 0524fd2..19bebfd 100644 --- a/pages/setting/market.vue +++ b/pages/setting/market.vue @@ -41,7 +41,7 @@ :class="{ 'active': kStyle === 'common' }" @click="handleKStyleChange('common')" > - + 普通 @@ -50,7 +50,7 @@ :class="{ 'active': kStyle === 'Outline' }" @click="handleKStyleChange('Outline')" > - + 轮廓图 @@ -59,7 +59,7 @@ :class="{ 'active': kStyle === 'polylines' }" @click="handleKStyleChange('polylines')" > - + 折线图 @@ -101,7 +101,7 @@ @click="handleRfColorChange('green')" > - + 绿涨红跌 @@ -112,7 +112,7 @@ @click="handleRfColorChange('red')" > - + 红涨绿跌 @@ -152,8 +152,8 @@ {{ item }} - - + + @@ -268,7 +268,6 @@ } .top-options { - height: 5.5vh; display: flex; padding: 0 40rpx; } @@ -300,6 +299,8 @@ .kline-icon { margin-right: 10rpx; font-size: 32rpx; + width:60rpx; + height:50rpx; } .color-icon { diff --git a/pages/setting/nextPwd.vue b/pages/setting/nextPwd.vue index 7d410d5..19562b4 100644 --- a/pages/setting/nextPwd.vue +++ b/pages/setting/nextPwd.vue @@ -13,19 +13,19 @@ - + - - + - @@ -157,13 +157,6 @@ onMounted(() => { justify-content: center; } -.img { - position: absolute; - right: 0; - top: 50%; - transform: translateY(-50%); -} - .tips { font-size: 24rpx; color: #999; @@ -172,4 +165,14 @@ onMounted(() => { align-self: flex-start; /* 这是左对齐 */ } + +.image-lock{ + width:40rpx; + height:40rpx; +} + +.image-eye{ + width:40rpx; + height:30rpx; +} \ No newline at end of file diff --git a/pages/setting/phone.vue b/pages/setting/phone.vue index a74c916..1d6405e 100644 --- a/pages/setting/phone.vue +++ b/pages/setting/phone.vue @@ -7,13 +7,13 @@ - + 已绑手机号:{{ phone }} - + +86 @@ -27,7 +27,7 @@ - + @@ -137,6 +137,7 @@ flex: 1; display: flex; align-items: center; + justify-content: left; } .label { @@ -182,4 +183,9 @@ align-items: center; justify-content: center; } + + .image{ + height:40rpx; + width:40rpx; + } \ No newline at end of file