Merge remote-tracking branch 'origin/master'

wayne

2021-11-15 48b2ef79a45478447de77d961ced3a857f26ee26

Merge remote-tracking branch 'origin/master'

 PAMapp/assets/scss/vendors/elementUI/_avatar.scss

@@ -2,3 +2,8 @@
  width: 150px;
  height: 150px
}

.pam-avatar>img {
  width: 100%;
  object-position: center top;
}

 PAMapp/assets/scss/vendors/elementUI/_carousel.scss

@@ -22,13 +22,9 @@
    }
}

.pam-consultant-carousel {
    padding: 0 10px;
    margin: 0 -10px;

.pam-quickFilter-carousel {
    .el-carousel__container {
        .el-carousel__item {
            max-width: 336px;
            width: 100%;
            box-shadow: 0 0 6px #00000029;
            border-radius: 10px;
@@ -38,7 +34,10 @@

    @media (min-width: 768px) {
        .el-carousel__container {
            transform: translateX(27%);
            transform: translateX(30%);
            .el-carousel__item {
                max-width: 336px;
            }
        }
    }
}

 PAMapp/assets/ts/api/consultant.ts

@@ -5,7 +5,7 @@
import Router from 'vue-router';

export const service = axios.create({
    baseURL: 'http://localhost:8080/api'
    baseURL: process.env.BASE_URL
})

service.interceptors.request.use(function (config: AxiosRequestConfig) {

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -5,12 +5,11 @@
            <el-col :xs="22" :sm="23">
                <el-row type="flex">
                    <el-col class="flex_column" :xs="5" :sm="3">
                        <el-avatar
                        <UiAvatar
                            :size="50"
                            :src="agentInfo.img"
                            class="cursor--pointer"
                            @click.native="showAgentDetail(agentInfo.agentNo);"
                        ></el-avatar>
                            :fileName="agentInfo.img"
                            @click.native="showAgentDetail(agentInfo.agentNo)"
                        ></UiAvatar>
                        <div class="satisfaction">
                            <i class="icon-star pam-icon icon--yellow satisfaction"></i>
                            <span>{{agentInfo.avgScore }}</span>

 PAMapp/components/Consultant/ConsultantSwiper.vue

@@ -10,7 +10,7 @@
          :key="index"
        >
            <div class="consultantCardStyle" >
              <el-avatar class="mb-10" :size="80" :src="agentInfo.img"></el-avatar>
              <UiAvatar :size="80" :fileName="agentInfo.img" class="mb-10"></UiAvatar>
              <div class="name">{{agentInfo.name}}</div>
              <div>
                <i class="icon-star pam-icon icon--yellow"></i>

 PAMapp/components/QuickFilter/QuickFilterConsultantList.vue

@@ -5,7 +5,7 @@
        :autoplay="false"
        indicator-position="none"
        arrow="never"
        class="pam-consultant-carousel"
        class="pam-quickFilter-carousel"
        ref="carouselRef"
    >
        <el-carousel-item
@@ -17,12 +17,12 @@
                @touchstart="touchStart"
                @touchend="moveCard"
            >
                <el-avatar
                <UiAvatar
                    :size="200"
                    class="mx-auto cursor--pointer"
                    :fileName="item.img"
                    class="mx-auto"
                    @click.native="showAgentDetail(item.agentNo)"
                    :src="item.img"
                />
                ></UiAvatar>
                <div class="mdTxt mt-30 mb-30 text--center">{{item.name}}(伯樂保險經紀人)</div>
                <el-row>
                    <el-col :span="12">
@@ -147,7 +147,6 @@
        border-radius: 50px;
        background-color: $LIGHT_GREY;
        color: $CORAL;
        z-index: 2;
        cursor: pointer;

        &:before {
@@ -156,28 +155,26 @@
        }
    }

    .pam-right-arrow {
        &:before {
            margin-left: 15px;
        }
    }

    .pam-left-arrow {
        &:before {
    .pam-left-arrow:before {
            margin-left: 25px;
        }

    .pam-right-arrow:before {
        margin-left: 15px;
    }

    .arrow-right-position {
        top: 50%;
        right: -60px;
        right: -40px;
        transform: translateY(-50%);
        z-index: 3;
    }

    .arrow-left-position {
        top: 50%;
        left: -60px;
        left: -40px;
        transform: translateY(-50%);
        z-index: 3;
    }

    .relative {

 PAMapp/components/Ui/UiAvatar.vue

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,21 @@
<template>
    <el-avatar
        :size="size"
        :src="imgSrc"
        class="pam-avatar cursor--pointer"
    ></el-avatar>
</template>

<script lang="ts">
import { Vue, Component, Prop } from 'nuxt-property-decorator';

@Component
export default class UiAvatar extends Vue {
    @Prop() size!: number;
    @Prop() fileName!: string;

    get imgSrc() {
        return process.env.BASE_URL + '/consultant/avatar/' + this.fileName;
    }
}
</script>

 PAMapp/nuxt.config.js

@@ -71,5 +71,8 @@
        document.documentElement.scrollTop = 0;
      }
    }
  },
  env: {
    BASE_URL: 'http://localhost:8080/api'
  }
}

 PAMapp/pages/agentInfo/_agentNo.vue

@@ -3,10 +3,7 @@
      <el-row
        type="flex"
        justify="center">
        <el-avatar
          size="large"
          src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png">
        </el-avatar>
        <UiAvatar :size="150" :fileName="agentInfo.image"></UiAvatar>
      </el-row>

      <el-row