From 86541ce0f13750d4c2d458e2bc4194ac7fd957d9 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期六, 22 一月 2022 16:03:38 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
PAMapp/components/Interview/InterviewAdd.vue | 12 +++---
PAMapp/components/Interview/InterviewCard.vue | 1
PAMapp/pages/questionnaire/_agentNo.vue | 29 ++++++++++++--
PAMapp/pages/appointment/_appointmentId/interview/new/index.vue | 9 ++++
PAMapp/components/Appointment/AppointmentInterviewList.vue | 13 +++++-
PAMapp/assets/scss/utilities/_heading.scss | 2 -
PAMapp/pages/satisfactionList.vue | 4 +-
7 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss
index 250bfa7..9ec9f55 100644
--- a/PAMapp/assets/scss/utilities/_heading.scss
+++ b/PAMapp/assets/scss/utilities/_heading.scss
@@ -125,7 +125,6 @@
@extend .text--bold;
@extend .text--primary;
@extend .cursor--pointer;
- @extend .text--underline;
}
.pam-link-button--lg {
@@ -134,5 +133,4 @@
@extend .text--bold;
@extend .text--primary;
@extend .cursor--pointer;
- @extend .text--underline;
}
diff --git a/PAMapp/components/Appointment/AppointmentInterviewList.vue b/PAMapp/components/Appointment/AppointmentInterviewList.vue
index dc06f5b..8366632 100644
--- a/PAMapp/components/Appointment/AppointmentInterviewList.vue
+++ b/PAMapp/components/Appointment/AppointmentInterviewList.vue
@@ -2,13 +2,16 @@
<div>
<div class="interview__header">
<div class="mdTxt">蝝赤蝝����</div>
- <div class="pam-link-button--lg"
+ <div class="pam-link-button"
@click="addInterview">+�憓�</div>
</div>
<InterviewCard :interviewList="displayList.slice(0, 3)"></InterviewCard>
- <section class="text--right mt-30" v-if="interviewList.length > 3">
- <div class="pam-link-button--lg" @click="readMoreBtn">撅��憭�</div>
+ <section class="text--right mt-30 interview-check-more" v-if="interviewList.length > 3">
+ <div class="pam-link-button" @click="readMoreBtn">
+ 撅��憭�
+ <i class="icon-expand"></i>
+ </div>
</section>
</div>
</template>
@@ -61,4 +64,8 @@
justify-content: space-between;
margin-bottom : 10px;
}
+.interview-check-more{
+ display: flex;
+ justify-content: center;
+}
</style>
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 91961c7..511920e 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -6,19 +6,19 @@
</div>
<el-row class="mdTxt mb-10">
<el-col :xs="16" :sm="20">
- <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
- </el-col>
+ <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
+ </el-col>
<el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
<span
v-if="!isEdit"
- class="mr-10 text--primary text--underline cursor--pointer"
+ class="mr-10 text--primary cursor--pointer"
@click="showCancelPopUp = true"
- >��</span>
+ ><i class="icon-delet"></i></span>
<span
v-if="!isEdit"
- class="text--primary text--underline cursor--pointer"
+ class="text--primary cursor--pointer"
@click="isEdit = !isEdit"
- >蝺刻摩</span>
+ ><i class="icon-edit"></i></span>
</el-col>
</el-row>
<template v-if="!interviewId || isEdit">
diff --git a/PAMapp/components/Interview/InterviewCard.vue b/PAMapp/components/Interview/InterviewCard.vue
index edef55d..c0e9a0f 100644
--- a/PAMapp/components/Interview/InterviewCard.vue
+++ b/PAMapp/components/Interview/InterviewCard.vue
@@ -138,6 +138,7 @@
}
.record-card {
height: 64px;
+ margin-bottom: 20px;
.record-card-date{
display: flex;
flex-direction: column;
diff --git a/PAMapp/pages/appointment/_appointmentId/interview/new/index.vue b/PAMapp/pages/appointment/_appointmentId/interview/new/index.vue
index debc00f..e1f9420 100644
--- a/PAMapp/pages/appointment/_appointmentId/interview/new/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/interview/new/index.vue
@@ -43,4 +43,13 @@
display: flex;
justify-content: center;
}
+.required {
+ position: relative;
+ &::before {
+ content: '*';
+ position: absolute;
+ color: #FF0000;
+ transform: translate(-12px, 0);
+ }
+}
</style>
diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index 1c2d4a2..cc1ccc5 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -115,12 +115,21 @@
</PopUpFrame>
<PopUpFrame :isOpen.sync="sendReserve" @update:isOpen="closeReservePopUp">
- <div class="text--middle mt-30 sendReserve-txt">�������</div>
- <div class="text--middle sendReserve-txt">�����“�������蝯∴��</div>
+ <div class="mdTxt mt-30 sendReserve-txt">�������</div>
+ <div class="mdTxt sendReserve-txt mb-30">�����“�������蝯∴��</div>
+ <div class="pam-app-review mb-10">
+ <div class="mdTxt mb-10">撠
+ <span class="mdTxt text--primary text--bold ">������</span>
+ 撟喳��擃����
+ </div>
+ <div class="mdTxt">�蝯虫�嗾憿��嚗�</div>
+ </div>
+ <el-rate v-model="score" class="pam-satisfaction-rate fix-chrome-click--issue"></el-rate>
<div class="text--center mdTxt">
+ <el-button @click="closeReservePopUp">����</el-button>
<el-button type="primary"
@click="closeReservePopUp">
- ������
+ �
</el-button>
</div>
</PopUpFrame>
@@ -166,6 +175,8 @@
@roleStorage.State
recommendConsultantItem!:string;
+
+ score ="" ;
genderOptions=[
{
@@ -478,7 +489,6 @@
display: flex;
justify-content: center;
margin-top: 10px;
- margin-bottom: 26px;
}
//drawer��摨���見撘�
@@ -603,6 +613,16 @@
margin: 0px 20px;
}
+.pam-app-review{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.pam-satisfaction-rate{
+ margin-bottom: 45px;
+}
@include desktop{
.ques-header{
@@ -630,5 +650,6 @@
}
}
+
</style>
diff --git a/PAMapp/pages/satisfactionList.vue b/PAMapp/pages/satisfactionList.vue
index e1f0870..a6bae69 100644
--- a/PAMapp/pages/satisfactionList.vue
+++ b/PAMapp/pages/satisfactionList.vue
@@ -14,7 +14,7 @@
��擃���蝯虫�嗾憿��嚗�
</div>
</div>
- <el-rate v-model="item.satisfaction" class="pam-satisfaction-rate mt-10"></el-rate>
+ <el-rate v-model="item.score" class="pam-satisfaction-rate mt-10 fix-chrome-click--issue"></el-rate>
</div>
<div class="text--center mt-30">
<el-button type="primary" :disabled="isBtnDisabled">�</el-button>
@@ -118,4 +118,4 @@
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0