From 18b1bd6320e6996520c3fb06a6383448e0314771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Fri, 4 Jul 2025 10:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=9B=9E=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                 |  2 +-
 Android/local.properties                         |  5 ++---
 src/api/login.js                                 |  7 +++++++
 src/components/picture-upload/picture-upload.vue |  4 +---
 src/pages/courseDetail/components/comment.vue    |  9 ++++++---
 src/pages/courseDetail/index.vue                 | 14 ++++++++++----
 src/pages/courseDetail/submit.vue                | 16 ++++++++++++----
 src/pages/login/ysxy.vue                         |  9 ++++++---
 src/pages/setting/index.vue                      |  2 +-
 9 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/.env.development b/.env.development
index e4b66e61..b1d572ea 100644
--- a/.env.development
+++ b/.env.development
@@ -10,7 +10,7 @@ ENV = 'development'
 VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # http://25.18.122.65:7001/download/dev-jax.apk
 # app入口
-# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
diff --git a/Android/local.properties b/Android/local.properties
index 628cff03..8fa08ca9 100644
--- a/Android/local.properties
+++ b/Android/local.properties
@@ -4,6 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Jul 02 20:55:16 CST 2025
-# sdk.dir=C\:\\Users\\ty\\AppData\\Local\\Android\\Sdk
-sdk.dir=/data/jenkins/agent/workspace/tra-app-build-test/android-sdk
\ No newline at end of file
+#Thu Jul 03 09:46:08 CST 2025
+sdk.dir=C\:\\Users\\ty\\AppData\\Local\\Android\\Sdk
diff --git a/src/api/login.js b/src/api/login.js
index 648f0013..893c4dba 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -128,6 +128,13 @@ export const getYsxy = (data) => request({
 	data
 })
 
+//获取服务条款
+export const getFutk = (data) => request({
+	url: '/traapp/dfAgtInfo/queryValidDfAgtTerm',
+	method: 'post',
+	data
+})
+
 // 获取验证码（作废）
 export const getLoginAppCheckCode = (data) => request({
 	url: '/traapp/access/checkCode',
diff --git a/src/components/picture-upload/picture-upload.vue b/src/components/picture-upload/picture-upload.vue
index a05e2990..46c17667 100644
--- a/src/components/picture-upload/picture-upload.vue
+++ b/src/components/picture-upload/picture-upload.vue
@@ -13,11 +13,9 @@
 	import {
 		ref,
 		reactive,
-		defineEmits,
 		onMounted,
 		computed,
-		watch,
-		
+		watch
 	} from 'vue'
 	import common from '@/common/common'
 
diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue
index 3ea59a4b..44dce679 100644
--- a/src/pages/courseDetail/components/comment.vue
+++ b/src/pages/courseDetail/components/comment.vue
@@ -106,7 +106,7 @@
 	import {
 		qryTraCrsBbsDataByCrsNum,
 		replyTraCrsBbsInfo,
-		qryChildTraCrsBbsInfo,
+		qryChildTraCrsBbsInfo
 	} from '@/api/courseDetail.js';
 	import common from '@/common/common.js'
 	const popup = ref(null)
@@ -160,8 +160,7 @@
 			common.hideLoading()
 		}
 	}
-
-	onMounted(() => {
+	const getData = () => {
 		qryTraCrsBbsDataByCrsNum({
 			crsNum: props.crsNum
 		}).then(({
@@ -169,6 +168,10 @@
 		}) => {
 			Object.assign(message_list, body)
 		})
+	}
+	defineExpose({getData})
+	onMounted(() => {
+		getData()
 	})
 </script>
 
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 50018643..5f180675 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -37,7 +37,7 @@
 					<knowledge v-model="form"></knowledge>
 				</view>
 				<view class="evaluate" v-if="tabAct == 2">
-					<comment :crsNum="form.crsNum" :imgId="form.imgId"></comment>
+					<comment ref="commentRef" :crsNum="form.crsNum" :imgId="form.imgId"></comment>
 				</view>
 
 			</view>
@@ -48,12 +48,12 @@
 				@click="common.navigateTo('/pages/course/study?crsNum='+crsNum+'&crsId='+form.crsId)">去学习</uv-button>
 			<uv-button type="primary">去练习</uv-button>
 			<uv-button type="primary">去考试</uv-button>
-
+			
 			<!-- 	<template v-if="tabAct == 2">
 				<uv-button type="primary" class="send_evaluate"
 					@click="common.navigateTo('/pages/courseDetail/submit?crsNum='+crsNum)">发布评价</uv-button>
 			</template> -->
-
+			
 		</view>
 	</view>
 </template>
@@ -64,7 +64,7 @@
 		ref
 	} from 'vue';
 	import {
-		onLoad
+		onLoad,onShow
 	} from '@dcloudio/uni-app';
 	import {
 		getCourseDetailApi
@@ -83,6 +83,7 @@
 	}, {
 		name: '评价'
 	}]);
+	const commentRef = ref(null);
 	const form = ref({});
 	const crsNum = ref('');
 	const tabAct = ref(0);
@@ -101,6 +102,11 @@
 		crsNum.value = params.crsNum;
 		getData();
 	});
+	onShow(() => {
+		if (common.getPageCache('GLOBAL_TRIGGER_UPDATE_REFRESH_KEY')) {
+			commentRef.value.getData();
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue
index 6ec7ae16..0a91edc2 100644
--- a/src/pages/courseDetail/submit.vue
+++ b/src/pages/courseDetail/submit.vue
@@ -26,7 +26,8 @@
 						<view class="slider-box">
 							<!-- <uv-slider step="1" activeColor="#0066FF" :blockSize="14" v-model="formData.bbsGrade"
 								:min="0" :max="10"></uv-slider> -->
-							<slider :min="0" :max="10" :value="formData.bbsGrade" :step="0.1" :show-value="true" :blockSize="14"></slider>
+							<slider :min="0" :max="10" :value="formData.bbsGrade" :step="0.1" :show-value="true"
+								:blockSize="14"></slider>
 						</view>
 						<!-- <view class="flex-jcsb">
 							<view class="font_pf fz-30 c-000">0</view>
@@ -41,7 +42,8 @@
 						提问</view>
 				</view>
 				<view class="input-textarea">
-					<uv-textarea v-model="formData.bbsContent" height="124" count :maxlength="TextareaInputLimitCharacter"
+					<uv-textarea v-model="formData.bbsContent" height="124" count
+						:maxlength="TextareaInputLimitCharacter"
 						:placeholder="formData.bbsTag == 'SUG'?'请输入你的建议...':'请输入你的问题...'"></uv-textarea>
 				</view>
 			</view>
@@ -57,7 +59,9 @@
 		reactive,
 		ref
 	} from 'vue';
-	import {TextareaInputLimitCharacter} from "@/enum.js"
+	import {
+		TextareaInputLimitCharacter
+	} from "@/enum.js"
 	import {
 		onLoad
 	} from '@dcloudio/uni-app';
@@ -84,7 +88,11 @@
 		}
 		publishCrsEvaluation(formData).then(res => {
 			common.msg('发表成功')
-			setTimeout(() => common.navigateBack(), 500)
+			setTimeout(() => {
+				common.navigateBack(1, () => {
+					common.setPageCache('GLOBAL_TRIGGER_UPDATE_REFRESH_KEY', true)
+				})
+			}, 500)
 		})
 	}
 	onLoad((params) => {
diff --git a/src/pages/login/ysxy.vue b/src/pages/login/ysxy.vue
index 3df857ae..100d7b0b 100644
--- a/src/pages/login/ysxy.vue
+++ b/src/pages/login/ysxy.vue
@@ -13,14 +13,17 @@
 	} from '@dcloudio/uni-app'
 	import common from '@/common/common'
 	import {
-		getYsxy
+		getYsxy,
+		getFutk
 	} from '@/api/login.js'
 	const ysxi_text = ref('')
 	onLoad((e) => {
 		common.loading()
 		if (e.page == 1) {
-			ysxi_text.value = "服务条款"
-			common.hideLoading()
+			getFutk().then(res => {
+				ysxi_text.value = res.body.agtContt
+				common.hideLoading()
+			});
 		} else {
 			getYsxy().then(res => {
 				ysxi_text.value = res.body.agtContt
diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue
index 8456f90c..2ff0b050 100644
--- a/src/pages/setting/index.vue
+++ b/src/pages/setting/index.vue
@@ -91,7 +91,7 @@
 			common.loading('更新头像中')
 			try{
 				const data = {
-					bizScen: 'S3010',
+					bizScen: 'S3007',
 					thumbnailFlag: true,
 					thumbImgSize:100
 				}