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

.env.development

@@ -6,7 +6,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:7002'
 
 # app入口
 #VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'

src/pages/learningTasks/components/content.vue

@@ -21,10 +21,9 @@
 	import { ref, onMounted, watch, computed, nextTick } from 'vue';
 	import useZpaging from '@/composables/useZpaging.js';
 	import { queryAllTraTaskInfoByUserId } from '@/api/learningTasks.js';
-	const pagingRef = ref(null);
+	
 	const fetchFunction = (params) => queryAllTraTaskInfoByUserId({ state: props.state, ...params });
-	const { queryList, data_list, reload, search, total, clear } = useZpaging({
-		pagingRef,
+	const {pagingRef, queryList, data_list, reload, search, total, clear } = useZpaging({
 		fetchFunction,
 		searchKey: 'taskName'
 	});

src/pages/login/ysxy.vue

@@ -1,37 +1,65 @@
 <template>
 	<view class="main_div max_page">
 		<!-- <view v-html="ysxi_text"></view> -->
+		<view class="top_view"></view>
 		<web-view
-		  :src="ysxi_text"
-		  :fullscreen="true"
-		  :webview-styles="{
-		    width: '100%',
-		    height: '100%'
-		  }"></web-view>
+			:src="ysxi_text"
+			:fullscreen="true"
+			:webview-styles="{
+				width: '100%',
+				height: '100%'
+			}"
+		></web-view>
 	</view>
 </template>
 
-<script setup>
-	import {
-		ref
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import common from '@/common/common'
-	import { get_base_url } from '@/api/request.js'
-	import {
-		getYsxy,
-		getFutk
-	} from '@/api/login.js'
-	const ysxi_text = ref('')
-	onLoad(() => {
-		const base_url = get_base_url()
-		ysxi_text.value = base_url + '/traapp/dfAgtInfo/queryValidDfAgtHtml'
-		console.log('ysxi_text.value', ysxi_text.value);
-	})
-</script>
+<script>
+	import common from '@/common/common';
+	import { get_base_url } from '@/api/request.js';
 
+	export default {
+		data() {
+			return {
+				ysxi_text: ''
+			};
+		},
+		onLoad() {
+			const base_url = get_base_url();
+			this.ysxi_text = base_url + '/traapp/dfAgtInfo/queryValidDfAgtHtml';
+		},
+		onShow() {},
+		onReady() {
+			//#ifdef APP-PLUS
+			var currentWebview = this.$scope.$getAppWebview();
+
+			function checkAndSetStyle(topHeight) {
+				const wv = currentWebview.children()[0];
+				if (wv !== undefined) {
+					// 当wv存在时设置样式
+					wv.setStyle({
+						top: topHeight,
+						scalable:false
+					});
+				} else {
+					// 不存在则短暂延迟后再次检查
+					setTimeout(checkAndSetStyle(topHeight), 20); // 每20毫秒检查一次
+				}
+			}
+			uni.getSystemInfo({
+				success: function (res) {
+					checkAndSetStyle(res.statusBarHeight);
+				}
+			});
+
+			// #endif
+		},
+		methods: {
+			backRouter() {
+				common.navigateBack();
+			}
+		}
+	};
+</script>
 <style lang="scss" scoped>
 	.main_div {
 		margin-top: 20%;
@@ -39,6 +67,9 @@
 		display: flex;
 		justify-content: center;
 		font-weight: 600;
-
 	}
-</style>
+	.top_view {
+		width: 100%;
+		height: var(--status-bar-height);
+	}
+</style>