Merge remote-tracking branch 'origin/lihuilin/feature-20251024095243-我的' into lihuilin/feature-20251024095243-我的

pages/home/member.vue

@@ -16,10 +16,10 @@
           </view>
           <view class="userId">ID:{{ dccode }}</view>
         </view>
-        <view class="msg-right">
+<!--        <view class="msg-right">
           <image class="image-attendance" src="/static/my/Check-in.png"/>
           <span style="font-size:10px;">签到</span>
-        </view>
+        </view> -->
       </view>
 
       <view class="settings-buttons">
@@ -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)
@@ -136,6 +138,7 @@ onMounted(() => {
   // 状态栏高度
   iSMT.value = uni.getSystemInfoSync().statusBarHeight
   console.log('??????????????', iSMT.value)
+  console.log('通信来的用户身份',userStore.userInfo)
 })
 </script>
 
@@ -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 {

pages/setting/email.vue

@@ -28,7 +28,7 @@
 			<view class="top-list">
 				<view class="left">
 					<image class="image" src="/static/my/verification.png" />
-					<input type="text" placeholder="请输入验证码" class="input" />
+					<input type="text" v-model="verifyCode" placeholder="请输入验证码" class="input" />
 				</view>
 			</view>
 		</view>
@@ -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,21 +76,55 @@
 	})
 
 	const changeAccount = () => {
-		const res = changeBind({
+		if (!userEmail) {
+			uni.showToast({
+				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
 			})
-		if(res.code === 200){
+			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: '验证失败，请检查验证码',
+				icon: 'none',
+			})
+
+			return
+		}
 	}
 
 	const getCode = () => {

pages/setting/introduce.vue

@@ -4,7 +4,7 @@
 
 		<view style="height:1.5vh" />
 		<view class="top">
-			<image class="image" src="/static/my/aboutDC.png"></image>
+			<image class="image" src="../../static/my/aboutDC.png"></image>
 		</view>
 
 		<view class="bottom">
@@ -21,10 +21,10 @@
 			<view class="main-text">从“人找信息”到“AI智能体替你思考和管理”。</view>
 
 			<view class="title">4.功能定位——全景AI决策体系</view>
-			<view class="main-text">黄其振是大笨蛋</view>
+<!-- 			<view class="main-text">黄其振是大笨蛋</view>
 			<view class="main-text">李建霖是大笨蛋</view>
 			<view class="main-text">double是大笨蛋</view>
-						<view class="main-text">张鲁平是大笨蛋</view>
+						<view class="main-text">张鲁平是大笨蛋</view> -->
 			<view style="height:1.5vh;background-color: white;" />
 		</view>
 	</view>