Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

.env.development

@@ -7,7 +7,7 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_API_Url = 'http://192.168.247.200'
@@ -19,7 +19,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # sit
-#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
 
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'

.env.sit

@@ -2,4 +2,4 @@
 ENV = 'sit'
 
 # base api
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'

src/pages/index/components/class_scroll.vue

@@ -51,28 +51,22 @@
 </template>
 
 <script setup>
-	import { computed, nextTick, onBeforeMount, onMounted, reactive, ref } from 'vue';
-
+	import { ref } from 'vue';
 	import {
-		queryCrsInfoByLastnew,
-		queryCrsInfoByPopular,
 		queryCrsInfoByRecmd,
 		queryNewPolicyNewProducts
 	} from '@/api/index.js';
-
 	import common from '@/common/common';
 	import hostIcon from '@/static/images/index/hot.png';
 	import recommendIcon from '@/static/images/index/recommend.png';
 	import newIcon from '@/static/images/index/new.png';
 	import kcIcon from '@/static/images/index/kc_icon.png';
 	import plIcon from '@/static/images/index/pl_icon.png';
-
 	const props = defineProps({
 		name: {
 			type: String
 		}
 	});
-	// 1. 先定义命名函数，明确函数用途
 	const getConfigByProps = () => {
 		if (props.name === 'recommend_class') {
 			return {
@@ -88,10 +82,7 @@
 			};
 		}
 	};
-
-	// 2. 调用命名函数，解构赋值
 	const { fetchFunction, title, icon } = getConfigByProps(); // 调用函数，获取返回对象后解构
-	
 	const init_class_data = [
 		{
 			id: '',
@@ -110,6 +101,11 @@
 	];
 	const class_list = ref([]);
 	const skeleton = [
+		{
+			type: 'line',
+			num: 1,
+			style: 'marginBottom:20rpx;',
+		},
 		{
 			type: 'flex',
 			num: 1,
@@ -122,8 +118,7 @@
 				{
 					type: 'line',
 					num: 3,
-
-					style: ['width: 240rpx;', null, null]
+					style: ['width: 240rpx;']
 				}
 			]
 		}
@@ -131,15 +126,9 @@
 	const get_data = () => {
 		class_list.value = [...init_class_data];
 		fetchFunction().then((res) => {
-			if (props.name === 'hot_class') {
-			} else {
-				// class_list.value = res.body;
-			}
 			class_list.value = res.body;
 		});
 	};
-	defineExpose({ get_data });
-
 	// 进入课程详情页
 	const goto_course_detail = ({id, type}) => {
 		// 00课程 01陪练
@@ -148,8 +137,8 @@
 		} else if(type === '01') {
 			common.navigateTo('/pages/sparring/detail?traId=' + id);
 		}
-		
 	};
+	defineExpose({ get_data });
 </script>
 
 <style lang="scss" scoped>

src/pages/index/dialog.vue

@@ -114,7 +114,7 @@
 			<TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
 				@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
 				:adjustPosition="true" :isDisabled="isHistory" />
-<!-- 			<touch-btn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
+	<!-- 		<touch-btn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
 				@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
 				:adjustPosition="true" :isDisabled="isHistory" /> -->
 				

src/pages/login/login.vue

@@ -81,8 +81,8 @@
 	const socketStore = useSocketStore();
 	const { taskSocket } = storeToRefs(socketStore);
 	const show_password = ref<Boolean>(false);
-	const account = ref<string>('admin');
-	const password = ref<string>('123456');
+	const account = ref<string>('');
+	const password = ref<string>('');
 	const read_text_state = ref<Array<unknown>>([]);
 	const imeHeight = ref('0px');
 	const back_state = ref(true);