From c37a30478efb626b3a64d0d655e3b4304157594f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Tue, 22 Jul 2025 14:11:16 +0800
Subject: [PATCH 1/3] 2

---
 .env.development           |  4 ++--
 src/pages/course/index.vue |  3 ++-
 src/pages/index/dialog.vue | 12 +++++++-----
 src/pages/index/index.vue  |  4 ++--
 src/pages/login/login.vue  |  3 ++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index a7b52e29..80cab90f 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
 # DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
 
 # app入口
 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
@@ -17,4 +17,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
 # h5专用地址
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
\ No newline at end of file
+VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7003'
\ No newline at end of file
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index 1fbf94f6..68a6b6b2 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -368,7 +368,8 @@ import { onShow } from "@dcloudio/uni-app"
 					overflow-y: auto;
 					z-index: 2;
 					background-color: #f9f9f9;
-					box-shadow: 0rpx 3.85rpx 38rpx rgba(0,0,0,.05);
+					box-shadow: 0rpx 19rpx 19rpx rgba(160,160,160,.5);
+					border-radius: 0 0 20rpx 20rpx;
 					padding: 0rpx 25rpx;
 					box-sizing: border-box;
 					.filter-type{
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index d5f27998..c0f99472 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -117,7 +117,7 @@
 	import { 
 		commonUploadVoiceFile
 	} from "@/api/common.js"
-
+	
 	const socketStore = useSocketStore()
 	const { SocketObj } = storeToRefs(socketStore)
 	const userInfo = computed(() => getUserInfo())
@@ -470,6 +470,7 @@
 	display: flex;
 	flex-direction: column;
 	height: 100vh;
+	overflow: hidden;
 	.top-bg{
 		background: linear-gradient(16deg,rgba(234,246,255,0) 0%,#c3e6ff 100%);
 		height: 480rpx;
@@ -485,8 +486,8 @@
 		position: absolute;
 		overflow: hidden;
 		left:0;
-		top: 0;
-		height: 100%;
+		top: 1%;
+		height: 102%;
 		width: 100%;
 		padding: 0;
 		box-sizing: border-box;
@@ -616,14 +617,15 @@
 			}
 			.question-item{
 				white-space: nowrap;
-				height: 76rpx;
-				line-height: 74rpx;
+				height: 66rpx;
+				line-height: 66rpx;
 				background-color: #fff;
 				border: 2rpx solid #e0dede;
 				padding: 0 16rpx;
 				border-radius: 11rpx;
 				margin-right: 16rpx;
 				display: inline-block;
+				font-size: 26rpx;
 				&:last-child{
 					margin-right: 0;
 				}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f5ff929b..2a738d35 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -708,18 +708,18 @@
 			.study_duration_div {
 				height: 162rpx;
 				background: linear-gradient(180deg, rgba(238, 246, 255, 0.65) 0%, #C5DFFD 4%, #FFFFFF 100%);
+				
 				border-radius: 23rpx;
 				display: flex;
 				justify-content: space-around;
 				z-index: 20;
-
+				
 				.item {
 					flex: 1;
 					// background-color: red;
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
-
 					.top {
 						font-family: PingFangSC, PingFang SC;
 						font-weight: 400;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 38a882ed..76ae587e 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -118,7 +118,8 @@ const login_fun = (): void => {
 						back_state.value = false;
 						common.navigateBack(); // 返回登录的上一页
 					} else {
-						common.switchTab('/pages/index/index');
+						// common.switchTab('/pages/index/index');
+						common.redirectTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
 					}
 				}
 			})

From ce57ad38610d2d9c38547627c15304d03b989a62 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 22 Jul 2025 14:25:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9B=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/components/touchBtn.vue | 3 +--
 src/pages/course/index.vue               | 7 ++++---
 src/pages/index/dialog.vue               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 69f1d7ca..6b272a48 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -10,7 +10,7 @@
 		</view>
 		<view class="touch-btn" v-if="keyboardIsShow">
 			<uv-input class="input-box" ref="inputRef" v-model.trim="answerValue" maxlength="500"
-				placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入答案">
+				placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入文字">
 			</uv-input>
 		</view>
 		<view class="talk-btn-box"  @click.stop="showKeyboard" v-show="!onlyVoice">
@@ -115,7 +115,6 @@ const initRecord = () => {
 		let _recordPerm = uni.getAppAuthorizeSetting()
 		let _state = _recordPerm.microphoneAuthorized
 		if(_state === 'authorized'){
-			console.log('大大大大大');
 			showTalkingModel.value = true
 		}
 	})
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index 1fbf94f6..ff98e60b 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -284,12 +284,13 @@ import { onShow } from "@dcloudio/uni-app"
 		getPrdLineTypeListApi().then(res=>{
 			coursePrdlineList.value = res.body||[]
 		})
-		getTraTagListApi().then(res=>{
-			tagsTree.value = res.body||[]
-		})
 		changeTab({name:'全部'})
 	})
   onActivated(() => {
+		// 重新获取标签信息
+		getTraTagListApi().then(res=>{
+			tagsTree.value = res.body||[]
+		})
 		changeTab({name:activeTab.value || '全部'})
 	});
 </script>
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index d5f27998..98c38aa3 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -400,7 +400,7 @@
 				}else{
 					talkingList.value.pop()
 					uni.showToast({
-						title: '语音内容不能为空！',
+						title: '未识别到文字！',
 						icon: "none",
 						duration:1000
 					});

From 47c9c53f3d749eda0f4269a80f36ee1a038520b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Tue, 22 Jul 2025 15:37:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/dialog.vue | 697 ++++++++++++++++++++-----------------
 src/pages/index/index.vue  |  18 +-
 src/pages/login/login.vue  |  17 +-
 3 files changed, 399 insertions(+), 333 deletions(-)

diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index c0f99472..b3ac284d 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -3,7 +3,8 @@
 		<!-- <MarkdownPreview/> -->
 		<view class="top-bg"></view>
 		<view class="bot-bg"></view>
-		<scroll-view class="index-dialog-body" :scroll-y="true" upper-threshold="0" refresher-enabled="true" refresher-default-style="none" @refresherrefresh="scrolltolower">
+		<scroll-view class="index-dialog-body" :scroll-y="true" upper-threshold="0" refresher-enabled="true"
+			refresher-default-style="none" @refresherrefresh="scrolltolower">
 			<view class="seek-setting">
 				<image src="@/static/images/dialog/new-dialog.png" alt="" class="image-icon-new"></image>
 				<image src="@/static/images/dialog/history.png" alt="" class="image-icon"></image>
@@ -16,7 +17,7 @@
 				<!-- <image src="@/static/images/dialog/pet-3.png" alt="" class="image-pet-bg"></image> -->
 				<image src="@/static/images/dialog/pet-bg-base.png" alt="" class="image-pet-bg"></image>
 				<image-preview :src="userInfo.mascotInfo?.imgAddr ||''" alt="" class="image-pet"></image-preview>
-				<view class="ai-info-bg-box"> 
+				<view class="ai-info-bg-box">
 					<view class="hello-text">Hi，我是{{ userInfo.mascotInfo?.mascotName || ''}}</view>
 					<view class="info-text">工作学习，我都能帮你！</view>
 					<view class="info-btn">试试他的能力</view>
@@ -25,36 +26,22 @@
 			<view class="questions-view">
 				<scroll-view :scroll-x="true" :show-scrollbar="false">
 					<view class="question-row">
-						<view 
-							class="question-item" 
-							v-for="item in Math.ceil(questionList.length/2)"
-							@click="sendText(questionList[item-1])"
-						>{{questionList[item-1]}}</view>
+						<view class="question-item" v-for="item in Math.ceil(questionList.length/2)"
+							@click="sendText(questionList[item-1])">{{questionList[item-1]}}</view>
 					</view>
 					<view class="question-row">
-						<view 
-							class="question-item" 
+						<view class="question-item"
 							v-for="item in questionList.length - Math.ceil(questionList.length/2)"
-							@click="sendText(questionList[item + Math.ceil(questionList.length/2)-1])"
-						>{{questionList[item + Math.ceil(questionList.length/2)-1]}}</view>
+							@click="sendText(questionList[item + Math.ceil(questionList.length/2)-1])">
+							{{questionList[item + Math.ceil(questionList.length/2)-1]}}</view>
 					</view>
 				</scroll-view>
 			</view>
 			<view class="talking-list">
-				<scroll-view 
-					class="talking-scroll-list"
-					:scroll-y="true" 
-					:scroll-top="scrollTop"
-					:show-scrollbar="false"
-					:scroll-with-animation="false"
-				>
-					<TalkingItem 
-						v-for="item in talkingList"
-						:talkingType="item.type"
-						:talkingInfo="item"
-						:activeVoiceId="activeVoiceTalkingItemId"
-						@handleEvents="talkItemEvents"
-					>
+				<scroll-view class="talking-scroll-list" :scroll-y="true" :scroll-top="scrollTop"
+					:show-scrollbar="false" :scroll-with-animation="false">
+					<TalkingItem v-for="item in talkingList" :talkingType="item.type" :talkingInfo="item"
+						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents">
 					</TalkingItem>
 				</scroll-view>
 			</view>
@@ -90,36 +77,56 @@
 					</view>
 				</scroll-view>
 			</view>
-			<TouchBtn  
-				class="talk-btns" 
-				@uploadVoice="uploadRecordNow" 
-				@submitAnswer="submitAnswerNow"
-				@startRecord="startRecordCallback"
-				:loadingText="sendLoadingText"
-				:isLoading="!answerIsOver"
-				:isDisabled="false"
-			/>
+			<TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
+				@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
+				:isDisabled="false" />
 		</scroll-view>
 	</view>
 </template>
 
 <script setup>
-	import { ref, unref, onMounted, watch, nextTick, computed } from 'vue'
+	import {
+		ref,
+		unref,
+		onMounted,
+		watch,
+		nextTick,
+		computed
+	} from 'vue'
 	import common from '@/common/common';
 	import TouchBtn from '@/pages/course/components/touchBtn.vue'
 	import TalkingItem from './components/talking-item.vue';
-	import { useSocketStore } from "@/store/socket.js"
-	import { useStorageStore } from "@/store/storage.js"
-	import { storeToRefs } from 'pinia'
-	import { onLoad, onShow, onUnload, onHide } from '@dcloudio/uni-app';
-	import { get_base_url, goto_login_fun } from '@/api/request'
-	import { getUserInfo } from '@/common/common';
-	import { 
+	import {
+		useSocketStore
+	} from "@/store/socket.js"
+	import {
+		useStorageStore
+	} from "@/store/storage.js"
+	import {
+		storeToRefs
+	} from 'pinia'
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide,
+		onBackPress
+	} from '@dcloudio/uni-app';
+	import {
+		get_base_url,
+		goto_login_fun
+	} from '@/api/request'
+	import {
+		getUserInfo
+	} from '@/common/common';
+	import {
 		commonUploadVoiceFile
 	} from "@/api/common.js"
-	
+
 	const socketStore = useSocketStore()
-	const { SocketObj } = storeToRefs(socketStore)
+	const {
+		SocketObj
+	} = storeToRefs(socketStore)
 	const userInfo = computed(() => getUserInfo())
 	console.log('userInfoxxx', getUserInfo());
 	const questionList = ref([
@@ -137,13 +144,13 @@
 	const scrollBoxRef = ref()
 	const scrollTop = ref(99999)
 	const scrollToBottomNow = (time = 100) => {
-		nextTick(()=>{
+		nextTick(() => {
 			setTimeout(() => {
 				scrollTop.value += 100
 				scrollTop.value += 100
-			},time)
+			}, time)
 		})
-	} 
+	}
 	const activeVoiceTalkingItemId = ref('')
 	// ws 初始化逻辑
 	const reconnectTimer = null // 重连timer
@@ -154,9 +161,9 @@
 		return unref(userInfo).mascotInfo?.mascotId || 'Tst00001'
 	})
 	const answerText = ref('')
-	const answerIsOver  = ref(true)
+	const answerIsOver = ref(true)
 	const talkingList = ref([])
-	
+
 	const showModelComfirm = ref(false)
 	const initsocketTask = () => {
 		socketStore.creatSocket('/traask/asksocket/open?summary=')
@@ -173,34 +180,38 @@
 		// 	}
 		// })
 		unref(SocketObj).on('error', () => {
-			if((watchFlag.value === 1) || showModelComfirm.value) return
+			if ((watchFlag.value === 1) || showModelComfirm.value) return
 			showModelComfirm.value = true
-			common.show('提示信息', '网络环境不稳定，请重试！',false, '','确认').then((res) => {
+			common.show('提示信息', '网络环境不稳定，请重试！', false, '', '确认').then((res) => {
 				common.redirectTo(`/pages/index/dialog`)
 			}).finally(() => {
 				showModelComfirm.value = false
 			})
 		})
-		unref(SocketObj).on('message', (res)=>{
-			const { rtnCode, body, commond } = JSON.parse(res.data) 
+		unref(SocketObj).on('message', (res) => {
+			const {
+				rtnCode,
+				body,
+				commond
+			} = JSON.parse(res.data)
 			let _id = new Date().getTime() + 'id'
-			if(rtnCode === '0000'){
-				if(commond === 'ASK-OPEN'){
-					if(!answerIsOver.value){
+			if (rtnCode === '0000') {
+				if (commond === 'ASK-OPEN') {
+					if (!answerIsOver.value) {
 						// 问题没完成， 重新尝试回答
 						sendMessage({
-							"commond" : 'ASK-RE-START',
-							"body" : {
+							"commond": 'ASK-RE-START',
+							"body": {
 								reqBatch: reqBatch.value,
 								seqNo: seqNo.value,
 								answerContent: answerText.value
 							}
 						})
-					}else{
+					} else {
 						// 新连接
 						sendMessage({
-							"commond" : 'ASK-START',
-							"body" : {
+							"commond": 'ASK-START',
+							"body": {
 								mascotId: mascotId.value,
 								deviceImei: ''
 							}
@@ -208,14 +219,15 @@
 					}
 					return
 				}
-				if(commond === 'ASK-START'){
+				if (commond === 'ASK-START') {
 					// console.log('开启对话！')
 					reqBatch.value = body.reqBatch
 					return
 				}
-				if(commond === 'ASK'){
+				if (commond === 'ASK') {
 					console.log('发送问题成功！')
-					if((talkingList.value.length > 0) && talkingList.value[talkingList.value.length-1].isLoading){
+					if ((talkingList.value.length > 0) && talkingList.value[talkingList.value.length - 1]
+						.isLoading) {
 						talkingList.value.pop()
 					}
 					seqNo.value = body.seqNo
@@ -231,19 +243,19 @@
 					})
 					return
 				}
-				if(commond === 'ASK-STOP'){
+				if (commond === 'ASK-STOP') {
 					// console.log('停止回答标记!')
 					stopAnswerCallBack.value && stopAnswerCallBack.value(askData.value)
-					setTimeout(()=>{
+					setTimeout(() => {
 						stopAnswerCallBack.value = null
-					},10)
+					}, 10)
 					return
 				}
-				if(commond === 'ASK-ANSWER'){
-					if(body.event === 'start'){
+				if (commond === 'ASK-ANSWER') {
+					if (body.event === 'start') {
 						console.log('开始回答！')
 						answerIsOver.value = false
-						answerText.value  = ''
+						answerText.value = ''
 						talkingList.value.push({
 							type: 'answer',
 							talkingText: answerText.value,
@@ -251,112 +263,112 @@
 							id: _id,
 							...body
 						})
-					}else if(body.event === 'token'){
+					} else if (body.event === 'token') {
 						answerIsOver.value = false
 						answerText.value += body.data
-					}else if(body.event === 'end'){
+					} else if (body.event === 'end') {
 						console.log('完成回答！')
 						answerIsOver.value = true
 					}
 					return
 				}
-				if(commond === 'ASK-RE-ANSWER'){
+				if (commond === 'ASK-RE-ANSWER') {
 					// console.log('开始继续回答！')
-					if(body.event === 'start'){
+					if (body.event === 'start') {
 						answerIsOver.value = false
-						answerText.value  = ''
-					}else if(body.event === 'token'){
+						answerText.value = ''
+					} else if (body.event === 'token') {
 						answerIsOver.value = false
 						answerText.value = body.data
-					}else if(body.event === 'end'){
+					} else if (body.event === 'end') {
 						answerIsOver.value = true
 					}
 					return
 				}
-				 
-				if(commond === 'ASK-ERR'){
+
+				if (commond === 'ASK-ERR') {
 					console.log('提问失败，系统异常！')
 					return
 				}
-			}else{
-				if(['0005', 'QQ0005'].includes(res.rtnCode)) {
-				  goto_login_fun();
+			} else {
+				if (['0005', 'QQ0005'].includes(res.rtnCode)) {
+					goto_login_fun();
 				}
 			}
-	 	})
+		})
 		watchFlag.value += 1
 	}
 	const sendLoadingText = ref('问题回答中，请在问题回答结束后重试！')
-	const reconnect = ()=> {
-		if(reconnectTimer || isManualClose.value) return
-		reconnectTimer = setTimeout(()=>{
+	const reconnect = () => {
+		if (reconnectTimer || isManualClose.value) return
+		reconnectTimer = setTimeout(() => {
 			initsocketTask()
-		},3000)
+		}, 3000)
 	}
-	const sendMessage = (data) => { 
+	const sendMessage = (data) => {
 		unref(SocketObj).send(data)
 	}
-	watch(() => answerText.value,(val) => {
-		if(val){
+	watch(() => answerText.value, (val) => {
+		if (val) {
 			changeText(val)
 			scrollToBottomNow()
 		}
 	})
-	
+
 	const changeText = () => {
-		if(talkingList.value.length === 0) return
-		talkingList.value[talkingList.value.length-1].talkingText = answerText.value 
+		if (talkingList.value.length === 0) return
+		talkingList.value[talkingList.value.length - 1].talkingText = answerText.value
 	}
-	
+
 	const stopAnswerCallBack = ref(null)
 	const talkItemEvents = (type, data, id = '') => {
-		switch (type){
+		switch (type) {
 			case 'reAnswer':
 				console.log('重新获取数据')
 				// 设置停止回调
 				stopAnswerCallBack.value = ($data) => {
 					sendMessage({
-						"commond" : 'ASK',
-						"body" : $data
+						"commond": 'ASK',
+						"body": $data
 					})
 				}
 				// 停止获取
 				sendMessage({
-					"commond" : 'ASK-STOP',
-					"body" : {
+					"commond": 'ASK-STOP',
+					"body": {
 						reqBatch: reqBatch.value,
 						seqNo: seqNo.value,
 					}
 				})
-			break;
+				break;
 			case 'stop':
 				console.log('停止获取数据')
 				stopAnswerCallBack.value = null
 				// ASK-STOP
 				sendMessage({
-					"commond" : 'ASK-STOP',
-					"body" : {
+					"commond": 'ASK-STOP',
+					"body": {
 						reqBatch: reqBatch.value,
 						seqNo: seqNo.value,
 					}
 				})
-			break;
+				break;
 			case 'changePlay':
 				console.log('播放/暂停')
 				activeVoiceTalkingItemId.value = id
-			break;
+				break;
 			default:
-			break;
+				break;
 		}
 	}
 	const routerTo = (type) => {
-		switch(type){
+		switch (type) {
 			case 'AI学':
 				common.switchTab('/pages/course/index')
 				break;
 			default:
 				common.msg('页面建设中，敬请期待！')
-			break;
+				break;
 		}
 	}
 	const scrolltolower = () => {
@@ -371,7 +383,7 @@
 	const uploadRecordNow = (voicePath) => {
 		// /traask/traAskchat/voiceTrans 
 		//#ifndef APP-PLUS
-			// h5 假数据
+		// h5 假数据
 		// #endif
 		//#ifdef APP-PLUS
 		talkingList.value.push({
@@ -380,68 +392,90 @@
 			isLoading: true
 		})
 		scrollToBottomNow()
-		console.log(voicePath,111111111)
-		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {}).then(res=>{
+		console.log(voicePath, 111111111)
+		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {}).then(res => {
 			let _res = JSON.parse(res.data)
-			if(_res.rtnCode === '0000'){
-				if(!!(_res.body.transContent || '').trim()){
+			if (_res.rtnCode === '0000') {
+				if (!!(_res.body.transContent || '').trim()) {
 					askData.value = {
 						reqBatch: reqBatch.value,
-						intrctWay: '02',//01-文本；02-语音；03-图片
+						intrctWay: '02', //01-文本；02-语音；03-图片
 						intrctContent: _res.body.transContent,
-						bucketKey:  _res.body.fileId,
+						bucketKey: _res.body.fileId,
 						ossFileAddr: _res.body.ossFileAddr,
 						talkingVoice: voicePath
 					}
 					sendMessage({
-						"commond" : 'ASK',
+						"commond": 'ASK',
 						"body": askData.value
 					})
-				}else{
+				} else {
 					talkingList.value.pop()
 					uni.showToast({
 						title: '语音内容不能为空！',
 						icon: "none",
-						duration:1000
+						duration: 1000
 					});
 				}
-			}else{}
-		}).catch(err=>{
+			} else {}
+		}).catch(err => {
 			talkingList.value.pop()
 			uni.showToast({
 				title: '系统异常，请联系管理员',
 				icon: "none",
-				duration:1000
+				duration: 1000
 			});
 		})
 		// #endif
 	}
 	// 发送文本
 	const submitAnswerNow = (val, cb = null) => {
-		if(!answerIsOver.value){
+		if (!answerIsOver.value) {
 			// 问题回答中
 			return
 		}
 		touchBtnCallBack.value = cb
 		askData.value = {
 			reqBatch: reqBatch.value,
-			intrctWay: '01',//01-文本；02-语音；03-图片
+			intrctWay: '01', //01-文本；02-语音；03-图片
 			intrctContent: val,
-			bucketKey:''
+			bucketKey: ''
 		}
 		sendMessage({
-			"commond" : 'ASK',
-			"body" : askData.value
+			"commond": 'ASK',
+			"body": askData.value
 		})
 	}
 	const startRecordCallback = () => {
 		// 开始录音回调
 	}
 	const watchFlag = ref(1)
-	onMounted(()=>{
+
+	onBackPress((options) => {
+		const from = options.from
+		if (from === 'backbutton') {
+			// 判断上一级是否是登录，是登录就返回两层跳过登录页
+			const pages = getCurrentPages();
+			if (pages && pages.length > 1) {
+				const page = pages[pages.length - 2];
+				if (page.route === 'pages/login/login') {
+					console.log('进来了');
+					if (pages.length == 2) {
+						common.switchTab('/pages/index/index');
+					} else {
+						common.navigateBack(2)
+					}
+					return true
+				}
+			}
+		}
+		return false
+	});
+
+	onMounted(() => {
 		initsocketTask()
 	})
-	onHide(()=>{
+	onHide(() => {
 		// if(watchFlag.value === 1) return
 		// // 停止获取
 		// sendMessage({
@@ -453,225 +487,244 @@
 		// })
 		// socketStore?.closeSocket()
 	})
-	onShow(()=>{
-		if(watchFlag.value === 1) return
+	onShow(() => {
+		if (watchFlag.value === 1) return
 		// initsocketTask()
-		
+
 	})
-	onUnload(()=>{
+	onUnload(() => {
 		watchFlag.value = 1
 		socketStore?.closeSocket()
 	})
 </script>
 
 <style scoped lang="scss">
-.index-dialog-page{
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	height: 100vh;
-	overflow: hidden;
-	.top-bg{
-		background: linear-gradient(16deg,rgba(234,246,255,0) 0%,#c3e6ff 100%);
-		height: 480rpx;
-		width: 100%;
-	}
-	.bot-bg{
-		// background-color: #F6F8FF;
-		background: linear-gradient(136deg,rgba(234,246,255,0) 0%,#c3e6ff 100%);
-		width: 100%;
-		flex: 1;
-	}
-	.index-dialog-body{
-		position: absolute;
+	.index-dialog-page {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
 		overflow: hidden;
-		left:0;
-		top: 1%;
-		height: 102%;
-		width: 100%;
-		padding: 0;
-		box-sizing: border-box;
-		// display: flex;
-		// flex-direction: column;
-		.body-title{
-			height: 140rpx;
-			text-align: center;
-			font-size: 33rpx;
-			padding-top: 70rpx;
-			line-height: 46rpx;
-			box-sizing: border-box;
-			font-weight: 500;
-			color:#000;
-			position: relative;
-			// margin-bottom: 23rpx;
-			.arrow-icon{
-				position: absolute;
-				left:36rpx;
-				top:80rpx;
-				color: #000;
-			}
+
+		.top-bg {
+			background: linear-gradient(16deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
+			height: 480rpx;
+			width: 100%;
 		}
-		
-		.seek-setting{
+
+		.bot-bg {
+			// background-color: #F6F8FF;
+			background: linear-gradient(136deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
+			width: 100%;
+			flex: 1;
+		}
+
+		.index-dialog-body {
 			position: absolute;
-			z-index: 3;
-			right: 45rpx;
-			top: 68rpx;
-			font-size: 26rpx;
-			width: 140rpx;
-			height: 52rpx;
-			padding: 10rpx 0;
 			overflow: hidden;
-			line-height: 32rpx;
-			text-align: right;
-			padding-right: 48rpx;
-			
-			.image-icon{
-				width: 30rpx;
-				height: 32rpx;
-				position: absolute;
-				right: 0;
-				top: 10rpx;
-			}
-			.image-icon-new{
-				right: 50rpx;
-				width: 30rpx;
-				height: 32rpx;
-				position: absolute;
-				top: 10rpx;
-			}
-		}
-		
-		.ai-info{
-			padding: 0 24rpx;
-			height: 250rpx;
-			overflow: hidden;
-			padding-top: 72rpx;
-			margin-bottom: 24rpx;
-			position: relative;
+			left: 0;
+			top: 1%;
+			height: 102%;
+			width: 100%;
+			padding: 0;
 			box-sizing: border-box;
-			.image-pet{
-				width: 230rpx;
-				height: 235rpx;
-				position: absolute;
-				right: 24rpx;
-				top: 15rpx;
-				z-index: 2;
-			}
-			.image-pet-bg{
-				position: absolute;
-				padding: 0 24rpx;
+
+			// display: flex;
+			// flex-direction: column;
+			.body-title {
+				height: 140rpx;
+				text-align: center;
+				font-size: 33rpx;
+				padding-top: 70rpx;
+				line-height: 46rpx;
 				box-sizing: border-box;
-				width: 100%;
-				height: 230rpx;
-				left: 0;
-				bottom: 0;
-				z-index: 2;
+				font-weight: 500;
+				color: #000;
+				position: relative;
+
+				// margin-bottom: 23rpx;
+				.arrow-icon {
+					position: absolute;
+					left: 36rpx;
+					top: 80rpx;
+					color: #000;
+				}
 			}
-			.ai-info-bg-box{
+
+			.seek-setting {
 				position: absolute;
 				z-index: 3;
-				left: 0;
+				right: 45rpx;
 				top: 68rpx;
-				width: 100%;
-				// background-color: #ccc;
-				padding: 0 64rpx;
-				height: 178rpx;
-				.hello-text{
-					height: 54rpx;
-					line-height: 44rpx;
-					font-size: 28rpx;
-					color: #666;
-				}
-				.info-text{
-					height: 44rpx;
-					line-height: 44rpx;
-					font-size: 32rpx;
-					color: #000;
-					font-weight: 600;
-				}
-				.info-btn{
-					width: 220rpx;
-					font-size: 29rpx;
-					height: 54rpx;
-					color: #fff;
-					background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
-					line-height: 54rpx;
-					text-align: center;
-					border-radius: 15rpx 15rpx 0 0;
-					position: absolute;
-					left: 68rpx;
-					bottom: 0;
-				}
-			}
-		}
-		
-		.questions-view{
-			padding-left: 24rpx;
-			padding-right: 24rpx;
-			height: 184rpx;
-			box-sizing: border-box;
-			.question-row{
-				white-space: nowrap;
-				margin-bottom: 16rpx;
-			}
-			.question-item{
-				white-space: nowrap;
-				height: 66rpx;
-				line-height: 66rpx;
-				background-color: #fff;
-				border: 2rpx solid #e0dede;
-				padding: 0 16rpx;
-				border-radius: 11rpx;
-				margin-right: 16rpx;
-				display: inline-block;
 				font-size: 26rpx;
-				&:last-child{
-					margin-right: 0;
-				}
-			}
-		}
-		
-		.router-list{
-			height: 84rpx;
-			padding: 22rpx 30rpx 0;
-			background-color: #fff;
-			border-radius: 15rpx 15rpx 0 0;
-			white-space: nowrap;
-			box-sizing: border-box;
-			.btns-item{
-				display: inline-block;
-				box-sizing: border-box;
-				height: 62rpx;
-				border: 2rpx solid #e0dede;
-				border-radius: 15rpx;
-				margin-right: 16rpx;
-				padding: 0 20rpx 0 64rpx;
-				line-height: 58rpx;
-				font-size: 29rpx;
-				position: relative;
-				.image-icon{
+				width: 140rpx;
+				height: 52rpx;
+				padding: 10rpx 0;
+				overflow: hidden;
+				line-height: 32rpx;
+				text-align: right;
+				padding-right: 48rpx;
+
+				.image-icon {
+					width: 30rpx;
+					height: 32rpx;
 					position: absolute;
-					width: 31rpx;
-					height: 31rpx;
-					top:50%;
-					transform: translateY(-50%);
-					left: 24rpx;
+					right: 0;
+					top: 10rpx;
 				}
-				&:last-child{
-					margin-right: 0;
+
+				.image-icon-new {
+					right: 50rpx;
+					width: 30rpx;
+					height: 32rpx;
+					position: absolute;
+					top: 10rpx;
 				}
 			}
-		}
-		
-		.talking-list{
-			height: calc(100% - 834rpx);
-			padding: 12rpx 24rpx;
-			box-sizing: border-box;
-			.talking-scroll-list{
-				height: 100%;
+
+			.ai-info {
+				padding: 0 24rpx;
+				height: 250rpx;
+				overflow: hidden;
+				padding-top: 72rpx;
+				margin-bottom: 24rpx;
+				position: relative;
+				box-sizing: border-box;
+
+				.image-pet {
+					width: 230rpx;
+					height: 235rpx;
+					position: absolute;
+					right: 24rpx;
+					top: 15rpx;
+					z-index: 2;
+				}
+
+				.image-pet-bg {
+					position: absolute;
+					padding: 0 24rpx;
+					box-sizing: border-box;
+					width: 100%;
+					height: 230rpx;
+					left: 0;
+					bottom: 0;
+					z-index: 2;
+				}
+
+				.ai-info-bg-box {
+					position: absolute;
+					z-index: 3;
+					left: 0;
+					top: 68rpx;
+					width: 100%;
+					// background-color: #ccc;
+					padding: 0 64rpx;
+					height: 178rpx;
+
+					.hello-text {
+						height: 54rpx;
+						line-height: 44rpx;
+						font-size: 28rpx;
+						color: #666;
+					}
+
+					.info-text {
+						height: 44rpx;
+						line-height: 44rpx;
+						font-size: 32rpx;
+						color: #000;
+						font-weight: 600;
+					}
+
+					.info-btn {
+						width: 220rpx;
+						font-size: 29rpx;
+						height: 54rpx;
+						color: #fff;
+						background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
+						line-height: 54rpx;
+						text-align: center;
+						border-radius: 15rpx 15rpx 0 0;
+						position: absolute;
+						left: 68rpx;
+						bottom: 0;
+					}
+				}
+			}
+
+			.questions-view {
+				padding-left: 24rpx;
+				padding-right: 24rpx;
+				height: 184rpx;
+				box-sizing: border-box;
+
+				.question-row {
+					white-space: nowrap;
+					margin-bottom: 16rpx;
+				}
+
+				.question-item {
+					white-space: nowrap;
+					height: 66rpx;
+					line-height: 66rpx;
+					background-color: #fff;
+					border: 2rpx solid #e0dede;
+					padding: 0 16rpx;
+					border-radius: 11rpx;
+					margin-right: 16rpx;
+					display: inline-block;
+					font-size: 26rpx;
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+
+			.router-list {
+				height: 84rpx;
+				padding: 22rpx 30rpx 0;
+				background-color: #fff;
+				border-radius: 15rpx 15rpx 0 0;
+				white-space: nowrap;
+				box-sizing: border-box;
+
+				.btns-item {
+					display: inline-block;
+					box-sizing: border-box;
+					height: 62rpx;
+					border: 2rpx solid #e0dede;
+					border-radius: 15rpx;
+					margin-right: 16rpx;
+					padding: 0 20rpx 0 64rpx;
+					line-height: 58rpx;
+					font-size: 29rpx;
+					position: relative;
+
+					.image-icon {
+						position: absolute;
+						width: 31rpx;
+						height: 31rpx;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 24rpx;
+					}
+
+					&:last-child {
+						margin-right: 0;
+					}
+				}
+			}
+
+			.talking-list {
+				height: calc(100% - 834rpx);
+				padding: 12rpx 24rpx;
+				box-sizing: border-box;
+
+				.talking-scroll-list {
+					height: 100%;
+				}
 			}
 		}
 	}
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 2a738d35..928cdf01 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -225,6 +225,7 @@
 </template>
 
 <script setup>
+	
 	import {
 		computed,
 		onBeforeMount,
@@ -255,6 +256,7 @@
 		queryCrsInfoByPopular,
 		queryCrsInfoByRecmd,
 	} from '@/api/index.js'
+	
 	const scrollTop = ref(0);
 	const stdtTmLenRef = ref(null);
 	const accmPracticeCntRef = ref(null);
@@ -275,6 +277,9 @@
 	onPageScroll((e) => {
 		scrollTop.value = e.scrollTop
 	})
+	
+	
+	
 	// 滚动消息
 	const notice_text = ref(['绿色金融政策解析与商业银行绿色水水水水水水水水水水水水水', '绿色金融政策解析与商业银行红色'])
 	const init_class_data = [{
@@ -377,18 +382,17 @@
 		})
 	}
 	onShow(() => {
-		setMascot()
-		const userInfo = getUserInfo()
-		if(userInfo) {
-			mascotInfo.value = userInfo?.mascotInfo
-			console.log('是', mascotInfo.value);
-		}
 		if (!common.isLogin()) {
 			common.navigateTo('/pages/login/login')
 			return
 		}
+		
+		setMascot()
+		const userInfo = getUserInfo()
+		if(userInfo) {
+			mascotInfo.value = userInfo?.mascotInfo
+		}
 		statistics_data['get_statistics_data']() // 获取统计数据
-		if (!common.isLogin()) return;
 		queryCrsInfoByLastnew().then(res => {
 			new_class_list.value = res.body
 		})
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 76ae587e..43db8e5f 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -116,14 +116,23 @@ const login_fun = (): void => {
 						// 页面栈只有一页，没有返回页，那就返回首页
 						console.log('返回登录的上一页');
 						back_state.value = false;
-						common.navigateBack(); // 返回登录的上一页
+						//如果上一页是首页，就返回弹出页
+						const page = pages[pages.length - 2];
+						console.log('page.route', page.route);
+						if (page.route === 'pages/index/index') { 
+							common.navigateTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
+						} else {
+							common.navigateBack(); // 返回登录的上一页
+						}
+						
 					} else {
 						// common.switchTab('/pages/index/index');
-						common.redirectTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
+						
+						common.navigateTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
+						// common.redirectTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
 					}
 				}
-			})
-			.catch((res) => {
+			}).catch((res) => {
 				console.log(res);
 				common.hideLoading();
 				if (res.rtnCode === '0002') {