跳转问题

# Conflicts:
#	pages/home/member.vue

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

components/IndexCard.vue

@@ -18,9 +18,8 @@
     </view>
 
     <view class="chart-container">
-      <view class="mini-chart" :style="{ backgroundColor: chartBgColor }">
-        <!-- 这里可以放置实际的图表组件，目前用简单的波浪线表示 -->
-        <view class="chart-line" :style="{ borderColor: priceColor }"></view>
+      <view class="mini-chart" >
+        <image class="time-chart" :src="timeChart" mode="aspectFit"></image>
       </view>
     </view>
   </view>
@@ -97,10 +96,14 @@ const priceColor = computed(() => {
   return props.isRising ? "#00C853" : "#FF1744";
 });
 
-// 计算图表背景色
-const chartBgColor = computed(() => {
-  return props.isRising ? "#E8F5E8" : "#FFEBEE";
+const timeChart = computed(() => {
+  return props.isRising ? "/static/marketSituation-image/upTimeChart.png" : "/static/marketSituation-image/downTimeChart.png";
 });
+
+// 计算图表背景色
+// const chartBgColor = computed(() => {
+//   return props.isRising ? "#E8F5E8" : "#FFEBEE";
+// });
 </script>
 
 <style scoped>
@@ -182,40 +185,8 @@ const chartBgColor = computed(() => {
   border-radius: 8rpx;
 }
 
-.chart-line {
-  position: absolute;
-  bottom: 20rpx;
-  left: 10rpx;
-  right: 10rpx;
-  height: 2rpx;
-  border-top: 2rpx solid;
-  border-style: solid;
-}
-
-/* 添加一些波浪效果 */
-.chart-line::before {
-  content: "";
-  position: absolute;
-  top: -10rpx;
-  left: 20%;
-  width: 20rpx;
-  height: 20rpx;
-  border: 2rpx solid;
-  border-color: inherit;
-  border-radius: 50%;
-  background: transparent;
-}
-
-.chart-line::after {
-  content: "";
-  position: absolute;
-  top: -6rpx;
-  right: 30%;
-  width: 12rpx;
-  height: 12rpx;
-  border: 2rpx solid;
-  border-color: inherit;
-  border-radius: 50%;
-  background: transparent;
+.time-chart {
+  width: 100%;
+  height: 100%;
 }
 </style>

components/h-loading.vue

@@ -0,0 +1,54 @@
+<!-- @format -->
+
+<template>
+  <view v-if="loading" class="loading">
+    <image class="loadingGif" src="/static/loading-gif.gif" mode=""></image>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted,watch } from "vue";
+
+// 定义 props
+const props = defineProps({
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const loading = ref(false);
+
+// 监听 props.loading 变化
+watch(() => props.loading, (newVal) => {
+  loading.value = newVal;
+});
+
+// 生命周期
+onMounted(() => {
+  loading.value = props.loading;
+});
+</script>
+
+<style scoped>
+.loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.loadingGif {
+  width: 100rpx;
+  height: 100rpx;
+}
+</style>

pages/deepExploration/MainForceActions.vue

@@ -41,7 +41,30 @@
 							<qiun-data-charts type="candle" :opts="opts" :chartData="chartData" :disableScroll="true"
 								:ontouch="true" :onzoom="true" :key="chartKey" />
 						</view>
-						<image src="/static/deepExploration-images/kLineAll.png" mode="aspectFill"></image>
+						<image @click.stop="showFullscreenKline" src="/static/deepExploration-images/kLineAll.png"
+							mode="aspectFill"></image>
+					</view>
+				</view>
+
+
+				<!-- 全屏横屏弹窗 -->
+				<view class="fullscreen-mask" v-if="isFullscreen" @click="closeFullscreen">
+					<view class="fullscreen-container" :style="{ transform: isLandscape ? 'rotate(90deg)' : '' }">
+						<!-- 关闭按钮 -->
+						<view class="fullscreen-close" @click.stop="closeFullscreen">
+							<image src="/static/icons/close.png" mode="widthFix"></image>
+						</view>
+
+						<!-- 横屏切换按钮 -->
+						<view class="fullscreen-rotate" @click.stop="toggleOrientation">
+							<image src="/static/icons/rotate.png" mode="widthFix"></image>
+						</view>
+
+						<!-- 全屏K线图 -->
+						<view class="fullscreen-chart">
+							<qiun-data-charts type="candle" :opts="fullscreenOpts" :chartData="chartData"
+								:key="fullscreenChartKey" />
+						</view>
 					</view>
 				</view>
 				<view class="txt">
@@ -107,6 +130,37 @@
 	//登录弹窗提示ref
 	const loginPrompt = ref(null)
 
+	// 全屏相关状态
+	const isFullscreen = ref(false); // 是否显示全屏弹窗
+	const isLandscape = ref(true); // 是否横屏模式
+	const fullscreenChartKey = ref(0); // 全屏图表重绘标识
+
+
+
+	// 显示全屏K线
+	const showFullscreenKline = () => {
+		isFullscreen.value = true;
+		isLandscape.value = true; // 默认横屏
+		// 强制重绘图表
+		setTimeout(() => {
+			fullscreenChartKey.value++;
+		}, 100);
+	};
+
+	// 关闭全屏
+	const closeFullscreen = () => {
+		isFullscreen.value = false;
+	};
+
+	// 切换横竖屏
+	const toggleOrientation = () => {
+		isLandscape.value = !isLandscape.value;
+		// 旋转后重绘图表
+		setTimeout(() => {
+			fullscreenChartKey.value++;
+		}, 300);
+	};
+
 	// 响应式变量定义
 	const type = ref('deepExploration')
 	const iSMT = ref(0)
@@ -495,6 +549,28 @@
 		}
 	})
 	
+	// 全屏图表配置（继承原有配置并优化）
+	const fullscreenOpts = ref({
+		...opts.value, // 复用原有配置
+		padding: [30, 30, 30, 30],
+		xAxis: {
+			...opts.value.xAxis,
+			labelCount: 8, // 横屏显示更多标签
+			fontSize: 12
+		},
+		yAxis: {
+			...opts.value.yAxis,
+			fontSize: 12
+		},
+		extra: {
+			...opts.value.extra,
+			candle: {
+				...opts.value.extra.candle,
+				width: 12 // 横屏时K线宽度增加
+			}
+		}
+	});
+
 	// 2. K线图数据（响应式定义）
 	const chartData = ref({
 		categories: [],
@@ -548,6 +624,7 @@
 	let unwatch = null;
 	// 生命周期钩子：组件挂载后执行（替代onReady）
 	onMounted(async () => {
+
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight
 		getUserInfo()
 		await handleModels()
@@ -571,7 +648,8 @@
 
 				//k线
 				if (historyData.value.stockData.chartData.categories.length > 1) { // 确保至少保留一个日期
-					historyData.value.stockData.chartData.categories[historyData.value.stockData.chartData.categories.length - 1] = ''; // 删除最后一个日期
+					historyData.value.stockData.chartData.categories[historyData.value.stockData.chartData
+						.categories.length - 1] = ''; // 删除最后一个日期
 				}
 				chartData.value = {
 					...JSON.parse(JSON.stringify(historyData.value.stockData.chartData))
@@ -597,7 +675,7 @@
 	// 页面加载时执行
 	onLoad((e) => {
 		if (e.index) {
-			// currentIndex.value = e.index - 1
+			currentIndex.value = e.index - 1
 			console.log('模块：', currentIndex.value)
 		}
 		if (e.stockName) {
@@ -787,6 +865,79 @@
 					}
 				}
 				
+				/* 横屏按钮样式 */
+				.rotate-btn {
+					background: transparent;
+					padding: 0 10rpx;
+					margin-left: 15rpx;
+					
+					.btn-icon {
+						width: 36rpx;
+						height: 36rpx;
+						vertical-align: middle;
+					}
+				}
+				
+				/* 全屏遮罩 */
+				.fullscreen-mask {
+					position: fixed;
+					top: 0;
+					left: 0;
+					width: 100vw;
+					height: 100vh;
+					background-color: #000;
+					z-index: 9999;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+				/* 全屏容器 */
+				.fullscreen-container {
+					width: 100vh;  /* 横屏时宽度等于屏幕高度 */
+					height: 100vw; /* 横屏时高度等于屏幕宽度 */
+					transition: transform 0.3s ease;
+					position: relative;
+				}
+				
+				/* 关闭按钮 */
+				.fullscreen-close {
+					position: absolute;
+					top: 20rpx;
+					right: 20rpx;
+					z-index: 10;
+					
+					image {
+						width: 48rpx;
+						height: 48rpx;
+					}
+				}
+				
+				/* 旋转按钮 */
+				.fullscreen-rotate {
+					position: absolute;
+					top: 20rpx;
+					left: 20rpx;
+					z-index: 10;
+					
+					image {
+						width: 48rpx;
+						height: 48rpx;
+					}
+				}
+				
+				/* 全屏图表容器 */
+				.fullscreen-chart {
+					width: 100%;
+					height: 100%;
+				}
+				
+				/* 竖屏模式适配 */
+				:deep(.fullscreen-container:not([style*="rotate(90deg)"])) {
+					width: 100vw;
+					height: 100vh;
+				}
+
 				.txt {
 					background-color: #F3F3F3;
 					margin-top: 48rpx;

pages/home/member.vue

@@ -1,18 +1,26 @@
 <template>
-	 <LoginPrompt ref="loginwPrompt"></LoginPrompt>
+	<LoginPrompt ref="loginPrompt"></LoginPrompt>
 	<view class="main">
 		<view class="top">
 			<view class="bell">
-        <image class="image-bell" src="/static/my/bell.png"></image>
+				<!-- <image class="image-bell" src="/static/my/bell.png" /> -->
 			</view>
 			<view class="msg">
 				<view class="msg-left">
-          <view class="avatar"></view>
+					<image class="avatar"
+						:src="avatarUrl || 'https://d31zlh4on95l9h.cloudfront.net/default/1961d9d2e31e78e47e885231e7514a35.png'"
+						mode="aspectFill" />
 				</view>
 				<view class=" msg-center">
 					<view style="display: flex;">
+						<template v-if="!isEditingName">
 							<view class="userInfo">{{ username }}</view>
-            <image class="image-editName" src="/static/my/editName.png"></image>
+							<image class="image-editName" src="/static/my/editName.png" @click="startEditName" />
+						</template>
+						<template v-else>
+							<input v-model="editingName" class="edit-input" @blur="finishEditName"
+								@keyup.enter="finishEditName" autofocus placeholder="请输入用户名" />
+						</template>
 					</view>
 					<view class="userId">ID:{{ dccode }}</view>
 				</view>
@@ -43,7 +51,7 @@
 				<text>账号与安全</text>
 				<uni-icons type="arrowright" size="16" class="arrow" />
 			</view>
-      <view class="list-item">
+			<!-- <view class="list-item">
 				<image src="/static/my/connection.png" class="list-icon" />
 				<text>联系我们</text>
 				<uni-icons type="arrowright" size="16" class="arrow" />
@@ -60,7 +68,7 @@
 				<image src="/static/my/opinion.png" class="list-icon" />
 				<text>意见反馈</text>
 				<uni-icons type="arrowright" size="16" class="arrow" />
-      </view>
+			</view> -->
 			<view class="list-item" @click="goToAbout">
 				<image src="/static/my/about.png" class="list-icon" />
 				<text>关于DeepChart</text>
@@ -80,23 +88,60 @@ import {
 		ArrowRight
 	} from '@element-plus/icons-vue'
 	import footerBar from '../../components/footerBar.vue'
-import {getUserInfo} from "@/api/member"
-import { useUserStore } from "../../stores/modules/userInfo"
+	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 = () => {
 		uni.navigateTo({
@@ -204,7 +249,8 @@ onMounted(() => {
 	}
 
 	.userInfo {
-  font-size: 20px;
+		font-size: 30rpx;
+		font-weight: bold;
 	}
 
 	.userId {
@@ -314,4 +360,8 @@ onMounted(() => {
 		background-color: red;
 		margin-left: 10rpx;
 	}
+
+	.edit-input {
+		background-color: #999;
+	}
 </style>

pages/marketSituation/globalIndex.vue

@@ -2,6 +2,8 @@
 
 <template>
   <view class="main">
+    <!-- 加载中 -->
+    <h-loading :loading="loading"></h-loading>
     <!-- 固定头部 -->
     <view class="header_fixed" :style="{ top: iSMT + 'px' }">
       <view class="header_content">
@@ -69,6 +71,7 @@ import { ref, onMounted, onUnmounted, computed, nextTick, watch } from "vue";
 import { onShow, onHide } from "@dcloudio/uni-app";
 import footerBar from "../../components/footerBar.vue";
 import IndexCard from "../../components/IndexCard.vue";
+import hLoading from "@/components/h-loading.vue";
 import { getRegionalGroupAPI } from "../../api/marketSituation/marketSituation.js";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
 const marketSituationStore = useMarketSituationStore();
@@ -78,7 +81,7 @@ const contentHeight = ref(0);
 const headerHeight = ref(0); // 头部高度
 const searchValue = ref(""); // 搜索值
 const isWarnTextOverflow = ref(false); // warn文字是否溢出
-
+const loading = ref(false);
 // 数据状态加载
 const isDataLoaded = ref(false);
 
@@ -160,11 +163,14 @@ const viewIndexDetail = (item, parentIndex, index) => {
 
 const getRegionalGroup = async () => {
   try {
+    loading.value = true;
     const result = await getRegionalGroupAPI();
     globalIndexArray.value = result.data;
     marketSituationStore.gloablCardData = result.data;
+    loading.value = false;
   } catch (e) {
     console.log("获取区域指数失败", e);
+    loading.value = false;
   }
 };
 

pages/marketSituation/marketDetail.vue

@@ -2,6 +2,8 @@
 
 <template>
   <view class="main">
+    <!-- 加载中 -->
+    <h-loading :loading="loading"></h-loading>
     <!-- 自定义导航栏 -->
     <view class="header_fixed" :style="{ top: iSMT + 'px' }">
       <view class="header-content">
@@ -65,8 +67,9 @@
 
 <script setup>
 import { ref, computed, onMounted, onUnmounted, nextTick, watch } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import footerBar from "@/components/footerBar.vue";
+import hLoading from "@/components/h-loading.vue";
 import { getRegionalGroupListAPI } from "../../api/marketSituation/marketSituation.js";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
 const marketSituationStore = useMarketSituationStore();
@@ -77,7 +80,7 @@ const headerHeight = ref(80);
 const marketTitle = ref();
 const sortType = ref(""); // 排序类型：'price' 或 'change'
 const sortOrder = ref("desc"); // 排序顺序：'asc' 或 'desc'
-
+const loading = ref(false);
 const regionalGroupArray = ref([]);
 
 // 计算属性
@@ -111,13 +114,16 @@ const judgeSymbol = (num) => {
 
 const getRegionalGroupList = async () => {
   try {
+    loading.value = true;
     const result = await getRegionalGroupListAPI({
       name: marketTitle.value,
     });
     regionalGroupArray.value = result.data;
     marketSituationStore.marketDetailCardData = result.data;
+    loading.value = false;
   } catch (e) {
     console.error("获取区域分组列表失败:", e);
+    loading.value = false;
   }
 };
 
@@ -430,15 +436,26 @@ const startTcp = () => {
   }
 };
 
-// 页面加载时接收参数
-onLoad(async (options) => {
-  if (options && options.market) {
-    marketTitle.value = options.market;
+onShow(async () => {
+  console.log("显示页面");
   await getRegionalGroupList();
   initTcpListeners();
   await nextTick();
   // 开始连接
   startTcp();
+});
+
+onHide(() => {
+  console.log("隐藏页面");
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
+// 页面加载时接收参数
+onLoad(async (options) => {
+  if (options && options.market) {
+    marketTitle.value = options.market;
   }
 });
 

pages/marketSituation/marketOverview.vue

@@ -2,14 +2,23 @@
 
 <template>
   <view class="main">
+    <h-loading :loading="loading"></h-loading>
     <!-- 可滚动内容区域 -->
     <scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
       <view class="content">
         <view class="map">
-          <view class="INDU">道琼斯<view :class="getSignClass(INDU.value)">{{ judgeSymbol(INDU.value) }}</view></view>
-          <view class="NDX">纳斯达克<view :class="getSignClass(NDX.value)">{{ judgeSymbol(NDX.value) }}</view></view>
-          <view class="HSI">恒生指数<view :class="getSignClass(HSI.value)">{{ judgeSymbol(HSI.value) }}</view></view>
-          <view class="CN">上证指数<view :class="getSignClass(CN.value)">{{ judgeSymbol(CN.value) }}</view></view>
+          <view class="INDU"
+            >道琼斯<view :class="getSignClass(INDU.value)">{{ judgeSymbol(INDU.value) }}</view></view
+          >
+          <view class="NDX"
+            >纳斯达克<view :class="getSignClass(NDX.value)">{{ judgeSymbol(NDX.value) }}</view></view
+          >
+          <view class="HSI"
+            >恒生指数<view :class="getSignClass(HSI.value)">{{ judgeSymbol(HSI.value) }}</view></view
+          >
+          <view class="CN"
+            >上证指数<view :class="getSignClass(CN.value)">{{ judgeSymbol(CN.value) }}</view></view
+          >
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
         <view class="global_index">
@@ -54,6 +63,7 @@ import { ref, onMounted, onUnmounted, watch, nextTick, computed } from "vue";
 import { onShow, onHide } from "@dcloudio/uni-app";
 import util from "../../common/util.js";
 import IndexCard from "../../components/IndexCard.vue";
+import hLoading from "@/components/h-loading.vue";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
 const marketSituationStore = useMarketSituationStore();
 import { getGlobalIndexAPI } from "../../api/marketSituation/marketSituation.js";
@@ -63,6 +73,7 @@ const searchValue = ref("");
 const contentHeight = ref(0);
 const headerHeight = ref(0); // 动态计算的header高度
 const isWarnTextOverflow = ref(false); // warn文字是否溢出
+const loading = ref(false);
 
 const INDU = ref({ stockName: "道琼斯", stockCode: "INDU", value: "" });
 const NDX = ref({ stockName: "纳斯达克", stockCode: "513300", value: "" });
@@ -91,13 +102,13 @@ const judgeSymbol = (num) => {
 };
 
 function getSignClass(value) {
-  const s = typeof value === 'string' ? value : String(value ?? '');
+  const s = typeof value === "string" ? value : String(value ?? "");
   const trimmed = s.trim();
-  if (trimmed.startsWith('-')) return 'index-down';
-  if (trimmed.startsWith('+')) return 'index-up';
+  if (trimmed.startsWith("-")) return "index-down";
+  if (trimmed.startsWith("+")) return "index-up";
   const n = parseFloat(trimmed);
-  if (!isNaN(n)) return n >= 0 ? 'index-up' : 'index-down';
-  return '';
+  if (!isNaN(n)) return n >= 0 ? "index-up" : "index-down";
+  return "";
 }
 
 // 搜索输入事件
@@ -185,10 +196,13 @@ const goToGlobalIndex = () => {
 
 const getGlobalIndex = async () => {
   try {
+    loading.value = true;
     const result = await getGlobalIndexAPI();
     globalIndexArray.value = result.data;
+    loading.value = false;
   } catch (e) {
     console.log("获取全球指数失败", e);
+    loading.value = false;
   }
 };
 

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

@@ -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>
+					<!-- <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">
@@ -84,7 +84,6 @@
 	}
 
 const goToPwdNext = async () => {
-		console.log('发请求之前的activeTab', activeTab.value)
 	if (activeTab.value === 'email') {
 		if (!userEmail.value) {
 			uni.showToast({
@@ -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">