Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Tomas

2021-11-17 51ad8fa1584f5159bc9afe750ada3f42cb6b6728

Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

 PAMapp/components/Client/ClientCard.vue

@@ -55,10 +55,9 @@
                <p>職業：{{client.job}}</p>
                <p>需求：{{client.requirement.replace(',', '、')}}</p>
                <p v-for="(item, index) in hopeContactTime" :key="index">連絡時段{{index + 1 | formatNumber}}：{{item}}</p>
                </div>
                <div class="mt-30 text--center" v-if="isReserved">
                    <el-button @click="markAppointment">標註為已連絡</el-button>
                </div>

            </div>
        </Ui-Dialog>
    </div>
@@ -197,8 +196,11 @@

    .dialogTxt {
        font-size: 20px;
        overflow:scroll;
        height:400px;
    }


    .text-right {
        text-align: right;
    }

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -253,6 +253,8 @@

    .dialogInfo {
        font-size: 20px;
        overflow:scroll;
        height: 400px;
    }

</style>

 PAMapp/layouts/default.vue

@@ -186,15 +186,5 @@
      }
    }
  }
  .myAppointmentList-appointmentList,.myAppointmentList-contactedList{
    &-banner {
      background-image: url('~/assets/images/myAppointmentList/agent_banner_mob.svg');
    }

    @media (min-width: 768px) {
      &-banner {
        background-image: url('~/assets/images/myAppointmentList/agent_banner_web.svg');
      }
    }
  }
</style>

 PAMapp/layouts/home.vue

@@ -1,14 +1,18 @@
<template>
    <div class="pam-background">
        <NavBar></NavBar>
        <div class="pam-container">
        <Nuxt></Nuxt>
        </div>
        <Footer></Footer>
    </div>
</template>
<script lang="ts">
    import { Component ,Vue } from "nuxt-property-decorator";
    import * as _ from 'lodash';
    @Component
    export default class DefaultLayout extends Vue {


    }
</script>
@@ -16,10 +20,17 @@
    .pam-background {
        background-color: #F8F9FA;
        padding-top:$MOB_NAV_BAR;
        display: flex;
        flex-direction: column;
        min-height: 100vh;
        .pam-container{
            flex: 1;
        }
    }
    @include desktop{
        .pam-background {
            padding-top:$DESKTOP_NAV_BAR;
        }
    }

</style>

 PAMapp/pages/myAppointmentList.vue

@@ -1,5 +1,7 @@
<template>
    <div>
        <div class="pam-myAppointment-banner"></div>
        <div class="pam-container">
        <div class="pam-cus-tabs mb-30">
            <div
                class="cus-tab-item"
@@ -19,13 +21,20 @@

        <NuxtChild></NuxtChild>
    </div>



    </div>
</template>

<script lang="ts">
import { Vue, Component, State, Action, Watch } from 'nuxt-property-decorator';
import { ClientInfo } from '~/assets/ts/api/appointment';
import * as _ from 'lodash';

@Component
@Component({
    layout: 'home'
})
export default class ClientReservedList extends Vue {
    activeTabName = 'appointmentList';
    appointmentList: ClientInfo[] = [];
@@ -59,5 +68,42 @@
        this.$router.push('/myAppointmentList/' + this.activeTabName)
    }

    get route(): string{
        const routeName = this.$route.name;
        return routeName ? routeName:'';
    };

    get bannerClassName() {
        return this.routeFormatBannerClass(this.route);
    };

    // format to {page}-banner or pam-no-banner tag
    private routeFormatBannerClass(route: string): string {
        const needBannerTags = ['myAppointmentList-appointmentList', 'myAppointmentList-contactedList'];
        return _.includes(needBannerTags, route) ? route + '-banner' : 'pam-no-banner';
    };

}
</script>

<style lang="scss" scoped>
    .pam-myAppointment-banner {
        width: 100%;
        height: 120px;
        background-size: cover;
        background-repeat: no-repeat;
        background-position: center;
        position: relative;
        background-image: url('~/assets/images/myAppointmentList/agent_banner_mob.svg');
    }

    @media (min-width: 768px) {
        .pam-myAppointment-banner {
            background-image: url('~/assets/images/myAppointmentList/agent_banner_web.svg');
        }
    }

    .pam-container {
        padding: 30px 20px;
    }
</style>