From 5579e668ef0d3d923fb76d07b4c93d9c01f29d4a Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Wed, 06 Jan 2021 10:29:51 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/mine/index.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hive-app/pages/mine/index.vue b/hive-app/pages/mine/index.vue
index afd239a..ea79f45 100644
--- a/hive-app/pages/mine/index.vue
+++ b/hive-app/pages/mine/index.vue
@@ -11,10 +11,10 @@
<view class="flex align-center">
<image class="header-img ml-10" :src="userInfo.photo?userInfo.photo:'../../static/images/default-avatar.png'"></image>
<view class="flex flex-v ml-15">
- <view>
+ <navigator url="./myInfo" hover-class="none">
<text class="font-18 white mr-5">{{userInfo.name}}</text>
<text class="white icon iconfont iconxiugai"></text>
- </view>
+ </navigator>
<view class="flex mt-10">
<view class="mr-20 ellipsis ellipsis-rolename">
<text class="white mr-5 font-14">职位:</text>
@@ -46,6 +46,9 @@
underLineWidth: 60,
}"
/>
+ <view class="look-more" @click="lookMore">
+ 更多<text class="iconfont iconarrow-backimg light-gray"></text>
+ </view>
<view class="performance-content">
<view class="flex justify-around">
<view class="flex flex-v align-center performance-item">
@@ -147,6 +150,11 @@
uni.navigateTo({
url: './setting?isLogin='+isLogin
})
+ },
+ lookMore(){
+ uni.navigateTo({
+ url: '../manager/employeeReport'
+ })
}
}
}
@@ -191,10 +199,19 @@
background: #FFFFFF;
border-radius: 4px;
margin-top: 10px;
+ position: relative;
}
.tab{
border-bottom: 1px solid #EDEAF4;
}
+ .look-more{
+ position: absolute;
+ z-index: 99;
+ top: 12px;
+ right: 10px;
+ color: rgb(171, 177, 204);
+ font-size: 14px;
+ }
.performance-content{
padding: 20px 0;
}
--
Gitblit v1.9.1