From dfa7ee2fd0c09e709f115ae38c974def7793c080 Mon Sep 17 00:00:00 2001
From: aBin <binbin0314@126.com>
Date: Tue, 20 Jul 2021 14:23:31 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/App.vue                                   |  4 ++--
 src/components/Globals/index.vue              |  2 +-
 src/components/Roles/Roles.vue                |  4 ++--
 .../TimeLine/components/Barrier.vue           |  2 +-
 src/components/TimeLine/index.vue             | 22 +++++++++++++------
 src/components/Title/Title.vue                |  7 +++---
 src/pages/index/index.vue                     | 18 +++++++++------
 8 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0b4fc4..5c96682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 范围|描述|commitId
 --|--|--
  - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76)
+ - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872)
  - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09)
  - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb)
  - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035)
diff --git a/src/App.vue b/src/App.vue
index 3559576..9013b26 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,9 @@
 <!--
  * @Author: aBin
  * @email: binbin0314@126.com
- * @Date: 2021-07-19 10:09:22
+ * @Date: 2021-07-20 09:20:54
  * @LastEditors: aBin
- * @LastEditTime: 2021-07-20 09:23:01
+ * @LastEditTime: 2021-07-20 09:40:53
 -->
 <script>
 export default {
diff --git a/src/components/Globals/index.vue b/src/components/Globals/index.vue
index b0e7ef1..6039f8c 100644
--- a/src/components/Globals/index.vue
+++ b/src/components/Globals/index.vue
@@ -3,7 +3,7 @@
  * @email: binbin0314@126.com
  * @Date: 2021-07-19 10:52:05
  * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:37:35
+ * @LastEditTime: 2021-07-20 14:20:46
 -->
 <template>
   <view>
diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue
index d11dd12..065e308 100644
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@@ -3,13 +3,13 @@
  * @email: binbin0314@126.com
  * @Date: 2021-07-19 10:52:05
  * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 18:42:51
+ * @LastEditTime: 2021-07-20 10:54:27
 -->
 <template>
   <view class="wrap">
     <view class="rolebar">
       <view>
-        <view class="container" v-if="roles || roles.length">
+        <view v-if="roles || roles.length">
           <!-- <u-tabs
             :bar-width="barWidth"
             :current="currentRoleIndex"
diff --git a/src/components/TimeLine/components/Barrier.vue b/src/components/TimeLine/components/Barrier.vue
index 23e7610..6b140a4 100644
--- a/src/components/TimeLine/components/Barrier.vue
+++ b/src/components/TimeLine/components/Barrier.vue
@@ -3,7 +3,7 @@
  * @email: binbin0314@126.com
  * @Date: 2021-07-19 14:22:54
  * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 17:01:58
+ * @LastEditTime: 2021-07-20 11:46:04
 -->
 <template>
   <view class>
diff --git a/src/components/TimeLine/index.vue b/src/components/TimeLine/index.vue
index a7b2fa3..f293d5e 100644
--- a/src/components/TimeLine/index.vue
+++ b/src/components/TimeLine/index.vue
@@ -3,15 +3,14 @@
  * @email: binbin0314@126.com
  * @Date: 2021-07-19 14:15:35
  * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:44:12
+ * @LastEditTime: 2021-07-20 14:22:11
 -->
 <template>
-  <view>
+  <view class="main">
     <Barrier />
-    <scroll-view scroll-y="true" style="height: 1000rpx">
-      <view style="position: relative">
-        <TimeBox />
-      </view>
+    <scroll-view :scrollY="true" :scrollTop="scrollTop" :style="{ height: height }" @scroll="scroll">
+      <!-- <scroll-view scroll-y="true" style="height: 400px"> -->
+      <TimeBox />
     </scroll-view>
   </view>
 </template>
@@ -22,7 +21,16 @@ export default {
   name: 'TimeLine',
   components: { Barrier, TimeBox },
   data() {
-    return {};
+    return { height: '', scrollTop: 0 };
+  },
+  mounted() {
+    this.height = document.getElementsByClassName('main')[0].clientHeight - 30 + 'px';
+    console.log(this.height);
+  },
+  methods: {
+    scroll(e) {
+      console.log(e.detail.scrollTop);
+    },
   },
 };
 </script>
diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue
index f868bf7..d25de44 100644
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-07-19 11:35:03
- * @LastEditTime: 2021-07-19 18:37:13
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-20 10:12:34
+ * @LastEditors: aBin
  * @Description: In User Settings Edit
  * @FilePath: \TALL-MUI-3\src\components\Title\titleBar.vue
 -->
@@ -15,12 +15,11 @@
       </view>
       <view class="mr-2" slot="right">
         <u-icon class="m-1" name="checkmark-circle"></u-icon>
-        <u-icon class="m-1" name="reload"></u-icon>
+        <u-icon class="m-1" name="reload"> </u-icon>
         <u-icon class="m-1" name="home"></u-icon>
         <u-icon class="m-1" name="more-dot-fill"></u-icon>
       </view>
     </u-navbar>
-    你好
   </view>
 </template>
 <script>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 488688a..68e69ae 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,16 +2,16 @@
  * @Author: aBin
  * @email: binbin0314@126.com
  * @Date: 2021-07-19 10:09:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-19 18:51:34
+ * @LastEditors: aBin
+ * @LastEditTime: 2021-07-20 11:55:27
 -->
 <template>
-  <view>
+  <view :style="{ height: height }" class="flex flex-col overflow-hidden">
     <Title />
-    <Roles />
-    <view class="container bg-gray-100">
+    <view class="flex flex-col flex-1 container bg-gray-100">
+      <Roles />
       <Globals class="p-4" />
-      <TimeLine />
+      <TimeLine class="flex-1" />
       <!-- <view class="mt-5">
     <view class="mt-5">
       <u-button type="primary" size="default" @click="$u.route('/pages/plugin-test/plugin-test')">iframe 验证</u-button>
@@ -38,12 +38,16 @@ import TimeLine from 'components/TimeLine/index.vue';
 export default {
   components: { Globals, TimeLine, Roles, Title },
   data() {
-    return { title: 'Hello' };
+    return { title: 'Hello', height: '' };
   },
   onLoad() {
     console.log(this.$u.config.v);
     // this.openPage();
   },
+  mounted() {
+    this.height = window.screen.height + 'px';
+    console.log(this.height);
+  },
   methods: {
     openPage() {
       console.log('open');