Merge branch 'master' into Phase3

Mila

2022-01-20 1d6d2d14200ed9432347ef8013e3fc117fa2161b

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -33,17 +33,17 @@
                    v-if="showRemoveBtn"
                    @click="removeAgent"
                >移除</div>
                <div
                    v-if="notScoreAppointmentYet"
                    class="text--primary text--underline cursor--pointer xsTxt text--bold"
                    @click="reviewsBtn = true">給予滿意度評分</div>
            </el-col>
            <el-col class="flex_column" :xs="9" :sm="6">
                <el-button
                    class="smTxt_bold outline_btn"
                    @click="reserveCommunication"
                    @click="reservedOrShowAppointmentInfo"
                    :class="actionBtnStyle"
                >{{ actionBtnLabel }}</el-button>
                <div
                    v-if="notScoreAppointmentYet"
                    class="text--primary mt-10 text--center text--underline cursor--pointer"
                    @click="reviewsBtn = true">給予滿意度評分</div>
                <div class="updateTime mt-10">
                    {{ agentInfo.updateTime | formatDate }}
                </div>
@@ -53,12 +53,12 @@
        <Ui-Dialog
            :isVisible.sync="isVisibleDialog"
            :width="width"
            class="pam-myDemand-dialog"
            class="pam-myDemand-dialog pam-dialog-reserved"
        >
            <div v-if="appointmentDetail">
                <h5 class="subTitle text--center mb-30">預約成功</h5>
                <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
                <div class="dialogInfo">
                <div class="reserved-info">
                    <p>姓名：{{appointmentDetail.name}}</p>
                    <p>電話：{{appointmentDetail.phone}}</p>
                    <p>Email：{{appointmentDetail.email}}</p>
@@ -80,7 +80,7 @@
                    </div>
                </div>

                <div v-if="notScoreAppointmentYet" class="dialogInfo-btn">
                <div v-if="notScoreAppointmentYet" class="reserved-btn">
                    <el-button type="primary"
                        @click.native="reviewsBtn = true">給予滿意度評分</el-button>
                </div>
@@ -91,14 +91,24 @@
                </div>
            </div>
        </Ui-Dialog>
        <PopUpFrame :isOpen.sync="reviewsBtn">
            <div class="mdTxt">

        <PopUpFrame :isOpen.sync="reviewsBtn" class="reviewDialog-content">
            <div class="mdTxt pam-dialog-review">
                保險顧問滿意度
                <span class="hint">選取星星</span>
                <div class="dialogInfo-score">
                    <el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate>
                <div class="mt-30 review-content">
                    <UiAvatar :size="80" :agentNo="agentInfo.agentNo"></UiAvatar>
                    <div class="review-text">對於顧問
                        <span class="text--primary">{{agentInfo.name}}</span>
                        的整體服務，您給予幾顆星評價？
                    </div>
                </div>
                <div class="dialogInfo-btn">

                <div class="review-score">
                    <el-rate v-model="inputScore" class="pam-rate mt-30"></el-rate>
                </div>

                <div class="review-btn">
                    <el-button
                        type="primary"
                        :disabled="!inputScore"
@@ -172,7 +182,6 @@
    hideReviews = hideReviews;
    isConfirmPopup = false;


    appointmentDetail: any = {
        age               : '',
        agentNo           : '',
@@ -203,7 +212,7 @@
    }

    get isAppointment(): boolean {
      return !!this.agentInfo['appointmentStatus'];;
      return !!this.agentInfo['appointmentStatus'];
    }

    get latestReservedAppointment(): Appointment {
@@ -290,7 +299,7 @@
    @Action
    storeConsultantList!: () => void;

    reserveCommunication() {
    reservedOrShowAppointmentInfo() {
      const isAppointment = !!this.agentInfo['appointmentStatus'];
      const contactStatus = this.agentInfo.contactStatus;
        if (!isAppointment && (!contactStatus || contactStatus === 'picked')) {
@@ -442,20 +451,4 @@
        flex-direction: column;
        justify-content: space-between;
    }

    .dialogInfo {
        font-size: 20px;
        overflow-y:scroll;
        height: 400px;
    }
    .dialogInfo-btn{
        display: flex;
        justify-content: center;
    }
    .dialogInfo-score{
        display: flex;
        justify-content: center;
        margin-bottom: 50px;
    }

</style>