修改个人信息

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
 	})
 }

pages/home/member.vue

@@ -2,9 +2,9 @@
 	 <LoginPrompt ref="loginwPrompt"></LoginPrompt>
   <view class="main">
     <view class="top">
-      <view class="bell">
+      <!-- <view class="bell">
         <image class="image-bell" src="/static/my/bell.png"></image>
-      </view>
+      </view> -->
       <view class="msg">
         <view class="msg-left">
           <view class="avatar"></view>
@@ -24,47 +24,47 @@
 
 			<view class="settings-buttons">
 				<view class="setting-btn" @click="goToMarket">
-          <image src="/static/my/MarketSettings.png" class="setting-icon"/>
+					<image src="/static/my/MarketSettings.png" class="setting-icon" />
 					<text>行情设置</text>
 				</view>
 				<view class="setting-btn" @click="goToGeneral">
-          <image src="/static/my/Settings.png" class="setting-icon"/>
+					<image src="/static/my/Settings.png" class="setting-icon" />
 					<text>通用设置</text>
 				</view>
 			</view>
 
 			<view class="share" @click="goToShare">
-        <image class="img-share" src="/static/my/share.png" mode="widthFix"/>
+				<image class="img-share" src="/static/my/share.png" mode="widthFix" />
 			</view>
 		</view>
 		<view class="bottom">
 			<view class="list-item" @click="goToAccount">
-        <image src="/static/my/security.png" class="list-icon"/>
+				<image src="/static/my/security.png" class="list-icon" />
 				<text>账号与安全</text>
-        <uni-icons type="arrowright" size="16" class="arrow"/>
+				<uni-icons type="arrowright" size="16" class="arrow" />
 			</view>
-      <view class="list-item">
-        <image src="/static/my/connection.png" class="list-icon"/>
+			<!-- <view class="list-item">
+				<image src="/static/my/connection.png" class="list-icon" />
 				<text>联系我们</text>
-        <uni-icons type="arrowright" size="16" class="arrow"/>
+				<uni-icons type="arrowright" size="16" class="arrow" />
 			</view>
 			<view class="list-item" @click="goToNewVersion">
-        <image src="/static/my/update.png" class="list-icon"/>
+				<image src="/static/my/update.png" class="list-icon" />
 				<text>新版本更新</text>
 				<view class="update-tip">有新版本可更新
 					<view class="circle"></view>
 				</view>
-        <uni-icons type="arrowright" size="16" class="arrow"/>
+				<uni-icons type="arrowright" size="16" class="arrow" />
 			</view>
 			<view class="list-item">
-        <image src="/static/my/opinion.png" class="list-icon"/>
+				<image src="/static/my/opinion.png" class="list-icon" />
 				<text>意见反馈</text>
-        <uni-icons type="arrowright" size="16" class="arrow"/>
-      </view>
+				<uni-icons type="arrowright" size="16" class="arrow" />
+			</view> -->
 			<view class="list-item" @click="goToAbout">
-        <image src="/static/my/about.png" class="list-icon"/>
+				<image src="/static/my/about.png" class="list-icon" />
 				<text>关于DeepChart</text>
-        <uni-icons type="arrowright" size="16" class="arrow"/>
+				<uni-icons type="arrowright" size="16" class="arrow" />
 			</view>
 		</view>
 		<footerBar class="static-footer" :type="type"></footerBar>
@@ -72,61 +72,98 @@
 </template>
 
 <script setup>
-import {
+	import {
 		ref,
 		onMounted
-} from 'vue'
-import {
+	} from 'vue'
+	import {
 		ArrowRight
-} 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)
-const username = ref('')
-const dccode = ref('')
-
-const userInfoRes = ref()// 用户身份信息
-userInfoRes.value = getUserInfo()
-userInfoRes.value.then(res => {
+	} from '@element-plus/icons-vue'
+	import footerBar from '../../components/footerBar.vue'
+	import {
+		getUserInfo,
+		updateUserInfo
+	} from "@/api/member"
+	import {
+		useUserStore
+	} from "../../stores/modules/userInfo"
+	const userStore = useUserStore()
+
+	const type = ref('member')
+	const iSMT = ref(0)
+	const username = ref('')
+	const dccode = ref('')
+	const avatarUrl = ref('')
+	const isEditingName = ref(false)
+	const editingName = ref('')
+
+	const userInfoRes = ref() // 用户身份信息
+	userInfoRes.value = getUserInfo()
+	userInfoRes.value.then(res => {
 		username.value = res.data.dcname
 		dccode.value = res.data.dccode
+		avatarUrl.value = res.data.avatar
 		console.log('用户信息', userInfoRes.value)
-})
+	})
+
+	const startEditName = () => {
+		isEditingName.value = true
+		editingName.value = username.value
+	}
+
+	const finishEditName = async () => {
+		if (editingName.value.trim() === '' || editingName.value === username.value) {
+			isEditingName.value = false
+			return
+		}
+		try {
+			await updateUserInfo({
+				dcname: editingName.value
+			})
+			uni.showToast({
+				title: '昵称修改成功',
+				icon: 'none'
+			})
+		} catch (err) {
+			uni.showToast({
+				title: '修改失败，请重试',
+				icon: 'none'
+			})
+		} finally {
+			isEditingName.value = false
+		}
+	}
 
 
-const goToGeneral = () => {
+	const goToGeneral = () => {
 		uni.navigateTo({
 			url: '/pages/setting/general'
 		})
-}
+	}
 
-const goToMarket = () => {
+	const goToMarket = () => {
 		uni.navigateTo({
 			url: '../setting/market'
 		})
-}
+	}
 
-const goToAccount = () => {
+	const goToAccount = () => {
 		uni.navigateTo({
 			url: '../setting/account'
 		})
-}
+	}
 
-const goToNewVersion = () => {
+	const goToNewVersion = () => {
 		uni.navigateTo({
 			url: '../setting/newVersion'
 		})
-}
+	}
 
-const goToAbout = () => {
+	const goToAbout = () => {
 		uni.navigateTo({
 			url: '../setting/about'
 		})
-}
+	}
 
 const goToShare = () => {
   console.log('用户信息==========',userStore.userInfo.isVisitor)
@@ -142,99 +179,100 @@ const goToShare = () => {
   })
 }
 
-onMounted(() => {
+	onMounted(() => {
 		// 状态栏高度
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight
 		console.log('??????????????', iSMT.value)
-  console.log('通信来的用户身份',userStore.userInfo)
-})
+		console.log('通信来的用户身份', userStore.userInfo)
+	})
 </script>
 
 <style scoped>
-.static-footer {
+	.static-footer {
 		position: fixed;
 		bottom: 0;
-}
+	}
 
-.top {
+	.top {
 		height: 50vh;
 		background-color: white;
-}
+	}
 
-.bell {
+	.bell {
 		height: 9.6vh;
 		display: flex;
 		align-items: flex-end;
 		justify-content: flex-end;
 		padding-right: 50rpx;
-}
+	}
 
-.image-bell {
+	.image-bell {
 		width: 26rpx;
 		height: 32rpx;
-}
+	}
 
-.msg {
+	.msg {
 		height: 10.7vh;
 		display: flex;
 		margin-top: 3vh;
 		margin-bottom: 3vh;
-}
+	}
 
-.msg-left {
+	.msg-left {
 		width: 252rpx;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
+	}
 
-.avatar {
+	.avatar {
 		width: 175rpx;
 		height: 175rpx;
 		border-radius: 50%;
 		background-color: black;
-}
+	}
 
-.msg-center {
+	.msg-center {
 		width: 388rpx;
 		padding-left: 2.5vh;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-}
+	}
 
-.userInfo {
-  font-size: 20px;
-}
+	.userInfo {
+		font-size: 30rpx;
+		font-weight: bold;
+	}
 
-.userId {
+	.userId {
 		font-size: 14px;
 		margin-top: 1vh;
-}
+	}
 
-.image-editName {
+	.image-editName {
 		width: 40rpx;
 		height: 40rpx;
 		margin-left: 15rpx;
-}
+	}
 
-.msg-right {
+	.msg-right {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-}
+	}
 
-.image-attendance {
+	.image-attendance {
 		width: 43rpx;
 		height: 43rpx;
-}
+	}
 
-.settings-buttons {
+	.settings-buttons {
 		display: flex;
 		justify-content: space-around;
-}
+	}
 
-.setting-btn {
+	.setting-btn {
 		width: 349rpx;
 		height: 135rpx;
 		display: flex;
@@ -243,75 +281,79 @@ onMounted(() => {
 		background-color: rgb(243, 243, 243);
 		border-radius: 8%;
 		margin-bottom: 1vh;
-}
+	}
 
-.setting-icon {
+	.setting-icon {
 		width: 64.7rpx;
 		height: 64.7rpx;
 		margin-right: 25rpx;
-}
+	}
 
-.setting-btn text {
+	.setting-btn text {
 		font-size: 28rpx;
 		font-weight: bold;
 		color: #333;
-}
+	}
 
-.share {
+	.share {
 		height: 12.6vh;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
+	}
 
-.img-share {
+	.img-share {
 		width: 720rpx;
 		height: 160rpx;
-}
+	}
 
-.bottom {
+	.bottom {
 		height: 44.5vh;
 		margin-top: 1vh;
 		background-color: rgb(255, 255, 255);
-}
+	}
 
-.list-item {
+	.list-item {
 		width: 670rpx;
 		height: 7vh;
 		display: flex;
 		align-items: center;
 		margin: 0rpx 40rpx;
 		border-bottom: 1rpx solid #eee;
-}
+	}
 
-.list-item:last-child {
+	.list-item:last-child {
 		border-bottom: none;
-}
+	}
 
-.list-icon {
+	.list-icon {
 		width: 42rpx;
 		height: 42rpx;
 		margin-right: 18rpx;
-}
+	}
 
-.arrow {
+	.arrow {
 		margin-left: auto;
-}
+	}
 
-.update-tip {
+	.update-tip {
 		display: flex;
 		color: #999;
 		font-size: 24rpx;
 		align-items: center;
 		margin-left: 200rpx;
 		justify-content: center;
-}
+	}
 
-.circle {
+	.circle {
 		width: 10rpx;
 		height: 10rpx;
 		border-radius: 50%;
 		background-color: red;
 		margin-left: 10rpx;
-}
+	}
+
+	.edit-input {
+		background-color: #999;
+	}
 </style>

pages/setting/about.vue

@@ -12,7 +12,7 @@
 				<text class="label">产品介绍</text>
 				<uni-icons type="arrowright" size="16" />
 			</view>
-			<view class="bottom-list">
+<!-- 			<view class="bottom-list">
 				<text class="label">免责声明</text>
 				<uni-icons type="arrowright" size="16" />
 			</view>
@@ -27,7 +27,7 @@
 			<view class="bottom-list">
 				<text class="label">鼓励一下</text>
 				<uni-icons type="arrowright" size="16" />
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -61,7 +61,7 @@
 	}
 
 	.bottom {
-		height: 35vh;
+		height: 7vh;
 		background-color: white;
 	}
 

pages/setting/account.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="main">
-		<view :style="{height:iSMT+'px'}"></view>
+		<view :style="{ height: iSMT + 'px' }"></view>
 
 		<view style="height:1.5vh;"></view>
 
@@ -8,15 +8,15 @@
 			<view class="setting-item">
 				<text class="item-label">头像</text>
 				<view class="item-right">
-					<image src="/static/avatar.png" class="avatar" mode="aspectFill"></image>
-					<uni-icons type="arrowright" size="16"></uni-icons>
+					<image class="avatar" :src="avatarUrl || 'https://d31zlh4on95l9h.cloudfront.net/default/1961d9d2e31e78e47e885231e7514a35.png'" mode="aspectFill" />
+					<!-- <uni-icons type="arrowright" size="16"></uni-icons> -->
 				</view>
 			</view>
 			<view class="setting-item">
 				<text class="item-label">昵称</text>
 				<view class="item-right">
-					<text class="item-text">{{userInfoRes.dcname}}</text>
-					<uni-icons type="arrowright" size="16"></uni-icons>
+					<text class="item-text">{{ userInfoRes.dcname }}</text>
+					<!-- <uni-icons type="arrowright" size="16"></uni-icons> -->
 				</view>
 			</view>
 			<view class="setting-item">
@@ -33,7 +33,7 @@
 			</view>
 			<view class="setting-item">
 				<text class="item-label">注销账号</text>
-				<uni-icons type="arrowright" size="16"></uni-icons>
+				<!-- <uni-icons type="arrowright" size="16"></uni-icons> -->
 			</view>
 			<view class="setting-item" @click="goToBind">
 				<text class="item-label">绑定账号</text>
@@ -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({

pages/setting/bind.vue

@@ -5,7 +5,7 @@
 		<view style="height:1.5vh;" />
 
 		<view class="top">
-			<view class="top-list" @click="goToBindPhone">
+			<!-- <view class="top-list" @click="goToBindPhone">
 				<text class="label">手机号</text>
 				<view class="right">
 					<text style="font-size: 28rpx;">
@@ -13,7 +13,7 @@
 					</text>
 					<uni-icons type="arrowright" size="16" />
 				</view>
-			</view>
+			</view> -->
 
 			<view class="top-list" @click="goToBindEmail">
 				<text class="label">邮箱</text>

pages/setting/createPwd.vue

@@ -4,7 +4,7 @@
 
 		<view class="tab">
 			<view class="tab-item" :class="{active: activeTab === 'email'}" @click="activeTab = 'email'">邮箱</view>
-			<view class="tab-item" :class="{active: activeTab === 'phone'}" @click="activeTab = 'phone'">手机号</view>
+			<!-- <view class="tab-item" :class="{active: activeTab === 'phone'}" @click="activeTab = 'phone'">手机号</view> -->
 		</view>
 
 		<view class="switch-tab">
@@ -83,8 +83,7 @@
 
 	}
 
-	const goToPwdNext = async () => {
-		console.log('发请求之前的activeTab', activeTab.value)
+const goToPwdNext = async () => {
 	if (activeTab.value === 'email') {
 		if (!userEmail.value) {
 			uni.showToast({
@@ -93,7 +92,7 @@
 			})
 			return
 		}
-		} else {
+		}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'
 				})
 			}

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
 		})
 	}
 

pages/setting/general.vue

@@ -2,11 +2,11 @@
   <view class="main">
     <view :style="{height:iSMT+'px'}"></view>
     <view class="top">
-      <view class="top-list">
+<!--      <view class="top-list">
         <text class="label">语言</text>
         <text class="language">{{settingRes.language}}</text>
         <uni-icons type="arrowright" size="16" />
-      </view>
+      </view> -->
       <view class="top-list" @click="goToFont">
         <text class="label">字体大小</text>
         <uni-icons type="arrowright" size="16" />
@@ -18,12 +18,12 @@
     </view>
 
 
-    <view class="center">
+    <!-- <view class="center">
       <view class="center-list" @click="goToMessage">
         <text class="label">消息推送</text>
         <uni-icons type="arrowright" size="16" />
       </view>
-    </view>
+    </view> -->
 
     <view class="bottom">
       <view class="bottom-list" @click="goToServer">
@@ -107,7 +107,7 @@ onMounted(() => {
 <style>
 .top {
   margin-top: 1.5vh;
-  height: 21vh;
+  height: 14vh;
   background-color: white;
 }
 

pages/setting/market.vue

@@ -47,12 +47,12 @@
 				</view>
 				<view 
 					class="option-btn" 
-					:class="{ 'active': kStyle === 'Outline' }" 
-					@click="handleKStyleChange('Outline')"
+					:class="{ 'active': kStyle === 'outline' }" 
+					@click="handleKStyleChange('outline')"
 				>
 					<image src="../../static/my/outline.png" class="kline-icon" />
 					<text>轮廓图</text>
-					<view class="active-dot" v-if="kStyle === 'Outline'"></view>
+					<view class="active-dot" v-if="kStyle === 'outline'"></view>
 				</view>
 				<view 
 					class="option-btn" 
@@ -85,11 +85,11 @@
 				</view>
 				<view 
 					class="option-btn" 
-					:class="{ 'active': exRights === 'Weighted' }" 
-					@click="handleExRightsChange('Weighted')"
+					:class="{ 'active': exRights === 'weighted' }" 
+					@click="handleExRightsChange('weighted')"
 				>
 					<text>加权</text>
-					<view class="active-dot" v-if="exRights === 'Weighted'"></view>
+					<view class="active-dot" v-if="exRights === 'weighted'"></view>
 				</view>
 			</view>
 
@@ -97,14 +97,14 @@
 			<view class="top-options">
 				<view 
 					class="option-btn" 
-					:class="{ 'active': rfColor === 'green' }" 
-					@click="handleRfColorChange('green')"
+					:class="{ 'active': rfColor === 'greenUp' }" 
+					@click="handleRfColorChange('greenUp')"
 				>
 					<view class="color-icon">
 						<image src="../../static/my/greenRise.png" class="kline-icon" />
 					</view>
 					<text>绿涨红跌</text>
-					<view class="active-dot" v-if="rfColor === 'green'"></view>
+					<view class="active-dot" v-if="rfColor === 'greenUp'"></view>
 				</view>
 				<view 
 					class="option-btn" 
@@ -115,7 +115,7 @@
 						<image src="../../static/my/redRise.png" class="kline-icon" />
 					</view>
 					<text>红涨绿跌</text>
-					<view class="active-dot" v-if="rfColor === 'red'"></view>
+					<view class="active-dot" v-if="rfColor === 'redUp'"></view>
 				</view>
 			</view>
 
@@ -145,7 +145,7 @@
 			</view>
 		</view>
 
-		<view class="indicator-title">
+<!-- 		<view class="indicator-title">
 			<text>指标设置</text>
 		</view>
 		<view class="indicator-list">
@@ -157,7 +157,7 @@
 				</view>
 			</view>
 			<view style="height:10vh;background-color: white;"></view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -167,9 +167,9 @@
 
 	const iSMT = ref(0)
 	const aStockBid = ref('auto')    // A股竞价：auto/open/close
-	const kStyle = ref('common')     // K线样式：common/Outline/polylines
-	const exRights = ref('exRights') // 除权类型：exRights/normal/Weighted
-	const rfColor = ref('green')     // 涨跌颜色：green/red
+	const kStyle = ref('common')     // K线样式：common/outline/polylines
+	const exRights = ref('exRights') // 除权类型：exRights/normal/weighted
+	const rfColor = ref('greenUp')     // 涨跌颜色：greenUp/redUp
 	const indexCount = ref(1)        // 副图个数：1/2/3
 	const indicatorList = ref(['K线', '均线', '成交量', 'KDJ', 'MACD', 'RSI'])
 
@@ -180,7 +180,7 @@
 	      aStockBid.value = res.data.auctionDisplay ?? 'auto'
 	      kStyle.value = res.data.klineStyle ?? 'common'
 	      exRights.value = res.data.rightsIssueType ?? 'exRights'
-	      rfColor.value = res.data.priceColorScheme ?? 'green'
+	      rfColor.value = res.data.priceColorScheme ?? 'greenUp'
 	      indexCount.value = res.data.subChartCount ?? 1
 	    }
 	  } catch (err) {

pages/setting/password.vue

@@ -4,7 +4,7 @@
 
 		<view class="tab">
 			<view class="tab-item" :class="{active: activeTab === 'email'}" @click="activeTab = 'email'">邮箱</view>
-			<view class="tab-item" :class="{active: activeTab === 'phone'}" @click="activeTab = 'phone'">手机号</view>
+			<!-- <view class="tab-item" :class="{active: activeTab === 'phone'}" @click="activeTab = 'phone'">手机号</view> -->
 		</view>
 
 		<view class="switch-tab">