|
@@ -122,13 +122,38 @@
|
|
|
</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
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
+=======
|
|
|
|
|
|
=======
|
|
|
>>>>>>
|
|
|
>>>>>>
|
|
|
+>>>>>>> 4687652443d467717032ed11fa6fcc483f55467d
|
|
|
<!-- 右下角上传按钮 -->
|
|
|
<ion-fab vertical="bottom" horizontal="end" slot="fixed">
|
|
|
<ion-fab-button (click)="uploadFiles()">
|