界面优化

src/app/contact/contact.page.html

@@ -1,5 +1,8 @@
 <ion-header>
   <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="tabs"></ion-back-button>
+    </ion-buttons>
     <ion-title>
       个人信息
     </ion-title>

src/app/login/login.page.html

@@ -1,5 +1,8 @@
 <ion-header [translucent]="true">
   <ion-toolbar>
+    <ion-buttons slot="start">
+        <ion-back-button defaultHref="tabs"></ion-back-button>
+    </ion-buttons>
     <ion-title>login</ion-title>
   </ion-toolbar>
 </ion-header>

src/app/login/login.page.scss

@@ -7,7 +7,7 @@
 section {
     min-height: 100vh;
     width: 100%;
-    background: url(../../assets/img/bg.jpg) no-repeat;
+    background: url(../../assets/img/bg2.jpg) no-repeat;
     background-position: center;
     background-size: cover;
     display: flex;

src/app/register/register.page.scss

@@ -6,7 +6,7 @@
 section {
     min-height: 100vh;
     width: 100%;
-    background: url(../../assets/img/bg.jpg) no-repeat;
+    background: url(../../assets/img/bg2.jpg) no-repeat;
     background-position: center;
     background-size: cover;
     display: flex;

src/app/tab1/tab1.page.html

@@ -122,13 +122,31 @@
       </ion-row>
     </ion-grid>
   </ion-card-content>
+  <ion-card-content style="margin-top: -15px;">
+    <ion-grid>
+      <ion-row>
+        <!-- 右侧部分 -->
+        <ion-col size="6">
+          <img src="/assets/img/p5.jpg" style="width: 100%;" alt="Right Image">
+          <div class="subscription-text">
+            <p style="font-size: initial; margin-top: -25%;">中国特色的社会哀悼<br>陌生人的持续性联结<br>对抗遗忘</p>
+            <ion-button color="secondary" expand="block">点击立即订阅</ion-button> 
+          </div>
+        </ion-col>
+        <!-- 左侧部分 -->
+        <ion-col size="6">
+          <img src="/assets/img/p4.jpg" style="width: 100%;" alt="Left Image">
+          <div class="subscription-text">
+            <p style="font-size: initial; margin-top: -25%;">一篇论文了解数字生命<br>媒介连接逝者<br>逝者犹可追</p>
+            <ion-button color="medium" expand="block">点击立即订阅</ion-button> 
+          </div>
+        </ion-col>
+        
+      </ion-row>
+    </ion-grid>
+  </ion-card-content>
 </ion-card>
-<<<<<<< HEAD
-
 
-=======
->>>>>>
->>>>>>> 5c0bf56fd16d962ee0d7badd095d072b8a73a689
   <!-- 右下角上传按钮 -->
   <ion-fab vertical="bottom" horizontal="end" slot="fixed">
     <ion-fab-button (click)="uploadFiles()">