Merge remote-tracking branch 'origin/Phase3' into Phase3

wayne

2022-02-16 3ed11c5aacc25c469e8591f66249f5f52c9e8428

Merge remote-tracking branch 'origin/Phase3' into Phase3

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -12,22 +12,27 @@
                      class="icon-star pam-icon icon--yellow satisfaction"
                       style="margin-top: 0"></i>
                    <template v-if="isAppointment">
                      <span v-if="agentInfo.appointmentScore">
                          {{ agentInfo.appointmentScore }}
                      </span>
                      <div class="unfilled text--center "
                          style="display:flex"
                          v-else>未填<br />滿意度</div>
                      <template v-if="agentInfo.appointmentStatus === 'close'
                                    || agentInfo.appointmentStatus === 'done'">
                        <span v-if="agentInfo.appointmentScore">
                            {{ agentInfo.appointmentScore }}
                        </span>
                        <div class="unfilled text--center "
                            style="display:flex"
                            v-else>未填<br />滿意度</div>
                      </template>
                    </template>
                    <template v-else>
                      <span v-if="agentInfo.avgScore">{{ agentInfo.avgScore }}</span>
                      <span v-else>尚無<br />滿意度</span>
                      <span class="unfilled text--center "
                          style="display:flex" v-else>尚無<br />滿意度</span>
                    </template>

                </div>
            </el-col>
            <el-col :xs="10" :sm="15">
                <div class="smTxt_bold name">{{agentInfo.name}}</div>
                {{agentInfo.appointmentStatus}}
                <div class="professionals">
                    <span
                        class="professionalsTxt"
@@ -41,7 +46,7 @@
                    @click="isRemoveAgentPopup = true"
                >移除</div>
                <div
                    v-if="notScoreAppointmentYet"
                    v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')"
                    class="text--primary text--underline cursor--pointer xsTxt text--bold"
                    @click="reviewsBtn = true">給予滿意度評分</div>
            </el-col>
@@ -87,7 +92,7 @@
                    </div>
                </div>

                <div v-if="notScoreAppointmentYet" class="reserved-btn">
                <div v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')" class="reserved-btn">
                    <el-button type="primary"
                        @click.native="reviewsBtn = true">給予滿意度評分</el-button>
                </div>

 PAMapp/pages/agentInfo/edit/_agentNo.vue

@@ -260,12 +260,15 @@
import { taiwanCities } from '~/shared/const/taiwan-cities';

const localStorageTest = namespace('localStorage');
const loginStore = namespace('login.store');

@Component
export default class AgentInfoComponent extends Vue {

  @localStorageTest.State('current_role')
  currentRole!:string | null;

  @loginStore.Action
  updateConsultantDetail!: (agentInfo: AgentInfo) => AgentInfo;

  _agentInfoSetting!: AgentInfoSetting;
  agentInfo!      : AgentInfo
@@ -391,6 +394,7 @@
      serveArea: this.editInfoValue.serveArea.join('、'),
    }
    accountSettingService.editAgentInfoSetting(editSettingInfo).then((res: AgentInfoSetting) => {
      this.updateConsultantDetail(editSettingInfo.agentNo);
      this.isInfoUpdate = true;
    });
  }

 PAMapp/pages/myConsultantList.vue

@@ -98,7 +98,7 @@

        this.contactedList = this.contactedList
          .filter((appointment) => appointment['appointmentStatus'] !== 'reserved')
          .map((appointment) => ({ ...appointment, sortTime: new Date(appointment.appointmentDate)}))
          .map((appointment) => ({ ...appointment, sortTime: new Date(appointment.updateTime)}))
          .sort((preAppointment, nextAppointment) => +nextAppointment.sortTime - +preAppointment.sortTime);
      }


 PAMapp/pages/recommendConsultant/result.vue

@@ -104,7 +104,7 @@
const localStorage = namespace('localStorage');

@Component
export default class Reslut extends Vue{
export default class Result extends Vue{
    @State('strictQueryList')
    strictQueryList!: AgentOfStrictQuery[];

@@ -119,7 +119,7 @@

    pageList: any[] = [];
    isVisiblePopUp = false;
    popUpTxt = '';
    popUpTxt = '已加入顧問清單';
    hideReviews = hideReviews;

    //////////////////////////////////////////////////////////////////////

 PAMapp/store/login.store.ts

@@ -25,4 +25,9 @@
    return await myConsultantService.getConsultantDetail(agentNo).then((res) => res);
  }

  @Action({ commit: 'SET_LOGIN_CONSULTANT' })
  async updateConsultantDetail(agentNo: string): Promise<AgentInfo> {
    return await myConsultantService.getConsultantDetail(agentNo).then((res) => res);
  }

}