From 70865cf50d460939c53d3d7912a596fb84cb5215 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Sun, 26 Sep 2021 17:41:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                       |  1 +
 src/components/Globals/Globals.vue | 21 ++-------------------
 src/components/Roles/Roles.vue     | 11 +++--------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18c421d..c053f3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -147,6 +147,7 @@
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+ - | 改变时间轴角色栏、日常任务面板的样式 | 1b8958f
  - | 界面样式调整 | 4367249
  - | 任务状态重构 | 4693655
  - | 删除多余的技术验证界面 | 542ae5b
diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue
index ca406b0..6b25305 100644
--- a/src/components/Globals/Globals.vue
+++ b/src/components/Globals/Globals.vue
@@ -1,24 +1,15 @@
 <template>
   <view class="m-2" v-if="globals && globals.length">
-    <!-- <u-card
-      @click="openCard"
-      :show-foot="false"
-      :show-head="false"
-      :style="{ 'max-height': isShrink ? '120rpx' : '340rpx' }"
-      border-radius="25"
-      margin="0"
-    > -->
     <u-card
       @click="openCard"
       :show-foot="false"
       :show-head="false"
-      :style="{ 'min-height': '42px', 'max-height': globalsHeight + 'px' }"
+      :style="{ 'max-height': isShrink ? '106rpx' : '340rpx' }"
       border-radius="25"
       margin="0"
     >
       <view slot="body">
-        <!-- <scroll-view :scrollY="true" :style="{ 'max-height': isShrink ? '60rpx' : '280rpx' }"> -->
-        <scroll-view :scrollY="true" :style="{ 'min-height': '24rpx', 'max-height': globalsHeight - 30 + 'px' }">
+        <scroll-view :scrollY="true" :style="{ 'max-height': isShrink ? '50rpx' : '280rpx' }">
           <skeleton :banner="false" :loading="!globals.length" :row="4" animate class="u-line-2 skeleton"></skeleton>
           <view class="grid gap-2">
             <block v-for="item in globals" :key="item.id">
@@ -49,8 +40,6 @@
 import { mapGetters, mapMutations, mapState } from 'vuex';
 import Skeleton from '@/components/Skeleton/Skeleton';
 
-const sysHeight = uni.getSystemInfoSync().screenHeight;
-
 export default {
   name: 'Global',
   components: { Skeleton },
@@ -59,18 +48,12 @@ export default {
     return {
       // loading: true,
       task: null,
-      sysHeight: sysHeight,
     };
   },
 
   computed: {
     ...mapState('task', ['isShrink']),
     ...mapGetters('task', ['globals']),
-
-    globalsHeight: function () {
-      let h = ((this.sysHeight - 44 - 30 - 10) / 5) * 4;
-      return h;
-    },
   },
 
   methods: {
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index de4e3a0..aedbd69 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -150,21 +150,16 @@ export default {
   .tab-box {
     position: relative;
     white-space: nowrap;
-    height: 60rpx;
-    display: flex;
-    align-items: center;
     // height: 84rpx;
 
     .tab-item {
       // width: 20%;
       // height: 84rpx;
-      padding: 0 24rpx;
+      padding: 20rpx 24rpx;
       position: relative;
-      // display: inline-block;
-      // text-align: center;
+      display: inline-block;
+      text-align: center;
       font-size: 30rpx;
-      height: 60rpx;
-      line-height: 60rpx;
       transition-property: background-color, width;
     }