diff --git a/api/customerServicePlatform/customerServicePlatform.js b/api/customerServicePlatform/customerServicePlatform.js
index 0345ab0..042baf1 100644
--- a/api/customerServicePlatform/customerServicePlatform.js
+++ b/api/customerServicePlatform/customerServicePlatform.js
@@ -9,9 +9,24 @@ export const uploadImageApi = (data) => {
 	data
   })
 }
-
-//问题回答
-export const getAnswerApi = (data) => {
+//问题回答最终内容
+export const getAnswerContentApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/customer/getAnswer',
+	data
+  })
+}
+//问题回答轮询
+export const getAnswerStatusApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/customer/getState',
+	data
+  })
+}
+//问题回答获取Id
+export const getAnswerIdApi = (data) => {
   return http({
     method: 'POST',
     url: '/api/customer/askQuestion',
diff --git a/components/IndexCard.vue b/components/IndexCard.vue
index 8bd62df..ac5447a 100644
--- a/components/IndexCard.vue
+++ b/components/IndexCard.vue
@@ -63,7 +63,18 @@ const props = defineProps({
 });
 
 const judgeSymbol = (num) => {
-  return num[0] === "-" ? num : "+" + num;
+  // 兼容 undefined/null/数字/字符串
+  if (num === null || num === undefined) return '';
+  const n = Number(num);
+  if (!isNaN(n)) {
+    // 数值：正数加'+'，负数原样
+    return (n < 0 ? '' : '+') + n;
+  }
+  // 字符串：去空格后判断前缀
+  const s = String(num).trim();
+  if (s.startsWith('-')) return s;
+  if (s.startsWith('+')) return s;
+  return '+' + s;
 };
 
 const getMarketFlag = (market) => {
diff --git a/components/login-prompt.vue b/components/login-prompt.vue
index a7d0783..088ec4b 100644
--- a/components/login-prompt.vue
+++ b/components/login-prompt.vue
@@ -109,6 +109,7 @@ const continueAsVisitor = async () => {
   const res = await LoginApi({
     loginType: "VISITOR", //登录方式EMAIL,PHONE,DCCODE,APPLE,GOOGLE,VISITOR
     account: "", //登陆账号  手机号/邮箱/dccode
+    phoneCountry: "", //手机号所属地区
     verifyCode: "", //验证码
     password: "", //密码
     useCode: "", //是否使用验证码 true/false
diff --git a/pages/customerServicePlatform/questionDetail.vue b/pages/customerServicePlatform/questionDetail.vue
index 2bbba38..4a19766 100644
--- a/pages/customerServicePlatform/questionDetail.vue
+++ b/pages/customerServicePlatform/questionDetail.vue
@@ -14,7 +14,7 @@
 			</view>
 		</view>
 
-		<scroll-view scroll-y class="content-container">
+		<scroll-view scroll-y class="content-container" :scroll-into-view="scrollIntoView">
 
 			<view class="content-header">
 				<view class="content-header-area">
@@ -47,7 +47,7 @@
 					<view class="card-text">
 
 						<rich-text :nodes="renderMarkdown(answerContent)"></rich-text>
-
+						<view id="answer-end" style="width:1px;height:1px;"></view>
 						<!-- 		<text class="card-paragraph">
 							{{answerContent}}
 						</text> -->
@@ -66,7 +66,9 @@
 
 <script>
 	import {
-		getAnswerApi
+		getAnswerIdApi,
+		getAnswerStatusApi,
+		getAnswerContentApi
 	} from "../../api/customerServicePlatform/customerServicePlatform";
 	import marked from "marked"; // 引入 marked 库
 
@@ -78,12 +80,21 @@
 				questionTitle: '',
 				answerContent: '正在思考...',
 				showLoginRegister: false,
+				// 轮询句柄
+				pollInterval: null,
+				pollTimeout: null,
+				scrollIntoView: ''
 			};
 		},
 		mounted() {
 			this.iSMT = uni.getSystemInfoSync().statusBarHeight || 0;
 			this.getAnswerContent()
 		},
+		onUnload() {
+			clearInterval(this.pollInterval);
+			clearTimeout(this.pollTimeout);
+			clearInterval(this.interval);
+		},
 		onLoad(options) {
 			if (options.question) {
 				this.questionTitle = decodeURIComponent(options.question);
@@ -95,6 +106,18 @@
 			}
 		},
 		methods: {
+			scrollToBottom() {
+			    // 使用 $nextTick 保证 rich-text 的渲染/DOM 更新完成
+			    this.$nextTick(() => {
+			      // 先设置目标 id，scroll-view 会滚动使其可见
+			      this.scrollIntoView = 'answer-end';
+			
+			      // 清空值以便下次再次触发
+			      setTimeout(() => {
+			        this.scrollIntoView = '';
+			      }, 100);
+			    });
+			  },
 			renderMarkdown(content) {
 				const renderer = new marked.Renderer();
 				// renderer.heading = function (text, level) {
@@ -120,39 +143,102 @@
 			},
 			async getAnswerContent() {
 				let conversationId = '';
+				let chatId = '';
+				//尝试获取本地缓存
 				try {
 					const cache = uni.getStorageSync('conversationId');
+					const chatIdCache = uni.getStorageSync('chatId');
 					if (cache) conversationId = cache;
+					if (chatIdCache) chatId = chatIdCache
 				} catch (e) {
 					conversationId = '';
 				}
 				try {
-					const res = await getAnswerApi({
+					const res = await getAnswerIdApi({
 						question: this.questionTitle,
 						conversationId: conversationId,
+						chatId: chatId
 					})
 					console.log(res)
 
-					if (res.code == 200) {
-						uni.setStorageSync('conversationId', res.data.conversationId);
-						const answer = res.data.answer
-						// 流式输出逻辑
-						let currentIndex = 0;
-						const answerLength = answer.length;
+					if (res.code == 200 && res.data.chatId) {
+						const resConversationId = res.data.conversationId;
+						const resChatId = res.data.chatId;
+						uni.setStorageSync('conversationId', resConversationId);
+						uni.setStorageSync('chatId', resChatId);
+						let pollCount = 0;
+						const maxPoll = 10;
+						this.pollInterval && clearInterval(this.pollInterval);
+						this.pollTimeout && clearTimeout(this.pollTimeout);
+						// === 轮询函数 ===
+						const checkStatus = async () => {
+							pollCount++;
+							const pollRes = await getAnswerStatusApi({
+								conversationId: resConversationId,
+								chatId: resChatId
+							});
+
+							console.log("pollRes =>", pollRes);
+
+							const status = pollRes?.data;
+							//轮询结束，获取回答
+							if (status === "completed") {
+								clearInterval(this.pollInterval);
+								clearTimeout(this.pollTimeout);
+								//获取最终答案
+								const answerRes = await getAnswerContentApi({
+									conversationId: resConversationId,
+									chatId: resChatId
+								});
+
+								console.log("answerRes =>", answerRes);
+								const answer = answerRes?.data;
+								//打印机效果
+								if (answer) {
+									// 逐字输出
+									let currentIndex = 0;
+									const answerLength = answer.length;
+
+									this.interval && clearInterval(this.interval);
+									this.interval = setInterval(() => {
+										this.answerContent = answer.slice(0, currentIndex);
+										currentIndex++;
+										this.scrollToBottom();
+										if (currentIndex > answerLength) {
+											clearInterval(this.interval);
+											 this.scrollToBottom();
+										}
+									}, Math.floor(Math.random() * (150 - 30 + 1)) + 30);
+
+								} else {
+									this.answerContent = "获取回答失败，请重试";
+								}
+								return;
+							}
+							//超过10秒就回答失败
+							if (pollCount >= maxPoll) {
+								clearInterval(this.pollInterval);
+								clearTimeout(this.pollTimeout);
+								this.answerContent = "获取回答失败，请重试";
+								return;
+							}
 
-						// 每隔一定时间显示一部分内容
-						this.interval = setInterval(() => {
-							this.answerContent = answer.slice(0, currentIndex);
-							currentIndex++;
+						};
 
-							if (currentIndex > answerLength) {
-								clearInterval(this.interval);
-							}
-						}, Math.floor(Math.random() * (150 - 30 + 1)) + 30);
+						// 每 2 秒轮询
+						this.pollInterval = setInterval(checkStatus, 2000);
+						// 超时兜底 10s
+						this.pollTimeout = setTimeout(() => {
+							clearInterval(this.pollInterval);
+							this.answerContent = "获取回答失败，请重试";
+						}, 20000);
 					} else {
 						this.answerContent = '获取回答失败，请重试';
 					}
 				} catch {
+					this.pollInterval && clearInterval(this.pollInterval);
+					this.pollTimeout && clearTimeout(this.pollTimeout);
+					this.interval && clearInterval(this.interval);
 					this.answerContent = '获取回答失败，请重试';
 				}
 			},
diff --git a/pages/deepExploration/MainForceActions.vue b/pages/deepExploration/MainForceActions.vue
index 752495d..2bde1a9 100644
--- a/pages/deepExploration/MainForceActions.vue
+++ b/pages/deepExploration/MainForceActions.vue
@@ -36,12 +36,36 @@
 						<text>{{stockAdd}}</text>
 					</view>
 					<view class="graph_content">
-						<view class="charts-box">
+						<view class="loadingGraph" v-show="graphLoading">加载中...</view>
+						<view class="charts-box" v-show="!graphLoading">
 							<!-- uCharts 蜡烛图组件 -->
 							<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 +131,39 @@
 	//登录弹窗提示ref
 	const loginPrompt = ref(null)
 
+	// 全屏相关状态
+	const isFullscreen = ref(false); // 是否显示全屏弹窗
+	const isLandscape = ref(true); // 是否横屏模式
+	const fullscreenChartKey = ref(0); // 全屏图表重绘标识
+
+	const graphLoading = ref(true)
+
+
+
+	// 显示全屏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)
@@ -159,7 +216,7 @@
 	const recordId = ref('')
 	const parentId = ref('')
 	const stockId = ref('')
-	const market = ref('')
+	const market = ref('usa')
 	const stockTime = ref('2025/10/24')
 
 	const loading = ref(true);
@@ -191,7 +248,7 @@
 	//获取模型数据
 	const handleModels = async () => {
 		try {
-
+			graphLoading.value = true
 			if (userInfo.isVisitor) {
 				console.log('是游客');
 				loginPrompt.value.show()
@@ -204,6 +261,7 @@
 			if (searchName.value == '') {
 				console.log('没有搜索', searchName.value);
 				handleDefault()
+				getServerData()
 			} else {
 				if (currentIndex.value == 0) {
 					console.log('搜索', searchName.value);
@@ -424,6 +482,7 @@
 			chartData.value = {
 				...rawData
 			}
+			graphLoading.value = false
 			chartKey.value++;
 			console.log('chartData', chartData.value);
 		}
@@ -495,6 +554,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 +629,7 @@
 	let unwatch = null;
 	// 生命周期钩子：组件挂载后执行（替代onReady）
 	onMounted(async () => {
+
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight
 		getUserInfo()
 		await handleModels()
@@ -571,7 +653,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))
@@ -585,7 +668,7 @@
 				stockChange.value = historyData.value.stockData.StockInformation.Zhang || '5.120%'
 				stockAdd.value = historyData.value.stockData.StockInformation.ZhangFu || '22.410'
 				stockPrice.value = historyData.value.stockData.StockInformation.Price || '435.900'
-				currentIndex.value = historyData.value.model-1 
+				currentIndex.value = historyData.value.model - 1
 			}, {
 				deep: true,
 				immediate: true
@@ -597,7 +680,7 @@
 	// 页面加载时执行
 	onLoad((e) => {
 		if (e.index) {
-			// currentIndex.value = e.index - 1
+			currentIndex.value = e.index - 1
 			console.log('模块：', currentIndex.value)
 		}
 		if (e.stockName) {
@@ -763,15 +846,24 @@
 						}
 
 						text:nth-child(3) {
-							margin-left: 150rpx;
+							margin-left: 110rpx;
 						}
 					}
 
 					.graph_content {
 						position: relative;
 						min-height: 500rpx;
-						
-						image{
+						display: flex;
+						justify-content: center;
+						align-items: center;
+
+						.loadingGraph {
+
+							font-size: 35rpx;
+							color: #6a6a6a;
+						}
+
+						image {
 							position: absolute;
 							bottom: 20rpx;
 							right: 30rpx;
@@ -787,6 +879,81 @@
 					}
 				}
 
+				/* 横屏按钮样式 */
+				.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;
diff --git a/pages/deepExploration/deepExploration.vue b/pages/deepExploration/deepExploration.vue
index fbffd05..af0a4e4 100644
--- a/pages/deepExploration/deepExploration.vue
+++ b/pages/deepExploration/deepExploration.vue
@@ -45,8 +45,8 @@
 				</view>
 			</view>
 
-      <view class="stockSelection_content">
-        <view class="selectionItem">
+      <view class="stockSelection_content" >
+        <view class="selectionItem" @click="viewAll">
           <view class="header">
             <view class="left">
               <image
@@ -81,7 +81,7 @@
       </view>
 
       <view class="stockSelection_content">
-        <view class="selectionItem">
+        <view class="selectionItem" @click="viewAll">
           <view class="header">
             <view class="left">
               <image
diff --git a/pages/deepExploration/stockSelectDetail.vue b/pages/deepExploration/stockSelectDetail.vue
index 4d133b7..116fa42 100644
--- a/pages/deepExploration/stockSelectDetail.vue
+++ b/pages/deepExploration/stockSelectDetail.vue
@@ -342,18 +342,19 @@
 							display: flex;
 							border-top: 1rpx dashed #eee;
 							width: 210%;
+							font-weight: 400;
 
 							&.increase-positive {
 								.other_colum {
 									color: #2DD357;
-									font-weight: 200;
+									font-weight: 400;
 								}
 							}
 
 							&.increase-negative {
 								.other_colum {
 									color: #FF4150;
-									font-weight: 200;
+									font-weight: 400;
 								}
 							}
 
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3255eed..5b92a12 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -113,7 +113,7 @@
 								</view>
 							</view>
 							<view class="stock-chart">
-								<image :src="item.chartImg || '/static/c5.png'" mode="aspectFit" class="chart-image"></image>
+								<image :src="getChartImage(item)" mode="aspectFit" class="chart-image"></image>
 							</view>
 						</view>
 					</view>
@@ -232,9 +232,9 @@ export default {
 			
 			// 我的自选股票数据
 			myStocks: [
-				{ name: '特斯拉', code: 'TSLA', price: '482.00', change: 2.80, chartImg: '/static/c5.png' },
-				{ name: '英伟达', code: 'NVDA', price: '189.800', change: -2.92, chartImg: '/static/c6.png' },
-				{ name: '苹果', code: 'AAPL', price: '256.430', change: 2.60, chartImg: '/static/c7.png' }
+				{ name: '特斯拉', code: 'TSLA', price: '482.00', change: 2.80 },
+				{ name: '英伟达', code: 'NVDA', price: '189.800', change: -2.92 },
+				{ name: '苹果', code: 'AAPL', price: '256.430', change: 2.60 }
 			],
 			
 			// 机构动向简报数据
@@ -344,15 +344,17 @@ export default {
 		
 		// 预加载图片资源
 		this.myStocks.forEach(stock => {
+			// 使用getChartImage方法获取正确的图片路径
+			const imageSrc = this.getChartImage(stock);
 			// 使用uni.getImageInfo替代Image对象
 			uni.getImageInfo({
-				src: stock.chartImg,
+				src: imageSrc,
 				success: function(res) {
 					// 图片加载成功
-					console.log('图片预加载成功:', stock.name)
+					console.log('图片预加载成功:', stock.name, imageSrc)
 				},
 				fail: function(err) {
-					console.log('图片预加载失败:', err)
+					console.log('图片预加载失败:', err, imageSrc)
 				}
 			})
 		})
@@ -433,6 +435,26 @@ export default {
 	},
 	
 	methods: {
+		// 根据涨跌情况获取图表图片
+		getChartImage(item) {
+			// 获取涨跌值，支持多种字段名
+			const changeValue = item.change_percent || item.change || item.change_amount || 0;
+			
+			// 如果有自定义图片，优先使用
+			if (item.chartImg) {
+				return item.chartImg;
+			}
+			
+			// 根据涨跌情况返回对应图片
+			if (parseFloat(changeValue) >= 0) {
+				// 上涨时使用上涨图片
+				return '/static/marketSituation-image/upTimeChart.png';
+			} else if (parseFloat(changeValue) < 0) {
+				// 下跌时使用下跌图片
+				return '/static/marketSituation-image/downTimeChart.png';
+			} 
+		},
+		
 		// 跳转到客服中台
 		goToCustomerService() {
 			uni.navigateTo({
@@ -650,9 +672,11 @@ export default {
 				this.myStocks = stockData.map(stock => ({
 					name: stock.name || stock.stock_name || '',
 					code: stock.code || stock.stock_code || '',
-					// price: stock.price || stock.current_price || '0.00',
-					// change: stock.change || stock.change_percent || 0,
-					chartImg: stock.chartImg || '/static/c5.png' // 默认图片
+					price: stock.price || stock.current_price || '0.00',
+					change: stock.change || stock.change_percent || 0,
+					change_percent: stock.change_percent || 0,
+					change_amount: stock.change_amount || 0
+					// 移除固定的chartImg设置，让getChartImage方法根据涨跌情况动态选择
 				}))
 				//重新赋值机构动向简报
 				this.institutionalReports = stockData.map(stock => ({
@@ -665,13 +689,15 @@ export default {
 				this.myStocks = stockData.list.map(stock => ({
 					name: stock.name || stock.stock_name || '',
 					code: stock.code || stock.stock_code || '',
-					// price: stock.price || stock.current_price || '0.00',
-					// change: stock.change || stock.change_percent || 0,
-					chartImg: stock.chartImg || '/static/c5.png' // 默认图片
+					price: stock.price || stock.current_price || '0.00',
+					change: stock.change || stock.change_percent || 0,
+					change_percent: stock.change_percent || 0,
+					change_amount: stock.change_amount || 0
+					// 移除固定的chartImg设置，让getChartImage方法根据涨跌情况动态选择
 				}))
 				//重新赋值机构动向简报
 				//重新赋值机构动向简报
-				this.institutionalReports = stockData.map(stock => ({
+				this.institutionalReports = stockData.list.map(stock => ({
 					stock: stock.name || stock.stock_name || '',
 					status: stock.code || stock.stock_code || '',
 				}))
diff --git a/pages/marketSituation/countryMarket.vue b/pages/marketSituation/countryMarket.vue
index a31933e..7f23c1c 100644
--- a/pages/marketSituation/countryMarket.vue
+++ b/pages/marketSituation/countryMarket.vue
@@ -17,7 +17,7 @@
       </view>
       <view class="indices_grid">
         <view v-for="(index, i) in countryInfo" :key="i" class="index_item">
-          <IndexCard :market="index.market" :stockName="index.name" :currentPrice="index.price" :changeAmount="index.change" :changePercent="index.changePercent" :isRising="index.isRising" />
+          <IndexCard :market="index.market" :stockName="index.name" :currentPrice="index.price" :changeAmount="index.change" :changePercent="index.changePercent" :isRising="index.isRising" @click="viewIndexDetail(index,i)"/>
         </view>
       </view>
 
@@ -95,6 +95,8 @@
 import { ref, computed, onMounted, watch } from "vue";
 import IndexCard from "../../components/IndexCard.vue";
 import { queryStockDataAPI } from "@/api/marketSituation/marketSituation";
+import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
+const marketSituationStore = useMarketSituationStore();
 
 onMounted(() => {
   switchTab(0);
@@ -111,6 +113,11 @@ const switchTab = (i) => {
   }).then((res) => {
     if (res.code === 200) {
       countryInfo.value = res.data.dataPage.records;
+      marketSituationStore.countryMarketCardData = countryInfo.value.map((item) => ({
+          market: item.market,
+          stockCode: item.code,
+          stockName: item.name,
+        }));
 	  console.log(res.data)
 	  console.log(res.data.dataPage.records)
       console.log(countryInfo.value);
@@ -149,12 +156,23 @@ const props = defineProps({
 
 // 计算当前国家信息
 const countryInfo = ref('')
-
+// 方法：查看指数详情
+const viewIndexDetail = (item, index) => {
+  console.log("查看指数详情:", item);
+  uni.navigateTo({
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&index=${index}&from=countryMarket`,
+  });
+};
 // 处理从父组件接收的数据
 const handleTabData = (tabData) => {
   if (tabData && tabData.type === 'country' && tabData.data) {
     if (tabData.data.dataPage && tabData.data.dataPage.records) {
       countryInfo.value = tabData.data.dataPage.records;
+      marketSituationStore.countryMarketCardData = countryInfo.value.map((item) => ({
+          market: item.market,
+          stockCode: item.code,
+          stockName: item.name,
+        }));
       console.log('countryMarket接收到数据:', countryInfo.value);
     }
   }
@@ -169,9 +187,6 @@ watch(() => props.tabData, (newTabData) => {
 
 // 查看更多占位
 const viewMore = (type) => {
-  // 可根据 type 跳转到相应页面或加载更多
-  // 例如：indices/sectors/stocks
-  // uni.navigateTo({ url: `/pages/marketSituation/${type}List` })
 };
 </script>
 
diff --git a/pages/marketSituation/marketCondition.vue b/pages/marketSituation/marketCondition.vue
index 66f66e6..0708109 100644
--- a/pages/marketSituation/marketCondition.vue
+++ b/pages/marketSituation/marketCondition.vue
@@ -660,6 +660,8 @@ const toLeftPage = () => {
       nextStockInformation = marketSituationStore.marketDetailCardData[currentStockIndex.value];
     } else if (currentStockFrom.value == "globalIndex") {
       nextStockInformation = marketSituationStore.gloablCardData[currentStockParentIndex.value].list[currentStockIndex.value];
+    } else if (currentStockFrom.value == "countryMarket") {
+      nextStockInformation = marketSituationStore.countryMarketCardData[currentStockIndex.value];
     } else {
       uni.showToast({
         title: "没有更多股票了",
@@ -713,6 +715,19 @@ const toRightPage = () => {
       nextStockInformation = marketSituationStore.gloablCardData[currentStockParentIndex.value].list[currentStockIndex.value];
       updateStockInformation(nextStockInformation);
     }
+  } else if (currentStockFrom.value == "countryMarket") {
+    if (currentStockIndex.value == marketSituationStore.countryMarketCardData.length) {
+      uni.showToast({
+        title: "没有更多股票了",
+        icon: "none",
+        duration: 1000,
+      });
+      return;
+    } else {
+      currentStockIndex.value++;
+      nextStockInformation = marketSituationStore.countryMarketCardData[currentStockIndex.value];
+      updateStockInformation(nextStockInformation);
+    }
   } else {
     uni.showToast({
       title: "没有更多股票了",
diff --git a/pages/marketSituation/marketOverview.vue b/pages/marketSituation/marketOverview.vue
index 007cceb..b0e071d 100644
--- a/pages/marketSituation/marketOverview.vue
+++ b/pages/marketSituation/marketOverview.vue
@@ -8,16 +8,16 @@
       <view class="content">
         <view class="map">
           <view class="INDU"
-            >道琼斯<view :class="getSignClass(INDU.value)">{{ judgeSymbol(INDU.value) }}</view></view
+            >道琼斯<view :class="getSignClass(INDU.value)" @click="viewDetail(INDU)">{{ judgeSymbol(INDU.value) }}</view></view
           >
           <view class="NDX"
-            >纳斯达克<view :class="getSignClass(NDX.value)">{{ judgeSymbol(NDX.value) }}</view></view
+            >纳斯达克<view :class="getSignClass(NDX.value)" @click="viewDetail(NDX)">{{ judgeSymbol(NDX.value) }}</view></view
           >
           <view class="HSI"
-            >恒生指数<view :class="getSignClass(HSI.value)">{{ judgeSymbol(HSI.value) }}</view></view
+            >恒生指数<view :class="getSignClass(HSI.value)" @click="viewDetail(HSI)">{{ judgeSymbol(HSI.value) }}</view></view
           >
           <view class="CN"
-            >上证指数<view :class="getSignClass(CN.value)">{{ judgeSymbol(CN.value) }}</view></view
+            >上证指数<view :class="getSignClass(CN.value)" @click="viewDetail(CN)">{{ judgeSymbol(CN.value) }}</view></view
           >
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
@@ -83,6 +83,12 @@ const CN = ref({ stockName: "上证指数", stockCode: "1A0001", value: "" });
 const pageIndex = ref(0);
 const scrollToView = ref("");
 
+const viewDetail = (item) => {
+  uni.navigateTo({
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&from=map`,
+  });
+};
+
 // 计算属性：精准计算content区域的top值
 const contentTopPosition = computed(() => {
   const statusBarHeight = iSMT.value || 0;
@@ -800,8 +806,8 @@ watch(headerHeight, (newHeight) => {
 
 .NDX {
   position: absolute;
-  top: 30%;
-  left: 17%;
+  top: 23vh;
+  left: 17vw;
   transform: translate(-50%, -50%);
   font-size: 11rpx;
   color: #000000;
@@ -815,8 +821,8 @@ watch(headerHeight, (newHeight) => {
 }
 .INDU {
   position: absolute;
-  top: 22%;
-  left: 35%;
+  top: 15vh;
+  left: 35vw;
   transform: translate(-50%, -50%);
   font-size: 11rpx;
   color: #000000;
@@ -830,8 +836,8 @@ watch(headerHeight, (newHeight) => {
 }
 .HSI {
   position: absolute;
-  top: 30%;
-  right: 4%;
+  top: 23vh;
+  right: 4vw;
   transform: translate(-50%, -50%);
   font-size: 11rpx;
   color: #000000;
@@ -845,8 +851,8 @@ watch(headerHeight, (newHeight) => {
 }
 .CN {
   position: absolute;
-  top: 23%;
-  right: 8%;
+  top: 16vh;
+  right: 8vw;
   transform: translate(-50%, -50%);
   font-size: 11rpx;
   color: #000000;
diff --git a/pages/marketSituation/marketSituation.vue b/pages/marketSituation/marketSituation.vue
index bec52f2..c531253 100644
--- a/pages/marketSituation/marketSituation.vue
+++ b/pages/marketSituation/marketSituation.vue
@@ -177,11 +177,10 @@ const selected = () => {
 
 // 历史记录点击事件
 const history = () => {
-  uni.showToast({
-    title: "历史记录",
-    icon: "none",
-  });
-  // 这里可以跳转到历史页面
+  // 跳转到自定义股票列表页面
+  uni.navigateTo({
+    url: '/pages/customStockList/customStockList'
+  })
 };
 
 // Tab 栏点击事件
diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue
index 994a2c3..fe1a22f 100644
--- a/pages/start/Registration/Registration.vue
+++ b/pages/start/Registration/Registration.vue
@@ -189,7 +189,7 @@
 <script setup>
 import { ref } from "vue";
 // 导入完整的国家列表
-import countryList from "../login/list";
+import countryList from "../Registration/list";
 import footerBar from "../../../components/footerBar";
 import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
 import { verificationPhone, verificationEmail } from "../login/verification";
@@ -198,12 +198,13 @@ import {
   SendEmailCodeApi,
   SendPhoneCodeApi,
 } from "../../../api/start/login";
-import { useDeviceStore} from "../../../stores/modules/deviceInfo"
-import { useUserStore} from "../../../stores/modules/userInfo"
+import { useDeviceStore } from "../../../stores/modules/deviceInfo";
+import { useUserStore } from "../../../stores/modules/userInfo";
 
 const type = ref("");
 const email = ref("");
 const password = ref("");
+const deepChartID = ref("");
 const phone = ref("");
 const country = ref("+86");
 const agreed = ref(false);
@@ -241,6 +242,7 @@ function showCountryPicker() {
     ),
     success: function (res) {
       selectedCountry.value = countries.value[res.tapIndex];
+      country.value = selectedCountry.value.code;
     },
   });
 }
@@ -253,7 +255,7 @@ function goToIndex() {
 }
 
 function goToService() {
-   // 返回上一页
+  // 返回上一页
   uni.navigateTo({
     url: "/pages/customerServicePlatform/csPlatformIndex",
   });
@@ -281,14 +283,15 @@ async function register() {
   const registerType = changeLoginType();
   isLoading.value = true;
 
-  const deviceStore = useDeviceStore()
+  const deviceStore = useDeviceStore();
 
   const res = await registerApi({
     registerType: registerType,
+    phoneCountry: country.value, //手机号所属地区
     account: account,
     verifyCode: verifyCode.value,
     agree: agreed.value,
-    deviceId:deviceStore.deviceInfo.deviceId
+    deviceId: deviceStore.deviceInfo.deviceId,
   });
 
   isLoading.value = false;
@@ -326,7 +329,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}-${phone.value}`;
+    account.value = phone.value;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -511,9 +514,9 @@ async function sendCode() {
   if (switchType.value === "Phone") {
     // 发送验证码
 
-    const phoneAll = `${country.value}-${phone.value}`;
     const res = await SendPhoneCodeApi({
-      phone: phoneAll,
+      phoneCountry: country.value, //手机号地区
+      phone: phone.value,
     });
     console.log("手机验证码：", res.message);
 
diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue
index 0dd1427..5556e35 100644
--- a/pages/start/login/login.vue
+++ b/pages/start/login/login.vue
@@ -377,6 +377,7 @@ async function Login() {
   isLoading.value = true;
   const res = await LoginApi({
     loginType: loginType,
+    phoneCountry: country.value, //手机号所属地区
     account: account,
     verifyCode: verifyCode.value,
     password: password.value,
@@ -430,6 +431,15 @@ function basicVerification() {
       });
       return false;
     }
+
+    if (password.value.length < 8) {
+      uni.showToast({
+        title: "密码长度不能少于8位",
+        icon: "none",
+      });
+      return false;
+    }
+
   }
 
   if (switchType.value === "Phone") {
@@ -442,8 +452,6 @@ function basicVerification() {
       return false;
     }
 
-    const phoneAll = `${country.value}${phone.value}`;
-    console.log("完整手机号" + phoneAll);
     if (!validatePhoneNumber(country.value, phone.value)) {
       return false;
     }
@@ -551,7 +559,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}-${phone.value}`;
+    account.value = phone.value;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -667,9 +675,9 @@ async function sendCode() {
   if (switchType.value === "Phone") {
     // 发送验证码
 
-    const phoneAll = `${country.value}-${phone.value}`;
     const res = await SendPhoneCodeApi({
-      phone: phoneAll,
+      phoneCountry: country.value, //手机号地区
+      phone: phone.value,
     });
     console.log("手机验证码：", res.message);
 
diff --git a/pages/start/recoverPassword/list.js b/pages/start/recoverPassword/list.js
new file mode 100644
index 0000000..60058fb
--- /dev/null
+++ b/pages/start/recoverPassword/list.js
@@ -0,0 +1,1341 @@
+export default {
+	"list": [
+     {
+          "short": "AD",
+          "name": "安道尔共和国",
+          "en": "Andorra",
+          "tel": "376",
+          "flag": "../../../static/flag/ad.png"
+     },
+     {
+          "short": "AE",
+          "name": "阿拉伯联合酋长国",
+          "en": "UnitedArabEmirates",
+          "tel": "971",
+          "flag": "../../../static/flag/ae.png"
+     },
+     {
+          "short": "AF",
+          "name": "阿富汗",
+          "en": "Afghanistan",
+          "tel": "93",
+          "flag": "../../../static/flag/af.png"
+     },
+     {
+          "short": "AG",
+          "name": "安提瓜和巴布达",
+          "en": "AntiguaandBarbuda",
+          "tel": "1268",
+          "flag": "../../../static/flag/ag.png"
+     },
+     {
+          "short": "AI",
+          "name": "安圭拉岛",
+          "en": "Anguilla",
+          "tel": "1264",
+          "flag": "../../../static/flag/ai.png"
+     },
+     {
+          "short": "AL",
+          "name": "阿尔巴尼亚",
+          "en": "Albania",
+          "tel": "355",
+          "flag": "../../../static/flag/al.png"
+     },
+     {
+          "short": "AM",
+          "name": "阿美尼亚",
+          "en": "Armenia",
+          "tel": "374",
+          "flag": "../../../static/flag/am.png"
+     },
+     {
+          "short": "SH",
+          "name": "阿森松",
+          "en": "Ascension",
+          "tel": "247",
+          "flag": "../../../static/flag/sh.png"
+     },
+     {
+          "short": "AO",
+          "name": "安哥拉",
+          "en": "Angola",
+          "tel": "244",
+          "flag": "../../../static/flag/ao.png"
+     },
+     {
+          "short": "AR",
+          "name": "阿根廷",
+          "en": "Argentina",
+          "tel": "54",
+          "flag": "../../../static/flag/ar.png"
+     },
+     {
+          "short": "AT",
+          "name": "奥地利",
+          "en": "Austria",
+          "tel": "43",
+          "flag": "../../../static/flag/at.png"
+     },
+     {
+          "short": "AU",
+          "name": "澳大利亚",
+          "en": "Australia",
+          "tel": "61",
+          "flag": "../../../static/flag/au.png"
+     },
+     {
+          "short": "AZ",
+          "name": "阿塞拜疆",
+          "en": "Azerbaijan",
+          "tel": "994",
+          "flag": "../../../static/flag/az.png"
+     },
+     {
+          "short": "BB",
+          "name": "巴巴多斯",
+          "en": "Barbados",
+          "tel": "1246",
+          "flag": "../../../static/flag/bb.png"
+     },
+     {
+          "short": "BD",
+          "name": "孟加拉国",
+          "en": "Bangladesh",
+          "tel": "880",
+          "flag": "../../../static/flag/bd.png"
+     },
+     {
+          "short": "BE",
+          "name": "比利时",
+          "en": "Belgium",
+          "tel": "32",
+          "flag": "../../../static/flag/be.png"
+     },
+     {
+          "short": "BF",
+          "name": "布基纳法索",
+          "en": "Burkina-faso",
+          "tel": "226",
+          "flag": "../../../static/flag/bf.png"
+     },
+     {
+          "short": "BG",
+          "name": "保加利亚",
+          "en": "Bulgaria",
+          "tel": "359",
+          "flag": "../../../static/flag/bg.png"
+     },
+     {
+          "short": "BH",
+          "name": "巴林",
+          "en": "Bahrain",
+          "tel": "973",
+          "flag": "../../../static/flag/bh.png"
+     },
+     {
+          "short": "BI",
+          "name": "布隆迪",
+          "en": "Burundi",
+          "tel": "257",
+          "flag": "../../../static/flag/bi.png"
+     },
+     {
+          "short": "BJ",
+          "name": "贝宁",
+          "en": "Benin",
+          "tel": "229",
+          "flag": "../../../static/flag/bj.png"
+     },
+     {
+          "short": "BL",
+          "name": "巴勒斯坦",
+          "en": "Palestine",
+          "tel": "970",
+          "flag": "../../../static/flag/bl.png"
+     },
+     {
+          "short": "BM",
+          "name": "百慕大群岛",
+          "en": "BermudaIs.",
+          "tel": "1441",
+          "flag": "../../../static/flag/bm.png"
+     },
+     {
+          "short": "BN",
+          "name": "文莱",
+          "en": "Brunei",
+          "tel": "673",
+          "flag": "../../../static/flag/bn.png"
+     },
+     {
+          "short": "BO",
+          "name": "玻利维亚",
+          "en": "Bolivia",
+          "tel": "591",
+          "flag": "../../../static/flag/bo.png"
+     },
+     {
+          "short": "BR",
+          "name": "巴西",
+          "en": "Brazil",
+          "tel": "55",
+          "flag": "../../../static/flag/br.png"
+     },
+     {
+          "short": "BS",
+          "name": "巴哈马",
+          "en": "Bahamas",
+          "tel": "1242",
+          "flag": "../../../static/flag/bs.png"
+     },
+     {
+          "short": "BW",
+          "name": "博茨瓦纳",
+          "en": "Botswana",
+          "tel": "267",
+          "flag": "../../../static/flag/bw.png"
+     },
+     {
+          "short": "BY",
+          "name": "白俄罗斯",
+          "en": "Belarus",
+          "tel": "375",
+          "flag": "../../../static/flag/by.png"
+     },
+     {
+          "short": "BZ",
+          "name": "伯利兹",
+          "en": "Belize",
+          "tel": "501",
+          "flag": "../../../static/flag/bz.png"
+     },
+     {
+          "short": "CA",
+          "name": "加拿大",
+          "en": "Canada",
+          "tel": "1",
+          "flag": "../../../static/flag/ca.png"
+     },
+     {
+          "short": "",
+          "name": "开曼群岛",
+          "en": "CaymanIs.",
+          "tel": "1345",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "CF",
+          "name": "中非共和国",
+          "en": "CentralAfricanRepublic",
+          "tel": "236",
+          "flag": "../../../static/flag/cf.png"
+     },
+     {
+          "short": "CG",
+          "name": "刚果",
+          "en": "Congo",
+          "tel": "242",
+          "flag": "../../../static/flag/cg.png"
+     },
+     {
+          "short": "CH",
+          "name": "瑞士",
+          "en": "Switzerland",
+          "tel": "41",
+          "flag": "../../../static/flag/ch.png"
+     },
+     {
+          "short": "CK",
+          "name": "库克群岛",
+          "en": "CookIs.",
+          "tel": "682",
+          "flag": "../../../static/flag/ck.png"
+     },
+     {
+          "short": "CL",
+          "name": "智利",
+          "en": "Chile",
+          "tel": "56",
+          "flag": "../../../static/flag/cl.png"
+     },
+     {
+          "short": "CM",
+          "name": "喀麦隆",
+          "en": "Cameroon",
+          "tel": "237",
+          "flag": "../../../static/flag/cm.png"
+     },
+     {
+          "short": "CN",
+          "name": "中国",
+          "en": "China",
+          "tel": "86",
+          "flag": "../../../static/flag/cn.png"
+     },
+     {
+          "short": "CO",
+          "name": "哥伦比亚",
+          "en": "Colombia",
+          "tel": "57",
+          "flag": "../../../static/flag/co.png"
+     },
+     {
+          "short": "CR",
+          "name": "哥斯达黎加",
+          "en": "CostaRica",
+          "tel": "506",
+          "flag": "../../../static/flag/cr.png"
+     },
+     {
+          "short": "CU",
+          "name": "古巴",
+          "en": "Cuba",
+          "tel": "53",
+          "flag": "../../../static/flag/cu.png"
+     },
+     {
+          "short": "CY",
+          "name": "塞浦路斯",
+          "en": "Cyprus",
+          "tel": "357",
+          "flag": "../../../static/flag/cy.png"
+     },
+     {
+          "short": "CZ",
+          "name": "捷克",
+          "en": "CzechRepublic",
+          "tel": "420",
+          "flag": "../../../static/flag/cz.png"
+     },
+     {
+          "short": "DE",
+          "name": "德国",
+          "en": "Germany",
+          "tel": "49",
+          "flag": "../../../static/flag/de.png"
+     },
+     {
+          "short": "DJ",
+          "name": "吉布提",
+          "en": "Djibouti",
+          "tel": "253",
+          "flag": "../../../static/flag/dj.png"
+     },
+     {
+          "short": "DK",
+          "name": "丹麦",
+          "en": "Denmark",
+          "tel": "45",
+          "flag": "../../../static/flag/dk.png"
+     },
+     {
+          "short": "DO",
+          "name": "多米尼加共和国",
+          "en": "DominicaRep.",
+          "tel": "1890",
+          "flag": "../../../static/flag/do.png"
+     },
+     {
+          "short": "DZ",
+          "name": "阿尔及利亚",
+          "en": "Algeria",
+          "tel": "213",
+          "flag": "../../../static/flag/dz.png"
+     },
+     {
+          "short": "EC",
+          "name": "厄瓜多尔",
+          "en": "Ecuador",
+          "tel": "593",
+          "flag": "../../../static/flag/ec.png"
+     },
+     {
+          "short": "EE",
+          "name": "爱沙尼亚",
+          "en": "Estonia",
+          "tel": "372",
+          "flag": "../../../static/flag/ee.png"
+     },
+     {
+          "short": "EG",
+          "name": "埃及",
+          "en": "Egypt",
+          "tel": "20",
+          "flag": "../../../static/flag/eg.png"
+     },
+     {
+          "short": "ES",
+          "name": "西班牙",
+          "en": "Spain",
+          "tel": "34",
+          "flag": "../../../static/flag/es.png"
+     },
+     {
+          "short": "ET",
+          "name": "埃塞俄比亚",
+          "en": "Ethiopia",
+          "tel": "251",
+          "flag": "../../../static/flag/et.png"
+     },
+     {
+          "short": "FI",
+          "name": "芬兰",
+          "en": "Finland",
+          "tel": "358",
+          "flag": "../../../static/flag/fi.png"
+     },
+     {
+          "short": "FJ",
+          "name": "斐济",
+          "en": "Fiji",
+          "tel": "679",
+          "flag": "../../../static/flag/fj.png"
+     },
+     {
+          "short": "FR",
+          "name": "法国",
+          "en": "France",
+          "tel": "33",
+          "flag": "../../../static/flag/fr.png"
+     },
+     {
+          "short": "GA",
+          "name": "加蓬",
+          "en": "Gabon",
+          "tel": "241",
+          "flag": "../../../static/flag/ga.png"
+     },
+     {
+          "short": "GB",
+          "name": "英国",
+          "en": "UnitedKiongdom",
+          "tel": "44",
+          "flag": "../../../static/flag/gb.png"
+     },
+     {
+          "short": "GD",
+          "name": "格林纳达",
+          "en": "Grenada",
+          "tel": "1809",
+          "flag": "../../../static/flag/gd.png"
+     },
+     {
+          "short": "GE",
+          "name": "格鲁吉亚",
+          "en": "Georgia",
+          "tel": "995",
+          "flag": "../../../static/flag/ge.png"
+     },
+     {
+          "short": "GF",
+          "name": "法属圭亚那",
+          "en": "FrenchGuiana",
+          "tel": "594",
+          "flag": "../../../static/flag/gf.png"
+     },
+     {
+          "short": "GH",
+          "name": "加纳",
+          "en": "Ghana",
+          "tel": "233",
+          "flag": "../../../static/flag/gh.png"
+     },
+     {
+          "short": "GI",
+          "name": "直布罗陀",
+          "en": "Gibraltar",
+          "tel": "350",
+          "flag": "../../../static/flag/gi.png"
+     },
+     {
+          "short": "GM",
+          "name": "冈比亚",
+          "en": "Gambia",
+          "tel": "220",
+          "flag": "../../../static/flag/gm.png"
+     },
+     {
+          "short": "GN",
+          "name": "几内亚",
+          "en": "Guinea",
+          "tel": "224",
+          "flag": "../../../static/flag/gn.png"
+     },
+     {
+          "short": "GR",
+          "name": "希腊",
+          "en": "Greece",
+          "tel": "30",
+          "flag": "../../../static/flag/gr.png"
+     },
+     {
+          "short": "GT",
+          "name": "危地马拉",
+          "en": "Guatemala",
+          "tel": "502",
+          "flag": "../../../static/flag/gt.png"
+     },
+     {
+          "short": "GU",
+          "name": "关岛",
+          "en": "Guam",
+          "tel": "1671",
+          "flag": "../../../static/flag/gu.png"
+     },
+     {
+          "short": "GY",
+          "name": "圭亚那",
+          "en": "Guyana",
+          "tel": "592",
+          "flag": "../../../static/flag/gy.png"
+     },
+     {
+          "short": "HK",
+          "name": "香港(中国)",
+          "en": "Hongkong",
+          "tel": "852",
+          "flag": "../../../static/flag/hk.png"
+     },
+     {
+          "short": "HN",
+          "name": "洪都拉斯",
+          "en": "Honduras",
+          "tel": "504",
+          "flag": "../../../static/flag/hn.png"
+     },
+     {
+          "short": "HT",
+          "name": "海地",
+          "en": "Haiti",
+          "tel": "509",
+          "flag": "../../../static/flag/ht.png"
+     },
+     {
+          "short": "HU",
+          "name": "匈牙利",
+          "en": "Hungary",
+          "tel": "36",
+          "flag": "../../../static/flag/hu.png"
+     },
+     {
+          "short": "ID",
+          "name": "印度尼西亚",
+          "en": "Indonesia",
+          "tel": "62",
+          "flag": "../../../static/flag/id.png"
+     },
+     {
+          "short": "IE",
+          "name": "爱尔兰",
+          "en": "Ireland",
+          "tel": "353",
+          "flag": "../../../static/flag/ie.png"
+     },
+     {
+          "short": "IL",
+          "name": "以色列",
+          "en": "Israel",
+          "tel": "972",
+          "flag": "../../../static/flag/il.png"
+     },
+     {
+          "short": "IN",
+          "name": "印度",
+          "en": "India",
+          "tel": "91",
+          "flag": "../../../static/flag/in.png"
+     },
+     {
+          "short": "IQ",
+          "name": "伊拉克",
+          "en": "Iraq",
+          "tel": "964",
+          "flag": "../../../static/flag/iq.png"
+     },
+     {
+          "short": "IR",
+          "name": "伊朗",
+          "en": "Iran",
+          "tel": "98",
+          "flag": "../../../static/flag/ir.png"
+     },
+     {
+          "short": "IS",
+          "name": "冰岛",
+          "en": "Iceland",
+          "tel": "354",
+          "flag": "../../../static/flag/is.png"
+     },
+     {
+          "short": "IT",
+          "name": "意大利",
+          "en": "Italy",
+          "tel": "39",
+          "flag": "../../../static/flag/it.png"
+     },
+     {
+          "short": "",
+          "name": "科特迪瓦",
+          "en": "IvoryCoast",
+          "tel": "225",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "JM",
+          "name": "牙买加",
+          "en": "Jamaica",
+          "tel": "1876",
+          "flag": "../../../static/flag/jm.png"
+     },
+     {
+          "short": "JO",
+          "name": "约旦",
+          "en": "Jordan",
+          "tel": "962",
+          "flag": "../../../static/flag/jo.png"
+     },
+     {
+          "short": "JP",
+          "name": "日本",
+          "en": "Japan",
+          "tel": "81",
+          "flag": "../../../static/flag/jp.png"
+     },
+     {
+          "short": "KE",
+          "name": "肯尼亚",
+          "en": "Kenya",
+          "tel": "254",
+          "flag": "../../../static/flag/ke.png"
+     },
+     {
+          "short": "KG",
+          "name": "吉尔吉斯坦",
+          "en": "Kyrgyzstan",
+          "tel": "331",
+          "flag": "../../../static/flag/kg.png"
+     },
+     {
+          "short": "KH",
+          "name": "柬埔寨",
+          "en": "Kampuchea(Cambodia)",
+          "tel": "855",
+          "flag": "../../../static/flag/kh.png"
+     },
+     {
+          "short": "KP",
+          "name": "朝鲜",
+          "en": "NorthKorea",
+          "tel": "850",
+          "flag": "../../../static/flag/kp.png"
+     },
+     {
+          "short": "KR",
+          "name": "韩国",
+          "en": "Korea",
+          "tel": "82",
+          "flag": "../../../static/flag/kr.png"
+     },
+     {
+          "short": "KT",
+          "name": "科特迪瓦共和国",
+          "en": "RepublicofIvoryCoast",
+          "tel": "225",
+          "flag": "../../../static/flag/kt.png"
+     },
+     {
+          "short": "KW",
+          "name": "科威特",
+          "en": "Kuwait",
+          "tel": "965",
+          "flag": "../../../static/flag/kw.png"
+     },
+     {
+          "short": "KZ",
+          "name": "哈萨克斯坦",
+          "en": "Kazakstan",
+          "tel": "327",
+          "flag": "../../../static/flag/kz.png"
+     },
+     {
+          "short": "LA",
+          "name": "老挝",
+          "en": "Laos",
+          "tel": "856",
+          "flag": "../../../static/flag/la.png"
+     },
+     {
+          "short": "LB",
+          "name": "黎巴嫩",
+          "en": "Lebanon",
+          "tel": "961",
+          "flag": "../../../static/flag/lb.png"
+     },
+     {
+          "short": "LC",
+          "name": "圣卢西亚",
+          "en": "St.Lucia",
+          "tel": "1758",
+          "flag": "../../../static/flag/lc.png"
+     },
+     {
+          "short": "LI",
+          "name": "列支敦士登",
+          "en": "Liechtenstein",
+          "tel": "423",
+          "flag": "../../../static/flag/li.png"
+     },
+     {
+          "short": "LK",
+          "name": "斯里兰卡",
+          "en": "SriLanka",
+          "tel": "94",
+          "flag": "../../../static/flag/lk.png"
+     },
+     {
+          "short": "LR",
+          "name": "利比里亚",
+          "en": "Liberia",
+          "tel": "231",
+          "flag": "../../../static/flag/lr.png"
+     },
+     {
+          "short": "LS",
+          "name": "莱索托",
+          "en": "Lesotho",
+          "tel": "266",
+          "flag": "../../../static/flag/ls.png"
+     },
+     {
+          "short": "LT",
+          "name": "立陶宛",
+          "en": "Lithuania",
+          "tel": "370",
+          "flag": "../../../static/flag/lt.png"
+     },
+     {
+          "short": "LU",
+          "name": "卢森堡",
+          "en": "Luxembourg",
+          "tel": "352",
+          "flag": "../../../static/flag/lu.png"
+     },
+     {
+          "short": "LV",
+          "name": "拉脱维亚",
+          "en": "Latvia",
+          "tel": "371",
+          "flag": "../../../static/flag/lv.png"
+     },
+     {
+          "short": "LY",
+          "name": "利比亚",
+          "en": "Libya",
+          "tel": "218",
+          "flag": "../../../static/flag/ly.png"
+     },
+     {
+          "short": "MA",
+          "name": "摩洛哥",
+          "en": "Morocco",
+          "tel": "212",
+          "flag": "../../../static/flag/ma.png"
+     },
+     {
+          "short": "MC",
+          "name": "摩纳哥",
+          "en": "Monaco",
+          "tel": "377",
+          "flag": "../../../static/flag/mc.png"
+     },
+     {
+          "short": "MD",
+          "name": "摩尔多瓦",
+          "en": "Moldova,Republicof",
+          "tel": "373",
+          "flag": "../../../static/flag/md.png"
+     },
+     {
+          "short": "MG",
+          "name": "马达加斯加",
+          "en": "Madagascar",
+          "tel": "261",
+          "flag": "../../../static/flag/mg.png"
+     },
+     {
+          "short": "ML",
+          "name": "马里",
+          "en": "Mali",
+          "tel": "223",
+          "flag": "../../../static/flag/ml.png"
+     },
+     {
+          "short": "MM",
+          "name": "缅甸",
+          "en": "Burma",
+          "tel": "95",
+          "flag": "../../../static/flag/mm.png"
+     },
+     {
+          "short": "MN",
+          "name": "蒙古",
+          "en": "Mongolia",
+          "tel": "976",
+          "flag": "../../../static/flag/mn.png"
+     },
+     {
+          "short": "MO",
+          "name": "澳门（中国）",
+          "en": "Macao",
+          "tel": "853",
+          "flag": "../../../static/flag/mo.png"
+     },
+     {
+          "short": "MS",
+          "name": "蒙特塞拉特岛",
+          "en": "MontserratIs",
+          "tel": "1664",
+          "flag": "../../../static/flag/ms.png"
+     },
+     {
+          "short": "MT",
+          "name": "马耳他",
+          "en": "Malta",
+          "tel": "356",
+          "flag": "../../../static/flag/mt.png"
+     },
+     {
+          "short": "",
+          "name": "马里亚那群岛",
+          "en": "MarianaIs",
+          "tel": "1670",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "",
+          "name": "马提尼克",
+          "en": "Martinique",
+          "tel": "596",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "MU",
+          "name": "毛里求斯",
+          "en": "Mauritius",
+          "tel": "230",
+          "flag": "../../../static/flag/mu.png"
+     },
+     {
+          "short": "MV",
+          "name": "马尔代夫",
+          "en": "Maldives",
+          "tel": "960",
+          "flag": "../../../static/flag/mv.png"
+     },
+     {
+          "short": "MW",
+          "name": "马拉维",
+          "en": "Malawi",
+          "tel": "265",
+          "flag": "../../../static/flag/mw.png"
+     },
+     {
+          "short": "MX",
+          "name": "墨西哥",
+          "en": "Mexico",
+          "tel": "52",
+          "flag": "../../../static/flag/mx.png"
+     },
+     {
+          "short": "MY",
+          "name": "马来西亚",
+          "en": "Malaysia",
+          "tel": "60",
+          "flag": "../../../static/flag/my.png"
+     },
+     {
+          "short": "MZ",
+          "name": "莫桑比克",
+          "en": "Mozambique",
+          "tel": "258",
+          "flag": "../../../static/flag/mz.png"
+     },
+     {
+          "short": "NA",
+          "name": "纳米比亚",
+          "en": "Namibia",
+          "tel": "264",
+          "flag": "../../../static/flag/na.png"
+     },
+     {
+          "short": "NE",
+          "name": "尼日尔",
+          "en": "Niger",
+          "tel": "977",
+          "flag": "../../../static/flag/ne.png"
+     },
+     {
+          "short": "NG",
+          "name": "尼日利亚",
+          "en": "Nigeria",
+          "tel": "234",
+          "flag": "../../../static/flag/ng.png"
+     },
+     {
+          "short": "NI",
+          "name": "尼加拉瓜",
+          "en": "Nicaragua",
+          "tel": "505",
+          "flag": "../../../static/flag/ni.png"
+     },
+     {
+          "short": "NL",
+          "name": "荷兰",
+          "en": "Netherlands",
+          "tel": "31",
+          "flag": "../../../static/flag/nl.png"
+     },
+     {
+          "short": "NO",
+          "name": "挪威",
+          "en": "Norway",
+          "tel": "47",
+          "flag": "../../../static/flag/no.png"
+     },
+     {
+          "short": "NP",
+          "name": "尼泊尔",
+          "en": "Nepal",
+          "tel": "977",
+          "flag": "../../../static/flag/np.png"
+     },
+     {
+          "short": "NR",
+          "name": "瑙鲁",
+          "en": "Nauru",
+          "tel": "674",
+          "flag": "../../../static/flag/nr.png"
+     },
+     {
+          "short": "NZ",
+          "name": "新西兰",
+          "en": "NewZealand",
+          "tel": "64",
+          "flag": "../../../static/flag/nz.png"
+     },
+     {
+          "short": "OM",
+          "name": "阿曼",
+          "en": "Oman",
+          "tel": "968",
+          "flag": "../../../static/flag/om.png"
+     },
+     {
+          "short": "PA",
+          "name": "巴拿马",
+          "en": "Panama",
+          "tel": "507",
+          "flag": "../../../static/flag/pa.png"
+     },
+     {
+          "short": "PE",
+          "name": "秘鲁",
+          "en": "Peru",
+          "tel": "51",
+          "flag": "../../../static/flag/pe.png"
+     },
+     {
+          "short": "PF",
+          "name": "法属玻利尼西亚",
+          "en": "FrenchPolynesia",
+          "tel": "689",
+          "flag": "../../../static/flag/pf.png"
+     },
+     {
+          "short": "PG",
+          "name": "巴布亚新几内亚",
+          "en": "PapuaNewCuinea",
+          "tel": "675",
+          "flag": "../../../static/flag/pg.png"
+     },
+     {
+          "short": "PH",
+          "name": "菲律宾",
+          "en": "Philippines",
+          "tel": "63",
+          "flag": "../../../static/flag/ph.png"
+     },
+     {
+          "short": "PK",
+          "name": "巴基斯坦",
+          "en": "Pakistan",
+          "tel": "92",
+          "flag": "../../../static/flag/pk.png"
+     },
+     {
+          "short": "PL",
+          "name": "波兰",
+          "en": "Poland",
+          "tel": "48",
+          "flag": "../../../static/flag/pl.png"
+     },
+     {
+          "short": "PR",
+          "name": "波多黎各",
+          "en": "PuertoRico",
+          "tel": "1787",
+          "flag": "../../../static/flag/pr.png"
+     },
+     {
+          "short": "PT",
+          "name": "葡萄牙",
+          "en": "Portugal",
+          "tel": "351",
+          "flag": "../../../static/flag/pt.png"
+     },
+     {
+          "short": "PY",
+          "name": "巴拉圭",
+          "en": "Paraguay",
+          "tel": "595",
+          "flag": "../../../static/flag/py.png"
+     },
+     {
+          "short": "QA",
+          "name": "卡塔尔",
+          "en": "Qatar",
+          "tel": "974",
+          "flag": "../../../static/flag/qa.png"
+     },
+     {
+          "short": "",
+          "name": "留尼旺",
+          "en": "Reunion",
+          "tel": "262",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "RO",
+          "name": "罗马尼亚",
+          "en": "Romania",
+          "tel": "40",
+          "flag": "../../../static/flag/ro.png"
+     },
+     {
+          "short": "RU",
+          "name": "俄罗斯",
+          "en": "Russia",
+          "tel": "7",
+          "flag": "../../../static/flag/ru.png"
+     },
+     {
+          "short": "SA",
+          "name": "沙特阿拉伯",
+          "en": "SaudiArabia",
+          "tel": "966",
+          "flag": "../../../static/flag/sa.png"
+     },
+     {
+          "short": "SB",
+          "name": "所罗门群岛",
+          "en": "SolomonIs",
+          "tel": "677",
+          "flag": "../../../static/flag/sb.png"
+     },
+     {
+          "short": "SC",
+          "name": "塞舌尔",
+          "en": "Seychelles",
+          "tel": "248",
+          "flag": "../../../static/flag/sc.png"
+     },
+     {
+          "short": "SD",
+          "name": "苏丹",
+          "en": "Sudan",
+          "tel": "249",
+          "flag": "../../../static/flag/sd.png"
+     },
+     {
+          "short": "SE",
+          "name": "瑞典",
+          "en": "Sweden",
+          "tel": "46",
+          "flag": "../../../static/flag/se.png"
+     },
+     {
+          "short": "SG",
+          "name": "新加坡",
+          "en": "Singapore",
+          "tel": "65",
+          "flag": "../../../static/flag/sg.png"
+     },
+     {
+          "short": "SI",
+          "name": "斯洛文尼亚",
+          "en": "Slovenia",
+          "tel": "386",
+          "flag": "../../../static/flag/si.png"
+     },
+     {
+          "short": "SK",
+          "name": "斯洛伐克",
+          "en": "Slovakia",
+          "tel": "421",
+          "flag": "../../../static/flag/sk.png"
+     },
+     {
+          "short": "SL",
+          "name": "塞拉利昂",
+          "en": "SierraLeone",
+          "tel": "232",
+          "flag": "../../../static/flag/sl.png"
+     },
+     {
+          "short": "SM",
+          "name": "圣马力诺",
+          "en": "SanMarino",
+          "tel": "378",
+          "flag": "../../../static/flag/sm.png"
+     },
+     {
+          "short": "AS",
+          "name": "东萨摩亚(美)",
+          "en": "SamoaEastern",
+          "tel": "684",
+          "flag": "../../../static/flag/as.png"
+     },
+     {
+          "short": "WS",
+          "name": "西萨摩亚",
+          "en": "SanMarino",
+          "tel": "685",
+          "flag": "../../../static/flag/ws.png"
+     },
+     {
+          "short": "SN",
+          "name": "塞内加尔",
+          "en": "Senegal",
+          "tel": "221",
+          "flag": "../../../static/flag/sn.png"
+     },
+     {
+          "short": "SO",
+          "name": "索马里",
+          "en": "Somali",
+          "tel": "252",
+          "flag": "../../../static/flag/so.png"
+     },
+     {
+          "short": "SR",
+          "name": "苏里南",
+          "en": "Suriname",
+          "tel": "597",
+          "flag": "../../../static/flag/sr.png"
+     },
+     {
+          "short": "ST",
+          "name": "圣多美和普林西比",
+          "en": "SaoTomeandPrincipe",
+          "tel": "239",
+          "flag": "../../../static/flag/st.png"
+     },
+     {
+          "short": "SV",
+          "name": "萨尔瓦多",
+          "en": "EISalvador",
+          "tel": "503",
+          "flag": "../../../static/flag/sv.png"
+     },
+     {
+          "short": "SY",
+          "name": "叙利亚",
+          "en": "Syria",
+          "tel": "963",
+          "flag": "../../../static/flag/sy.png"
+     },
+     {
+          "short": "SZ",
+          "name": "斯威士兰",
+          "en": "Swaziland",
+          "tel": "268",
+          "flag": "../../../static/flag/sz.png"
+     },
+     {
+          "short": "TD",
+          "name": "乍得",
+          "en": "Chad",
+          "tel": "235",
+          "flag": "../../../static/flag/td.png"
+     },
+     {
+          "short": "TG",
+          "name": "多哥",
+          "en": "Togo",
+          "tel": "228",
+          "flag": "../../../static/flag/tg.png"
+     },
+     {
+          "short": "TH",
+          "name": "泰国",
+          "en": "Thailand",
+          "tel": "66",
+          "flag": "../../../static/flag/th.png"
+     },
+     {
+          "short": "TJ",
+          "name": "塔吉克斯坦",
+          "en": "Tajikstan",
+          "tel": "992",
+          "flag": "../../../static/flag/tj.png"
+     },
+     {
+          "short": "TM",
+          "name": "土库曼斯坦",
+          "en": "Turkmenistan",
+          "tel": "993",
+          "flag": "../../../static/flag/tm.png"
+     },
+     {
+          "short": "TN",
+          "name": "突尼斯",
+          "en": "Tunisia",
+          "tel": "216",
+          "flag": "../../../static/flag/tn.png"
+     },
+     {
+          "short": "TO",
+          "name": "汤加",
+          "en": "Tonga",
+          "tel": "676",
+          "flag": "../../../static/flag/to.png"
+     },
+     {
+          "short": "TR",
+          "name": "土耳其",
+          "en": "Turkey",
+          "tel": "90",
+          "flag": "../../../static/flag/tr.png"
+     },
+     {
+          "short": "TT",
+          "name": "特立尼达和多巴哥",
+          "en": "TrinidadandTobago",
+          "tel": "1809",
+          "flag": "../../../static/flag/tt.png"
+     },
+     {
+          "short": "TW",
+          "name": "台湾（中国）",
+          "en": "Taiwan",
+          "tel": "886",
+          "flag": "../../../static/flag/cn.png"
+     },
+     {
+          "short": "TZ",
+          "name": "坦桑尼亚",
+          "en": "Tanzania",
+          "tel": "255",
+          "flag": "../../../static/flag/tz.png"
+     },
+     {
+          "short": "UA",
+          "name": "乌克兰",
+          "en": "Ukraine",
+          "tel": "380",
+          "flag": "../../../static/flag/ua.png"
+     },
+     {
+          "short": "UG",
+          "name": "乌干达",
+          "en": "Uganda",
+          "tel": "256",
+          "flag": "../../../static/flag/ug.png"
+     },
+     {
+          "short": "US",
+          "name": "美国",
+          "en": "UnitedStatesofAmerica",
+          "tel": "1",
+          "flag": "../../../static/flag/us.png"
+     },
+     {
+          "short": "UY",
+          "name": "乌拉圭",
+          "en": "Uruguay",
+          "tel": "598",
+          "flag": "../../../static/flag/uy.png"
+     },
+     {
+          "short": "UZ",
+          "name": "乌兹别克斯坦",
+          "en": "Uzbekistan",
+          "tel": "233",
+          "flag": "../../../static/flag/uz.png"
+     },
+     {
+          "short": "VC",
+          "name": "圣文森特岛",
+          "en": "SaintVincent",
+          "tel": "1784",
+          "flag": "../../../static/flag/vc.png"
+     },
+     {
+          "short": "VE",
+          "name": "委内瑞拉",
+          "en": "Venezuela",
+          "tel": "58",
+          "flag": "../../../static/flag/ve.png"
+     },
+     {
+          "short": "VN",
+          "name": "越南",
+          "en": "Vietnam",
+          "tel": "84",
+          "flag": "../../../static/flag/vn.png"
+     },
+     {
+          "short": "YE",
+          "name": "也门",
+          "en": "Yemen",
+          "tel": "967",
+          "flag": "../../../static/flag/ye.png"
+     },
+     {
+          "short": "YU",
+          "name": "南斯拉夫",
+          "en": "Yugoslavia",
+          "tel": "381",
+          "flag": "../../../static/flag/yu.png"
+     },
+     {
+          "short": "ZA",
+          "name": "南非",
+          "en": "SouthAfrica",
+          "tel": "27",
+          "flag": "../../../static/flag/za.png"
+     },
+     {
+          "short": "ZM",
+          "name": "赞比亚",
+          "en": "Zambia",
+          "tel": "260",
+          "flag": "../../../static/flag/zm.png"
+     },
+     {
+          "short": "ZR",
+          "name": "扎伊尔",
+          "en": "Zaire",
+          "tel": "243",
+          "flag": "../../../static/flag/zr.png"
+     },
+     {
+          "short": "ZW",
+          "name": "津巴布韦",
+          "en": "Zimbabwe",
+          "tel": "263",
+          "flag": "../../../static/flag/zw.png"
+     }
+]
+}
\ No newline at end of file
diff --git a/pages/start/recoverPassword/recoverPassword.vue b/pages/start/recoverPassword/recoverPassword.vue
index 4c1915e..4fff637 100644
--- a/pages/start/recoverPassword/recoverPassword.vue
+++ b/pages/start/recoverPassword/recoverPassword.vue
@@ -232,7 +232,7 @@
 <script setup>
 import { ref } from "vue";
 // 导入完整的国家列表
-import countryList from "../login/list";
+import countryList from "../recoverPassword/list";
 import footerBar from "../../../components/footerBar";
 import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
 import { verificationPhone, verificationEmail } from "../login/verification";
@@ -248,6 +248,7 @@ const email = ref("");
 const password = ref("");
 const newPasswordFirst = ref("");
 const newPasswordSecond = ref("");
+const deepChartID = ref("");
 const phone = ref("");
 const country = ref("+86");
 const agreed = ref(false);
@@ -287,6 +288,7 @@ function showCountryPicker() {
     ),
     success: function (res) {
       selectedCountry.value = countries.value[res.tapIndex];
+      country.value = selectedCountry.value.code;
     },
   });
 }
@@ -333,6 +335,14 @@ async function register() {
       return;
     }
 
+    if (newPasswordFirst.value.length < 8) {
+      uni.showToast({
+        title: "密码长度不能少于8位",
+        icon: "none",
+      });
+      return false;
+    }
+
     const account = changeAccount();
 
     const res = await forgetApi({
@@ -429,6 +439,7 @@ async function register() {
 
   const res = await verifyCodeApi({
     loginType: loginType, //登录方式EMAIL,PHONE
+    phoneCountry: country.value, //手机号所属地区
     account: account, //登陆账号  手机号/邮箱
     verifyCode: verifyCode.value,
   });
@@ -451,7 +462,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}-${phone.value}`;
+    account.value = phone.value;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -570,10 +581,9 @@ function sendCode() {
     }
   }
   if (switchType.value === "Phone") {
-    const phoneAll = `${country.value}-${phone.value}`;
-
     const res = SendPhoneCodeApi({
-      phone: phoneAll,
+      phoneCountry: country.value, //手机号地区
+      phone: phone.value,
     });
     if (!res) {
       uni.showToast({
diff --git a/pages/start/startup/startup.vue b/pages/start/startup/startup.vue
index f7d74ef..dc3e0b7 100644
--- a/pages/start/startup/startup.vue
+++ b/pages/start/startup/startup.vue
@@ -1,13 +1,17 @@
 <template>
   <view class="background">
-   <!-- <image
+    <!-- <image
       class="logo"
       src="../../../static/icons/start-logo.png"
       mode="scaleToFill"
     />
     <view class="logo-text"> DeepChart </view> -->
 
-    <image class="start" src="../../../static/start.webp" mode="scaleToFill" />
+    <image
+      class="start"
+      src="../../../static/start-gif.gif"
+      mode="scaleToFill"
+    />
   </view>
 </template>
 
@@ -40,20 +44,23 @@ onShow(() => {
         animationDuration: 1000,
       });
     }
-  }, 3000);
+  }, 3400);
 });
 </script>
 
 <style>
 .background {
-  background: linear-gradient(180deg, #fb6967, #fb6967);
+  background: #ffffff;
   width: 100vw;
   height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
-.start{
-  width: 100vw;
-  height: 100vh;
+.start {
+  width: 750rpx;
+  height: 1624rpx;
 }
 
 .logo-text {
diff --git a/static/start-gif.gif b/static/start-gif.gif
new file mode 100644
index 0000000..f9444b5
Binary files /dev/null and b/static/start-gif.gif differ
diff --git a/stores/modules/marketSituation.js b/stores/modules/marketSituation.js
index 2ae69fe..f8db4c1 100644
--- a/stores/modules/marketSituation.js
+++ b/stores/modules/marketSituation.js
@@ -9,11 +9,13 @@ export const useMarketSituationStore = defineStore(
     const cardData = ref([]);
     const gloablCardData = ref([]);
     const marketDetailCardData = ref([]);
+    const countryMarketCardData = ref([]);
     // 记得 return
     return {
       cardData,
       gloablCardData,
       marketDetailCardData,
+      countryMarketCardData,
     };
   },
   // TODO: 持久化
diff --git a/utils/http.js b/utils/http.js
index 1a1330e..f5ab0ea 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -77,18 +77,20 @@ export const http = (options) => {
 
 
                     }
-                    if (result.data.code === 400) {
+                    if (result.data.code === 10003) {
                         const userStore = useUserStore()
-                        userStore.clearUserInfo()
                         uni.showModal({
                             title: "登录失效",
                             content: "点击确定跳转登录页面",
                             confirmText: "确定",
                             cancelText: "取消",
                             success: (res) => {
-                                uni.navigateTo({
-                                    url: '/pages/start/login/login'
-                                })
+                                if (res.confirm) {
+                                    userStore.clearUserInfo()
+                                    uni.navigateTo({
+                                        url: '/pages/start/login/login'
+                                    })
+                                }
                             },
                         });
                     }