Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev

This commit is contained in:
tian.guangyuan
2020-03-18 11:07:21 +08:00
10 changed files with 118 additions and 22 deletions

View File

@@ -5,7 +5,7 @@
<van-icon slot="icon" :name="ActivityLogInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="22" />
<span class="mr20">{{ ActivityLogInfo.age }}</span>
<span>{{ ActivityLogInfo.type == 0 ? '同业' : '白板' }}</span>
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#1989fa' : 'transparent'" size="24" />
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#ee0a24' : 'transparent'" size="24" />
</van-cell>
</van-cell-group>
</div>

View File

@@ -3,9 +3,9 @@
<!-- <div class="nav-item"> -->
<van-cell is-link class="relative" @click="rout(config)">
<template slot="title">
<van-icon v-if="config.icon" class="t-cell-icon" size="6.4vw" :name="config.icon" />
<van-icon v-if="config.icon" color="#ee0a24" class="t-cell-icon" size="6.4vw" :name="config.icon" />
<img v-else class="t-cell-icon" :src="config.src" alt="config" />
<span class="custom-title"> {{ config.title }}</span>
<span class="custom-title c-gray-base"> {{ config.title }}</span>
</template>
</van-cell>
<!-- </div> -->

View File

@@ -1,8 +1,8 @@
<template>
<van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left">
<van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left" @click="edit(talentPoolInfo.personnelCode)" >
<van-icon slot="icon" :name="talentPoolInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="24" />
<span>{{ talentPoolInfo.sameCompany }}</span>
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#1989fa" size="24" @click="edit(talentPoolInfo.personnelCode)" />
<van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#ee0a24" size="24" />
</van-cell>
</template>
<script>

View File

@@ -1,10 +1,10 @@
<!-- 头部用户信息 -->
<template>
<div class="user-info flex align-items-c p15">
<div class="user-info flex p15 bg-head align-items-e">
<img class="w40" src="../../../assets/images/bnf_avatar.png" />
<div class="add-list flex1 ml10">
<p>{{ userInfo.name }}</p>
<div class="c-gray-base">工号 | {{ userInfo.jobNo }}</div>
<p class="fs16 font-bold">{{ userInfo.name }}</p>
<div class="">工号 | {{ userInfo.jobNo }}</div>
</div>
</div>
</template>
@@ -46,13 +46,19 @@ export default {
<style lang="scss" scoped>
.user-info {
color: #666;
background-image: url('~@/assets/images/headerBg.png');
background-size: cover;
color: white;
height: 80px;
.send-main {
border-bottom: 10px solid #f5f5f5;
}
.add-list {
color: #333;
line-height: 22px;
}
.font-bold {
font-weight: bold;
}
}
</style>