From f34aa90e8f838a8ca09dfc1aec4fa13bbb04af1c Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期五, 19 十一月 2021 15:47:58 +0800
Subject: [PATCH] [ Update ] 修正 commit:bd9d8a6b0ed6204a9bb2708fe6a894f51cc52c94 資訊 i css 寫法錯誤
---
PAMapp/components/Consultant/ConsultantCard.vue | 249 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 190 insertions(+), 59 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 95c08f9..92bb8ef 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -5,50 +5,179 @@
<el-col :xs="22" :sm="23">
<el-row type="flex">
<el-col class="flex_column" :xs="5" :sm="3">
- <img class="avator" :src="agentInfo.img" alt="">
- <div class="star">{{agentInfo.satisfaction}}</div>
- </el-col>
- <el-col class="flex_column" :xs="10" :sm="15">
- <div class="smTxt_bold name">{{agentInfo.name}}</div>
- <div class="tagStyle">
- <span
- class="tagTxt"
- v-for="(tag, index) in agentInfo.tags" :key="index">#{{tag}}</span>
+ <UiAvatar
+ :size="50"
+ :fileName="avatarFileName"
+ @click.native="showAgentDetail(agentInfo.agentNo)"
+ ></UiAvatar>
+ <div class="satisfaction">
+ <i class="icon-star pam-icon icon--yellow satisfaction"></i>
+ <span>{{agentInfo.avgScore }}</span>
</div>
- <div class="delete" @click="removeAgent">蝘駁</div>
+ </el-col>
+ <el-col :xs="10" :sm="15">
+ <div class="smTxt_bold name">{{agentInfo.name}}</div>
+ <div class="professionals">
+ <span
+ class="professionalsTxt"
+ v-for="(expertise, index) in expertises"
+ :key="index"
+ >#{{expertise}}</span>
+ </div>
+ <div
+ class="delete"
+ v-if="agentInfo.contactStatus === 'picked'
+ || !agentInfo.contactStatus"
+ @click="removeAgent"
+ >蝘駁</div>
</el-col>
<el-col class="flex_column" :xs="9" :sm="6">
<el-button
- class="smTxt_bold btn"
+ class="smTxt_bold outline_btn"
@click="reserveCommunication"
- :class="{'reservedBtn': agentInfo.reserve}"
- >{{ agentInfo.reserve ? '撌脤���' : '�脰����'}}</el-button>
- <div class="time">隞予 10:00 ��</div>
+ :class="agentInfo.contactStatus + 'Btn'"
+ >{{ contactTxt }}</el-button>
+ <div class="updateTime" v-if="updateTime">{{updateTime | formatDate}}</div>
</el-col>
</el-row>
</el-col>
</el-row>
+
+ <Ui-Dialog
+ :isVisible.sync="isVisibleDialog"
+ :width="width"
+ class="pam-myDemand-dialog"
+ >
+ <div v-if="appointmentDetail">
+ <h5 class="subTitle text--center mb-30">������</h5>
+ <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
+ <div class="dialogInfo">
+ <p>憪��{appointmentDetail.name}}</p>
+ <p>�閰梧�{appointmentDetail.phone}}</p>
+ <p>Email嚗{appointmentDetail.email}}</p>
+ <p>�批嚗{gender}}</p>
+ <p>撟湧翩嚗{appointmentDetail.age}}</p>
+ <p>�璆哨�{appointmentDetail.job}}</p>
+ <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p>
+ <p
+ v-for="(item, index) in hopeContactTime"
+ :key="index"
+ >��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime }}</p>
+ </div>
+ </div>
+ </Ui-Dialog>
</div>
</template>
<script lang="ts">
-import { Vue, Component, Prop, Emit, Watch } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Vue, Component, Prop, Emit, Action } from 'nuxt-property-decorator';
+import { Consultants, getAppointmentDetail } from '~/assets/ts/api/consultant';
+import { AppointmentDetail } from '~/assets/ts/models/AppointmentDetail';
+import { isLogin } from '~/assets/ts/auth';
+import { isMobileDevice } from '~/assets/ts/device';
-@Component
-export default class ConsultantCard extends Vue {
- @Prop() agentInfo!: Agents;
-
- reserveCommunication() {
- if (!this.agentInfo.reserve) {
- this.$router.push('/communication/myDemand')
+@Component({
+ filters: {
+ formatNumber(index: number) {
+ if (index) {
+ const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���']
+ return upperNumber[index];
+ }
+ },
+ formatHopeContactTime(item: string): string {
+ if (item) {
+ const [hopeDay, hopeTime] = item.split('��');
+ const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay;
+ const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime;
+ return `${day}��${time}`;
+ }
+ return '';
}
+ }
+})
+export default class ConsultantCard extends Vue {
+ @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
+ @Prop() agentInfo!: Consultants;
+ isVisibleDialog = false;
+ width: string = '';
+ appointmentDetail: AppointmentDetail = {
+ id: 0,
+ phone: '',
+ email: '',
+ contactType: '',
+ gender: '',
+ age: '',
+ job: '',
+ requirement: '',
+ communicateStatus: '',
+ hopeContactTime: '',
+ otherRequirement: '',
+ appointmentDate: new Date(),
+ agentNo: '',
+ customerId: 0,
+ name: ''
+ };
+
+ get avatarFileName() {
+ return this.agentInfo.img ? this.agentInfo.img : this.agentInfo.image;
}
- @Emit('removeAgent') removeAgent() {
- console.log('removeAgent')
- return this.agentInfo.id;
+ get expertises() {
+ return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertises;
+ }
+ get gender() {
+ if (this.appointmentDetail.gender) {
+ return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
+ }
+ return ''
+ }
+ get contactTxt() {
+ if (this.agentInfo.contactStatus === 'contacted') {
+ return '撌脰蝯�'
+ }
+ if (this.agentInfo.contactStatus === 'reserved') {
+ return '撌脤���'
+ }
+ return '�脰����'
+ }
+
+ get updateTime() {
+ return isLogin() ? this.agentInfo.updateTime : '';
+ }
+
+ get hopeContactTime() {
+ const contactList = this.appointmentDetail.hopeContactTime
+ .split("'").map(item => item.slice(0, item.length));
+ return contactList.filter(item => !!item && item !== ",")
+ }
+ reserveCommunication() {
+ const contactStatus = this.agentInfo.contactStatus;
+ if (!contactStatus || contactStatus === 'picked') {
+ isLogin()
+ ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
+ : this.$router.push('/login');
+ } else {
+ this.openPopUp();
+ }
+ }
+
+ openPopUp() {
+ getAppointmentDetail(this.agentInfo.latestAppointmentId).then(res => {
+ this.appointmentDetail = res.data;
+ this.width = isMobileDevice() ? '80%' : '';
+ this.isVisibleDialog = true;
+ });
+ }
+
+ removeAgent() {
+ this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
+ console.log('removeOk?', removeOk);
+ });
+ }
+
+ showAgentDetail(agentNo: string): void {
+ this.$router.push(`/agentInfo/${agentNo}`);
}
}
</script>
@@ -56,7 +185,7 @@
<style lang="scss" scoped>
.rowStyle {
padding: 10px;
- background-color: #FFFFFF;
+ background-color: $PRIMARY_WHITE;
margin-bottom: 10px;
display: flex;
justify-content: space-between;
@@ -65,32 +194,24 @@
width: 10px;
height: 10px;
border-radius: 50px;
- background-color: #F2C75C;
+ background-color: $YELLOW;
margin: auto 0;
}
- .avator {
- width: 50px;
- height: 50px;
- border-radius: 50px ;
- }
-
- .star {
+ .satisfaction {
font-size: 12px;
font-weight: bold;
-
- &:before {
- content: '\2605';
- color: #ED1B2E;
- margin: 5px;
- }
+ margin-top: 5px;
}
- .tagStyle {
+ .professionals {
+ height: 20px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- .tagTxt {
+ margin: 5px 0 10px 0;
+
+ .professionalsTxt {
font-size: 12px;
font-weight: bold;
margin-right: 5px;
@@ -98,31 +219,35 @@
}
.delete {
- color: #ED1B2E;
+ color: $PRIMARY_RED;
font-size: 14px;
font-weight: bold;
cursor: pointer;
}
- .btn {
- color: #ED1B2E;
- border: solid 2px;
- border-radius: 30px;
- padding: 10px 16px;
- }
-
.reservedBtn {
- color: #009CBD;
- cursor: auto;
+ color: $SKY_BLUE;
+ border-color: $SKY_BLUE;
- &:hover {
- color: #009CBD;
- border-color: #009CBD;
- background-color: #ffffff;
+ &:focus {
+ color: $PRIMARY_WHITE;
+ background-color: $SKY_BLUE;
+ opacity: 0.5;
}
}
- .time {
+ .contactedBtn {
+ color: $GREEN;
+ border-color: $GREEN;
+
+ &:focus {
+ color: $PRIMARY_WHITE;
+ background-color: $GREEN;
+ opacity: 0.5;
+ }
+ }
+
+ .updateTime {
font-size: 12px;
font-weight: bold;
color: #707070;
@@ -136,4 +261,10 @@
justify-content: space-between;
}
-</style>
\ No newline at end of file
+ .dialogInfo {
+ font-size: 20px;
+ overflow-y:scroll;
+ height: 400px;
+ }
+
+</style>
--
Gitblit v1.8.0