From 5227ce05a36d16fc32691b73e4d75c8aee9cea51 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 11 Jan 2021 16:46:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/mine/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hive-app/pages/mine/index.vue b/hive-app/pages/mine/index.vue
index 6f8c2b4..fbc8aa7 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>
+ <text class="white font-16 iconfont iconxiugai"></text>
+ </navigator>
<view class="flex mt-10">
<view class="mr-20 ellipsis ellipsis-rolename">
<text class="white mr-5 font-14">职位:</text>
@@ -41,7 +41,7 @@
activeColor: '#518EFF',
underLineColor: '#518EFF',
underLineHeight: 4,
- fontSize: '30px',
+ fontSize: 26,
itemWidth: 70,
underLineWidth: 60,
}"
@@ -80,7 +80,7 @@
</view>
</view>
</view>
- <navigator url="./knowledge" class="flex align-center justify-between repository mt-10">
+ <navigator url="./knowledge" class="flex align-center justify-between repository mt-10" v-if="$utils.hasPermission('zhishiku')">
<view class="flex align-center">
<image class="title-img mr-10" src="../../static/images/mine2.png"></image>
<text>知识库</text>
@@ -207,10 +207,10 @@
.look-more{
position: absolute;
z-index: 99;
- top: 12px;
+ top: 22rpx;
right: 10px;
color: rgb(171, 177, 204);
- font-size: 14px;
+ font-size: 26rpx;
}
.performance-content{
padding: 20px 0;
--
Gitblit v1.9.1