From f601f3b02b28018384bed0e771b8ebac04b54d1b Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 27 Sep 2021 14:46:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                       |  3 ++-
 src/components/Globals/Globals.vue | 23 +++--------------------
 src/components/Roles/Roles.vue     | 12 +++---------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a48db9..ab863f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-09-26)
+# 0.1.0 (2021-09-27)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -200,6 +200,7 @@
  - | 删除多余的技术验证界面 | 542ae5b
  - | 删除多余的weekmode store里的东西 | 0841fe0
  - | 下滑时间轴添加备注 | 4fd20e3
+ - | 修改角色栏和日常任务面板的样式 | d653f9a
  - | 只保留project内容 | 7781c7b
  - | 重构时间刻度渲染任务 | 5cf7d08
  - | 重构store分层 | 5f6fff8
diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue
index d85044f..65bd82f 100644
--- a/src/components/Globals/Globals.vue
+++ b/src/components/Globals/Globals.vue
@@ -1,18 +1,9 @@
 <template>
   <view class="m-2" v-if="globals && globals.length">
-    <!-- <u-card @click="openCard" :show-foot="false" :show-head="false" style="max-height: 218rpx" border-radius="25" margin="0"> -->
-    <!-- :style="{ 'max-height': isShrink ? '106rpx' : '340rpx' }" -->
-    <u-card
-      @click="openCard"
-      :show-foot="false"
-      :show-head="false"
-      :style="{ 'min-height': '42px', 'max-height': globalsHeight + 'px' }"
-      border-radius="25"
-      margin="0"
-    >
+    <u-card @click="openCard" :show-foot="false" :show-head="false" style="max-height: 218rpx" border-radius="25" margin="0">
+      <!-- :style="{ 'max-height': isShrink ? '106rpx' : '340rpx' }" -->
       <view slot="body">
-        <scroll-view :scrollY="true" :style="{ 'min-height': '24rpx', 'max-height': globalsHeight - 30 + 'px' }">
-          <!-- <scroll-view :scrollY="true" style="max-height: 280rpx"> -->
+        <scroll-view :scrollY="true" style="max-height: 280rpx">
           <!-- <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">
@@ -45,8 +36,6 @@
 import { mapGetters, mapMutations, mapState } from 'vuex';
 import Skeleton from '@/components/Skeleton/Skeleton';
 
-const sysHeight = uni.getSystemInfoSync().screenHeight;
-
 export default {
   name: 'Global',
   components: { Skeleton },
@@ -55,18 +44,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 01da2e3..18a56d0 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -170,22 +170,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: 20rpx 24rpx;
-      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;
     }