From e422239791b35a7c466372eda8c99d2775a6bae1 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 14:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/pages/appointmentAgenda/index.vue | 92 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/PAMapp/pages/appointmentAgenda/index.vue b/PAMapp/pages/appointmentAgenda/index.vue
index a1b5568..4e3db90 100644
--- a/PAMapp/pages/appointmentAgenda/index.vue
+++ b/PAMapp/pages/appointmentAgenda/index.vue
@@ -1,41 +1,56 @@
<template>
<div>
<div class="mdTxt">�撠�赤����(3)</div>
+
<div class="remind-container">
- <div class="remind-content">
- <div class="remind-first-line mr-10">
- <div class="txt-margin">2021</div>
- <div>12/25</div>
+ <div class="remind-date mr-10">
+ <div class="mb-3 smTxt bgc-primary-red date-year">
+ <div class="mb-3 mt-2">2021</div>
</div>
- <div class="remind-content-txt">
- <div class="txt-margin">09:00</div>
- <div>蝝赤���</div>
- </div>
+ <div class="p mt-5">
+ <div>12/25</div>
+ </div>
+ </div>
+
+ <div class="remind-content-txt">
+ <div class="mb-3">09:00</div>
+ <div>蝝赤���</div>
</div>
</div>
- <div class="remind-container">
- <div class="remind-content">
- <div class="remind-first-line mr-10">
- <div class="txt-margin">2021</div>
- <div>12/22</div>
+
+ <div class="remind-container">
+
+ <div class="remind-date mr-10">
+ <div class="mb-3 smTxt bgc-primary-red date-year">
+ <div class="mb-3 mt-2">2021</div>
</div>
- <div class="remind-content-txt">
- <div class="txt-margin">13:00</div>
- <div>蝝赤�����</div>
- </div>
+ <div class="p mt-5">
+ <div>12/25</div>
+ </div>
</div>
+
+ <div class="remind-content-txt">
+ <div class="mb-3">09:00</div>
+ <div>蝝赤���</div>
+ </div>
+
</div>
- <div class="remind-container">
- <div class="remind-content">
- <div class="remind-first-line mr-10">
- <div class="txt-margin">2021</div>
- <div>12/18</div>
+ <div class="remind-container">
+
+ <div class="remind-date mr-10">
+ <div class="mb-3 smTxt bgc-primary-red date-year">
+ <div class="mb-3 mt-2">2021</div>
</div>
- <div class="remind-content-txt">
- <div class="txt-margin">09:00</div>
- <div>蝝赤��摩隡�</div>
- </div>
+ <div class="p mt-5">
+ <div>12/25</div>
+ </div>
</div>
+
+ <div class="remind-content-txt">
+ <div class="mb-3">09:00</div>
+ <div>蝝赤���</div>
+ </div>
+
</div>
</div>
</template>
@@ -50,29 +65,4 @@
}
</script>
<style lang="scss" scoped>
- .remind-container{
- margin-top: 13px;
- border: 1px solid #CCCCCC;
- height: 61px;
- border-radius: 5px;
- margin-bottom: 20px;
- background-color: #fff;
- .remind-content{
- display: flex;
- padding: 13px 10px;
- .remind-first-line{
- display: flex;
- flex-direction: column;
- align-items: center;
- font-weight: bold;
- }
- }
- }
-.remind-content-txt{
- display: flex;
- flex-direction: column;
-}
-.txt-margin{
- margin-bottom: 3px;
-}
</style>
--
Gitblit v1.8.0