From 07010a68062afc8b36161c777fbbe07eb7be43b7 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Wed, 24 Apr 2024 14:01:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=80=9A=E8=AE=AF=E5=BD=95=E5=B1=82=E7=BA=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/components/tabbar/tabbar.vue                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tabbar/tabbar.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tabbar/tabbar.vue
index ab4ae60bd..2b29823d0 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tabbar/tabbar.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tabbar/tabbar.vue	
@@ -114,6 +114,7 @@
         align-items: center;
         padding-bottom: env(safe-area-inset-bottom); // 适配iphoneX的底部
 		border-top: 2rpx solid #CDCDCD;
+		z-index:999;
  
         .tab-item {
             flex: 1;

From 26b98b9138f80e83950f102b1d773b1389514e82 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Wed, 24 Apr 2024 14:09:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?web=20=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoFresh/PrintSignFlow.cshtml                   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PrintSignFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PrintSignFlow.cshtml
index 1199bf42d..40d0a02fc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PrintSignFlow.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PrintSignFlow.cshtml	
@@ -77,7 +77,7 @@
     <!--  / warpper  -->
     <div class="printBox" style="overflow: hidden;">
         <div class="title">长阳土家族自治县职业教育中心</div>
-        <div class="title">2022年新生报到流程单</div>
+        <div class="title"><span id="fullYear"></span>年新生报到流程单</div>
         <table cellspacing="0" cellpadding="0" class="table">
             <tr>
                 <td style="width:17%">姓名</td>
@@ -135,5 +135,7 @@
 
     };
 
+    let year = new Date().getFullYear();
+    $('#fullYear').text(year);
 </script>
 </html>

From 0e7fe60b94c096a4736220ab6d5ec6eba954c8a2 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Fri, 26 Apr 2024 15:03:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=8A=A8=E6=80=81tabbar=E8=A6=86=E7=9B=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue | 3 +++
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue    | 2 +-
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue
index a44410283..1c0ae2e52 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/contact.vue	
@@ -61,6 +61,9 @@ export default {
 </script>
 
 <style lang="less">
+.page{
+	padding-bottom: 48px;
+}
 page {
   padding-top: 100rpx;
 }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue
index 7eb076ae8..ede9c56b1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue	
@@ -669,7 +669,7 @@ export default {
 <style lang="less" scoped>
 .page {
   background-color: #f3f3f3;
-
+  padding-bottom: 48px;
   .header {
     height: 100rpx;
     background-color: #0c86d8;
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue
index b69ab903c..81d4d10af 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
@@ -244,6 +244,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.page{
+	padding-bottom: 48px;
+}
 .mybanner {
   background: #0c86d8;
   height: 120px;