Merge branch '长阳分支中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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>

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;

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;
 }

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;

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;