Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

Mila

2021-12-14 42ac42629b63da02040b4b020d61e75c5a6cab60

Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -75,14 +75,14 @@
                        :key="index"
                    >連絡時段{{index + 1 | formatNumber}}：{{ item | formatHopeContactTime }}</p>
                    <div v-if="appointmentDetail.satisfactionScore">
                      <div class="mdTxt mt-10 mb-10">滿意度</div>
                      <el-rate
                      :value="appointmentDetail.satisfactionScore"
                      class="pam-myDemand-dialog__rate"
                      disabled>
                      </el-rate>
                        <div class="mdTxt mt-10 mb-10">滿意度</div>
                        <el-rate
                        :value="appointmentDetail.satisfactionScore"
                        class="pam-myDemand-dialog__rate"
                        disabled>
                        </el-rate>
                    </div>
                  </div>
                </div>

                <div v-if="agentInfo.contactStatus === 'contacted'
                        && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
@@ -115,8 +115,8 @@
        <PopUpFrame :isOpen.sync="isCancelPopup">
            <div class="text--center mdTxt">是否取消此筆預約？</div>
            <div class="text--center mt-30">
                <el-button @click="isCancelPopup = false">取消</el-button>
                <el-button @click="cancel" type="primary">確定</el-button>
                <el-button @click="isCancelPopup = false">否</el-button>
                <el-button @click="cancel" type="primary">是</el-button>
            </div>
        </PopUpFrame>


 PAMapp/components/careerSelect.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <div class="mdTxt pt-10 pb-10">職業</div>
    <div class="mdTxt pt-10 pb-10">您的職業</div>
      <div class="ques-career__select" @click="openPopUp">
        <div class="ques-career__select-input">
          <span v-if="!syncCareerSelect">請選擇</span>
@@ -12,7 +12,7 @@
      </div>
      <PopUpFrame :isOpen.sync="showJobDrawer">
        <div class="pam-career">
          <div class="subTitle">職業</div>
          <div class="subTitle">您的職業</div>
          <el-radio-group class="pam-single__select--col" v-model="career" @change="handleChange">
            <el-radio-button v-for="(career,index) in options"
              :key="index"

 PAMapp/components/phoneContactTimePicker.vue

@@ -80,31 +80,31 @@
      selectAll:'每天',
      options:[
        {
          title:'禮拜一',
          label:'禮拜一'
          title:'星期一',
          label:'星期一'
        },
         {
          title:'禮拜二',
          label:'禮拜二'
          title:'星期二',
          label:'星期二'
        },
         {
          title:'禮拜三',
          label:'禮拜三'
          title:'星期三',
          label:'星期三'
        },
         {
          title:'禮拜四',
          label:'禮拜四'
          title:'星期四',
          label:'星期四'
        },
         {
          title:'禮拜五',
          label:'禮拜五'
          title:'星期五',
          label:'星期五'
        }, {
          title:'禮拜六',
          label:'禮拜六'
          title:'星期六',
          label:'星期六'
        },
         {
          title:'禮拜日',
          label:'禮拜日'
          title:'星期日',
          label:'星期日'
        },
      ],
    };

 PAMapp/pages/questionnaire/_agentNo.vue

@@ -6,7 +6,7 @@
          class="ques-header__info"
          v-if="myRequest.contactType==='phone'">
          <div class="text--middle">
              <div class="mdTxt">你指定的聯繫方式</div>
              <div class="mdTxt">您指定的聯繫方式</div>
              <div class="mt-10">
                  <span>手機：</span>
                  <span>{{myRequest.phone}}</span>
@@ -31,7 +31,7 @@
        </div>
        <div class="ques-header__info" v-else>
          <div class="text--middle">
              <div class="mdTxt">你指定的聯繫方式</div>
              <div class="mdTxt">您指定的聯繫方式</div>
              <div class="mt-10 ques-header__input-block">
                  <span>Email：</span>
                  <span>{{myRequest.email}}</span>
@@ -80,7 +80,7 @@
          :options="genderOptions" />
      </div>
      <div class="pam-paragraph">
        <div class="mdTxt">年齡</div>
        <div class="mdTxt">您的年齡</div>
        <SingleSelectBtn class="mt-10"
          :singleSelected.sync="myRequest.age"
          :options="ageRangeOptions" />
@@ -116,7 +116,7 @@

    <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="text--middle sendReserve-txt">儘速與您聯絡！</div>
        <div class="text--center mdTxt">
          <el-button type="primary"
            @click="closeReservePopUp">
@@ -246,7 +246,7 @@
                  },
                  {
                      title:'分紅保單',
                      content:'分紅保單 分紅保單是兼具「分攤風險」與「紅利共享」特色的保單，具有一定穩定度，讓你可以同時享有壽險保障及紅利！'
                      content:'分紅保單是兼具「分攤風險」與「紅利共享」特色的保單，具有一定穩定度，讓你可以同時享有壽險保障及紅利！'
                  }
    ];


 PAMapp/pages/recommendConsultant/index.vue

@@ -224,7 +224,7 @@
      },
      {
        title: '分紅保單',
        content: '分紅保單 分紅保單是兼具「分攤風險」與「紅利共享」特色的保單，具有一定穩定度，讓你可以同時享有壽險保障及紅利！'
        content: '分紅保單是兼具「分攤風險」與「紅利共享」特色的保單，具有一定穩定度，讓你可以同時享有壽險保障及紅利！'
      }
    ];
    showDialog = false;