From b4d6944076f1df6eedaae35c4c2a7072fe988e8a Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期二, 30 四月 2024 15:34:02 +0800 Subject: [PATCH] update: package-lock.json --- PAMapp/pages/notification/index.vue | 50 ++++++++++++++++++++------------------------------ 1 files changed, 20 insertions(+), 30 deletions(-) diff --git a/PAMapp/pages/notification/index.vue b/PAMapp/pages/notification/index.vue index f79907c..f3de575 100644 --- a/PAMapp/pages/notification/index.vue +++ b/PAMapp/pages/notification/index.vue @@ -1,15 +1,10 @@ <template> <div> - <!-- TODO: ��撌脰�/���� ���摰����瘙�Ⅱ隤� ����� --> - <!-- <div class="text--right mb-10" @click="showNotificationHint = true"> - <i class="satisfaction-icon icon-edit"></i> - </div> --> <div v-if="isUserLogin && unReviewLogList.length" class="satisfaction-banner my-10 cursor--pointer" @click="$router.push('/satisfactionList')" > - <p class="satisfaction-text text--center">隢‵撖急遛��漲隤踵</p> </div> <el-row v-for="(item, index) in notificationList" @@ -19,8 +14,7 @@ align="middle" class="notification-card" > - <!-- TODO: ��撌脰�/���� ���摰����瘙�Ⅱ隤� ����� --> - <!-- <el-col class="unRead" :span="3" v-if="!item.readDate"></el-col> --> + <el-col class="unRead" :span="3" v-if="!item.readDate"></el-col> <el-col :span="18"> <p class="text">{{item.content}}</p> </el-col> @@ -40,22 +34,6 @@ </el-col> </el-row> - - <PopUpFrame - :isOpen.sync="showNotificationHint" - > - <div class="text--center mdTxt"> - <p class="mb-30">�</p> - <div class="mb-20 cursor--pointer">��撌脰�</div> - <div class="cursor--pointer">����</div> - <div class="text--center mt-30"> - <el-button - type="primary" - @click="showNotificationHint = false" - >蝣箏��</el-button> - </div> - </div> - </PopUpFrame> </div> </template> @@ -64,6 +42,7 @@ import { AppointmentLog } from "~/shared/models/appointment.model"; import { NotificationList } from "~/shared/models/reviews.model"; import authService from "~/shared/services/auth.service"; +import reviewsService from "~/shared/services/reviews.service"; @Component export default class Notification extends Vue { @@ -74,14 +53,25 @@ @State notificationList!: NotificationList[]; - showNotificationHint = false; isUserLogin = false; //////////////////////////////////////////////////////////// - mounted() { - this.isUserLogin = authService.isUserLogin(); + async mounted() { + this.isUserLogin = authService.isUserLogin(); + + try { + const response = await reviewsService.readAllMyNotification(); + if (response !== null) { + } else { + throw new Error('reviewsService.readAllMyNotification returned null-like value.'); + } + } catch (error) { + console.error('An error occurred while reading all notifications:', error); + throw error; } + } + } </script> @@ -90,7 +80,7 @@ .satisfaction-banner { width: 100%; height: 60px; - background-image: url('~/assets/images/satisfaction/satisfactionBtn_mob.svg'); + background-image: url('~/assets/images/satisfaction/satisfactionBtn_s_mob.svg'); background-repeat: no-repeat; background-size: cover; background-position: center; @@ -104,7 +94,7 @@ @include desktop { height: 110px; - background-image: url('~/assets/images/satisfaction/satisfactionBtn_web.svg'); + background-image: url('~/assets/images/satisfaction/satisfactionBtn_s_web.svg'); .satisfaction-text { font-size: 24px; @@ -121,7 +111,7 @@ width: 10px; height: 10px; border-radius: 50px; - background-color: $YELLOW; + background-color: $PRIMARY_RED; } .notification-period { @@ -142,4 +132,4 @@ font-size: 24px; @extend .cursor--pointer; } -</style> \ No newline at end of file +</style> -- Gitblit v1.8.0