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

Mila

2022-01-22 86541ce0f13750d4c2d458e2bc4194ac7fd957d9

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

# Conflicts:
#	PAMapp/components/Interview/InterviewAdd.vue

 PAMapp/assets/scss/utilities/_heading.scss

@@ -125,7 +125,6 @@
  @extend .text--bold;
  @extend .text--primary;
  @extend .cursor--pointer;
  @extend .text--underline;
}

.pam-link-button--lg {
@@ -134,5 +133,4 @@
  @extend .text--bold;
  @extend .text--primary;
  @extend .cursor--pointer;
  @extend .text--underline;
}

 PAMapp/components/Appointment/AppointmentInterviewList.vue

@@ -2,13 +2,16 @@
    <div>
        <div class="interview__header">
            <div class="mdTxt">約訪紀錄</div>
            <div class="pam-link-button--lg"
            <div class="pam-link-button"
            @click="addInterview">+新增</div>
        </div>
        <InterviewCard :interviewList="displayList.slice(0, 3)"></InterviewCard>

        <section class="text--right mt-30" v-if="interviewList.length > 3">
                <div class="pam-link-button--lg" @click="readMoreBtn">展開看更多</div>
        <section class="text--right mt-30 interview-check-more" v-if="interviewList.length > 3">
                <div class="pam-link-button" @click="readMoreBtn">
                  展開看更多
                  <i class="icon-expand"></i>
                  </div>
        </section>
    </div>
</template>
@@ -61,4 +64,8 @@
  justify-content: space-between;
  margin-bottom  : 10px;
}
.interview-check-more{
  display: flex;
  justify-content: center;
}
</style>

 PAMapp/components/Interview/InterviewAdd.vue

@@ -11,14 +11,14 @@
          <el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
              <span
                v-if="!isEdit"
                class="mr-10 text--primary text--underline cursor--pointer"
                class="mr-10 text--primary  cursor--pointer"
                @click="showCancelPopUp = true"
              >刪除</span>
              ><i class="icon-delet"></i></span>
              <span
                v-if="!isEdit"
                class="text--primary text--underline cursor--pointer"
                class="text--primary  cursor--pointer"
                @click="isEdit = !isEdit"
              >編輯</span>
              ><i class="icon-edit"></i></span>
          </el-col>
      </el-row>
      <template v-if="!interviewId || isEdit">

 PAMapp/components/Interview/InterviewCard.vue

@@ -138,6 +138,7 @@
}
.record-card {
    height: 64px;
    margin-bottom: 20px;
    .record-card-date{
        display: flex;
        flex-direction: column;

 PAMapp/pages/appointment/_appointmentId/interview/new/index.vue

@@ -43,4 +43,13 @@
    display: flex;
    justify-content: center;
}
.required {
  position: relative;
  &::before {
      content: '*';
      position: absolute;
      color: #FF0000;
      transform: translate(-12px, 0);
  }
}
</style>

 PAMapp/pages/questionnaire/_agentNo.vue

@@ -115,12 +115,21 @@
    </PopUpFrame>

    <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="mdTxt mt-30 sendReserve-txt">預約成功！</div>
        <div class="mdTxt sendReserve-txt mb-30">您預約的顧問會儘速與您聯絡！</div>
        <div class="pam-app-review mb-10">
          <div class="mdTxt mb-10">對於
                <span class="mdTxt text--primary text--bold ">服務媒合</span>
                平台的整體服務，
            </div>
          <div class="mdTxt">您給予幾顆星評價？</div>
        </div>
        <el-rate v-model="score" class="pam-satisfaction-rate fix-chrome-click--issue"></el-rate>
        <div class="text--center mdTxt">
          <el-button @click="closeReservePopUp">略過</el-button>
          <el-button type="primary"
            @click="closeReservePopUp">
            我知道了
            送出
          </el-button>
        </div>
    </PopUpFrame>
@@ -166,6 +175,8 @@

    @roleStorage.State
    recommendConsultantItem!:string;

    score ="" ;

    genderOptions=[
      {
@@ -478,7 +489,6 @@
  display: flex;
  justify-content: center;
  margin-top: 10px;
  margin-bottom: 26px;
}

//drawer最底下文字樣式
@@ -603,6 +613,16 @@
    margin: 0px 20px;
  }

.pam-app-review{
  display: flex;
  flex-direction: column;
  justify-content: center;
  align-items: center;
}

.pam-satisfaction-rate{
  margin-bottom: 45px;
}

  @include desktop{
  .ques-header{
@@ -630,5 +650,6 @@
  }
}


</style>


 PAMapp/pages/satisfactionList.vue

@@ -14,7 +14,7 @@
              的整體服務，您給予幾顆星評價？
          </div>
        </div>
        <el-rate v-model="item.satisfaction" class="pam-satisfaction-rate mt-10"></el-rate>
        <el-rate v-model="item.score" class="pam-satisfaction-rate mt-10 fix-chrome-click--issue"></el-rate>
      </div>
      <div class="text--center mt-30">
        <el-button type="primary" :disabled="isBtnDisabled">送出</el-button>