Merge remote-tracking branch 'origin/master'

wayne

2021-12-13 df51c875d8e5c245e1fbbeb844c94631d2360915

Merge remote-tracking branch 'origin/master'

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -12,7 +12,7 @@
                            @click.native="showAgentDetail(agentInfo.agentNo)"
                        ></UiAvatar>
                            <!-- TODO:隱藏滿意度 -->
                        <div v-if="!hideReviews">    
                        <div v-if="!hideReviews">
                            <i class="icon-star pam-icon icon--yellow satisfaction"  v-if="!(latestContactedAppointment && !latestContactedAppointment.satisfactionScore)"></i>
                            <span v-if="agentInfo.contactStatus === 'contacted' && latestContactedAppointment && latestContactedAppointment.satisfactionScore">
                                {{ latestContactedAppointment && latestContactedAppointment.satisfactionScore}}
@@ -75,14 +75,14 @@
                        :key="index"
                    >連絡時段{{index + 1 | formatNumber}}：{{ item | formatHopeContactTime }}</p>
                    <div v-if="appointmentDetail.satisfactionScore">
                        <div class="mdTxt mt-10 mb-10" v-if="!hideReviews">滿意度</div>
                            <el-rate
                            :value="appointmentDetail.satisfactionScore"
                            class="pam-myDemand-dialog__rate"
                            disabled>
                            </el-rate>
                        </div>
                      <div class="mdTxt mt-10 mb-10">滿意度</div>
                      <el-rate
                      :value="appointmentDetail.satisfactionScore"
                      class="pam-myDemand-dialog__rate"
                      disabled>
                      </el-rate>
                    </div>
                  </div>

                <div v-if="agentInfo.contactStatus === 'contacted'
                        && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">

 PAMapp/pages/index.vue

@@ -66,7 +66,7 @@
    onMyConsultantListChange() {
      this.consultantList = (this.myConsultantList || [])
        .filter(item => item.contactStatus !== 'contacted')
        .map((item) => ({ ...item, formatDate: new Date(item.updateTime)}))
        .map((item) => ({ ...item, formatDate: new Date(item.updateTime || item.createTime)}))
        .sort((preItem, nextItem) => +nextItem.formatDate - +preItem.formatDate)
    }


 PAMapp/pages/myConsultantList.vue

@@ -69,7 +69,7 @@
    filterContactedList() {
        this.consultantList = (this.myConsultantList || [])
                .filter(item => item.contactStatus !== 'contacted')
                .map((item) => ({ ...item, formatDate: new Date(item.updateTime)}))
                .map((item) => ({ ...item, formatDate: new Date(item.updateTime || item.createTime)}))
                .sort((preItem, nextItem) => +nextItem.formatDate - +preItem.formatDate );
        this.contactedList = (this.myConsultantList || [])
                .filter(item => item.contactStatus === 'contacted')