Merge remote-tracking branch 'origin/wrr' into temp

4 years ago · ebf5c99d68
6 changed files with 325 additions and 129 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,91 +3,94 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | db store | 6414c4f
- - | indexedDB | 687394e
- pinch | alloy finger实现图片的pinch放大缩小 | de01343
- plugin | 插件添加了token及param参数 | aeb0292
- - | post 封装 | da52e94
- - | tall插件封装 | 1bcb920
- task status | 任务状态切换未完 | 7ffd135
- - | ws storage | 21b3a06
- - | 全局插件及默认插件位置修改 | 6c80d08
- - | 字体大小更改 | 82cfdd4
- - | 存token | b8a178d
- - | 定期任务面板骨架屏添加 | b2698c0
- 富文本插件 | 富文本插件demo测试 | ed3d644
- - | 引入dayjs | 29b8b93
- - | 提交到本地 | 9cbe411
- - | 插件参数处理调整 | a3e68d3
- - | 插件数据获取 | 5b91bdc
- - | 日常任务插件调整 | c1881f9
- - | 时间基准线，默认插件 | a33ba1e
- - | 时间轴修改状态时提示框增加 | e841392
- - | 时间轴界面 | 33927e9
- - | 标题栏变化 | 3898cfe
- - | 标题栏变化 | c0fcd9d
- - | 标题栏角色栏全局任务组件新建 | 0500cb4
- - | 模拟接口测试 | 69e7931
- - | 添加时间轴上下滚动 | 2b81bbc
- - | 角色栏实现 | 94cd671
- - | 距调整pc端 | 5069aa1
- - | 配置默认插件接口 | f0c177d
+ - | 标题栏变化 | [3898cfe](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3898cfe)
+ - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0fcd9d)
+ - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0500cb4)
+ - | 插件参数处理调整 | [a3e68d3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3e68d3)
+ - | 插件数据获取 | [5b91bdc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5b91bdc)
+ - | 存token | [b8a178d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b8a178d)
+ - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b2698c0)
+ - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/94cd671)
+ - | 距调整pc端 | [5069aa1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5069aa1)
+ - | 面变化首页变化 | [5e860f1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e860f1)
+ - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/69e7931)
+ - | 配置默认插件接口 | [f0c177d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f0c177d)
+ - | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6c80d08)
+ - | 日常任务插件调整 | [c1881f9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c1881f9)
+ - | 上传逻辑变化 | [3ff1dc2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3ff1dc2)
+ - | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8514c85)
+ plugin | 插件添加了token及param参数 | [aeb0292](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aeb0292)
+ task status | 任务状态切换未完 | [7ffd135](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7ffd135)
+ - | 时间基准线，默认插件 | [a33ba1e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a33ba1e)
+ - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/33927e9)
+ - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e841392)
+ - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9cbe411)
+ - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2b81bbc)
+ - | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/29b8b93)
+ - | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/82cfdd4)
+ - | db store | [6414c4f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6414c4f)
+ - | indexedDB | [687394e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/687394e)
+ - | post 封装 | [da52e94](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da52e94)
+ - | tall插件封装 | [1bcb920](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1bcb920)
+ - | ws storage | [21b3a06](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21b3a06)
+ 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ed3d644)
+ pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/de01343)


 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
- - | 代码格式细节调整 | cb2532b
- - | 任务快捷方式图标增加 | 4aba872
- - | 修改角色样式 | 73e268e
- - | 删除多余字段 | 5ae3973
- - | 删除插件携带的多余文件 | 0f392bb
- - | 图标修改 | 54bca09
- - | 无基本变化 | 21ac4bb
- - | 日常任务修改 | dfa7ee2
- - | 更新代码 | 8c27e68
- - | 更新代码 | 1f40a76
- - | 格式细节调整 | b907a03
- - | 添加插件数据 | 2f11b42
- - | 组件新建 | 89c0035
+ - | 代码格式细节调整 | [cb2532b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cb2532b)
+ - | 格式细节调整 | [b907a03](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b907a03)
+ - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8c27e68)
+ - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1f40a76)
+ - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4aba872)
+ - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/dfa7ee2)
+ - | 删除插件携带的多余文件 | [0f392bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f392bb)
+ - | 删除多余字段 | [5ae3973](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ae3973)
+ - | 添加插件数据 | [2f11b42](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/2f11b42)
+ - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/54bca09)
+ - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/21ac4bb)
+ - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/73e268e)
+ - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/89c0035)


 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
- ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | 940603a, closes #ID1000343
- plugin | 插件解析机制完善 | 0f5a27d
- project title | 项目标题修改; 切换角色移除script | 5c20017
- roles | 修复默认显示不是我的角色的问题 | b69f94f
- role | 切换角色的逻辑修正完善 | 4ae534f
- task任务逻辑完善 | 减少初始global及regular的不必要请求 | bd4bd38
- - | 上下滑动加载定期任务 | 4090d89
- - | 上下滚动时间轴 | d533a01
- - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e
- - | 任务开始时间延迟插件 | 992a313
- - | 修改main | 749ae9a
- - | 修改报错 | 531c14d
- - | 修改角色栏组件 | a54c601
- - | 定期任务接口 | aa4981c
- - | 定期任务插件 | 92b3254
- - | 提示信息显示bug及日常任务收缩问题 | f2f06c5
- - | 插件bug解决 | 41257eb
- - | 日常任务html数据查验 | 880ce5c
- - | 日常任务插件遍历时的key值修改 | cd26285
- - | 日常任务插件面板高度修改 | 249f9e4
- - | 时间轴上下滑动 | 4d0ae46
- - | 时间轴上下滚动数据加载bug修改 | e82ede4
- - | 时间轴插件 | 225d3cc
- - | 时间轴骨架屏修改 | ca78d02
- - | 角色栏修改 | 19228d6
- - | 解决时间轴报错 | da1eece
- - | 骨架屏替换 | e9fdd71
+ ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/issues/ID1000343)
+ plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f5a27d)
+ project title | 项目标题修改; 切换角色移除script | [5c20017](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5c20017)
+ role | 切换角色的逻辑修正完善 | [4ae534f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4ae534f)
+ roles | 修复默认显示不是我的角色的问题 | [b69f94f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b69f94f)
+ task任务逻辑完善 | 减少初始global及regular的不必要请求 | [bd4bd38](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/bd4bd38)
+ - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
+ - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
+ - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
+ - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)
+ - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
+ - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
+ - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313)
+ - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
+ - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
+ - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
+ - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/d533a01)
+ - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4090d89)
+ - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc)
+ - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02)
+ - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4)
+ - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46)
+ - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
+ - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e)
+ - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d)
+ - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
+ - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a)


 ### 📝 文档
 范围|描述|commitId
 --|--|--
- - | README.md | ab0eb05
+ - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ab0eb05)


 ### 🔨 代码重构
@ -105,40 +108,51 @@
 - | 删除多余的技术验证界面 | 542ae5b
 - | 界面样式调整 | 4367249
 - | 重构store分层 | 5f6fff8
+ calendar | 日历细节调整 | [1a8d6bf](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1a8d6bf)
+ store/home | 删除store/home | [db8a3b4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/db8a3b4)
+ task beginTime | 格式化任务开始时间 | [fbc0301](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/fbc0301)
+ tip | 任务状态显示及tip组件数据的重构 | [78a5750](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/78a5750)
+ tips | 修改任务状态方法重构 | [b57d3ac](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b57d3ac)
+ - | 界面样式调整 | [4367249](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4367249)
+ - | 任务状态重构 | [4693655](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4693655)
+ - | 删除多余的技术验证界面 | [542ae5b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/542ae5b)
+ - | 下滑时间轴添加备注 | [4fd20e3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4fd20e3)
+ - | 重构store分层 | [5f6fff8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5f6fff8)
+ - | project 代码健壮性完善 | [a3202c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3202c5)
+ template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/9c966a1)


 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 插件查询及展示 | 4dba770
- - | 日历的更改 | 7353ac8
- - | 测试接口 | 215e074
- - | 组件文件夹新建 | 22bfe7b
- - | 组件文件夹新建 | 17bb8c9
- - | 组件文件夹新建 | 1421504
- - | 角色栏文字颜色修改 | 215c6b3
- - | 解决警告 | c932b09
+ - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215e074)
+ - | 插件查询及展示 | [4dba770](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4dba770)
+ - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/215c6b3)
+ - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c932b09)
+ - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7353ac8)
+ - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/22bfe7b)
+ - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/17bb8c9)
+ - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/1421504)


 ### chore
 范围|描述|commitId
 --|--|--
- - | api 封装 | 8dcb8a2
- - | env host修改 | a79a4a5
- - | merge globals | b0957cc
- - | merge wrr | 5ccc7a5
- - | mock | 51c24a5
- package manifest | 去掉了摇树 | f7c1dd4
- pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | 875fab4
- - | uview-ui | a9ea34b
- 信息配置 | 配置eslint等配置 | 7421443
- - | 修复不能build的问题 | 0b7b91e
- - | 删除多余的构建的命令 | 3f4eb2f
+ - | 删除多余的构建的命令 | [3f4eb2f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/3f4eb2f)
+ - | 修复不能build的问题 | [0b7b91e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b7b91e)
+ - | api 封装 | [8dcb8a2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8dcb8a2)
+ - | env host修改 | [a79a4a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a79a4a5)
+ - | merge globals | [b0957cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/b0957cc)
+ - | merge wrr | [5ccc7a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5ccc7a5)
+ package manifest | 去掉了摇树 | [f7c1dd4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f7c1dd4)
+ - | mock | [51c24a5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/51c24a5)
+ 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7421443)
+ pwa 小程序 | 移除了pwa，alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/875fab4)
+ - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a9ea34b)


 范围|描述|commitId
 --|--|--
- - | style:index | 978f272
- - | !2 基础模板v1.1.0 | f5e61dd
- - | init | c0f1deb
-
+ - | style:index | [978f272](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/978f272)
+ - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f5e61dd)
+ - | init | [c0f1deb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c0f1deb)
--- a/src/components/Projects/ProjectItem.vue
+++ b/src/components/Projects/ProjectItem.vue
@ -0,0 +1,7 @@
+<template>
+  <view class="flex items-center justify-between">
+  这是子项目
+</template>
+<script>
+export default {};
+</script>
--- a/src/components/Projects/Projects.vue
+++ b/src/components/Projects/Projects.vue
@ -1,26 +1,61 @@
 <template>
-  <view class="p-3 bg-white">
+  <view class="bg-white">
    <view class="flex items-center">
-      <image class="w-8 h-8 ml-1 mr-4 bg-yellow-700 rounded-full" src="../../static/local_play1.png"></image>
-      <view class="text-sm font-semibold">我的LWBS</view>
+      <view class="event-pic rounded-full flex justify-center items-center">
+        <image style="width: 25px; height: 25px" src="../../static/local_play1.png"></image>
      </view>
-    <view class="flex items-center justify-between p-2 task" v-for="(task, index) in tasks" :key="index">
+      <view class="title">我的LWBS</view>
+    </view>
+    <view v-for="(task, index) in tasks" :key="index">
+      <view>
+        <!-- 有子项目 -->
+        <view class="Item flex items-center justify-between" v-if="index <= 2">
          <view class="flex items-center">
-        <view class="w-8 h-8 ml-1 mr-2 bg-blue-300 rounded-full">
-          <view class="flex items-center justify-center w-8 h-8">{{ index + 1 }}</view>
+            <view class="firstTask rounded-full text-white" v-if="index === 0">
+              <view class="flex items-center justify-center">{{ index + 1 }}</view>
+            </view>
+            <view class="sencondTask rounded-full text-white" v-else-if="index === 1">
+              <view class="flex items-center justify-center">{{ index + 1 }}</view>
+            </view>
+            <view class="thirdTask rounded-full text-white" v-else-if="index === 2">
+              <view class="flex items-center justify-center">{{ index + 1 }}</view>
            </view>
            <view>
              <view class="flex items-center">
-            <view class="text-sm font-semibold">{{ task.taskName }}</view>
-            <view class="pl-2 pr-2 text-green-500 bg-green-200 rounded-full">{{ task.state }}</view>
+                <view class="title">{{ task.taskName }}</view>
+                <view class="states px-2 text-green-400 bg-green-100 rounded-full">{{ task.state }}</view>
              </view>
-          <view class="flex items-center text-gray-400">
+              <view class="dates flex items-center text-gray-400">
                <view class="pr-2">{{ task.time }}</view>
                <view>时长：{{ task.duration }}</view>
              </view>
            </view>
          </view>
-      <u-icon name="arrow-right" size="28"></u-icon>
+          <u-icon name="arrow-right" color="#A4A6AB" size="28" @click="openProjectItem(index)"></u-icon>
+        </view>
+        <!-- 没有子项目 -->
+        <view class="Item" v-else>
+          <view class="flex items-center">
+            <view class="routine w-8 h-8 bg-white border rounded-full">
+              <view class="flex items-center justify-center">{{ index + 1 }}</view>
+            </view>
+            <view>
+              <view class="flex items-center">
+                <view class="title">{{ task.taskName }}</view>
+                <view class="states px-2 text-green-400 bg-green-100 rounded-full">{{ task.state }}</view>
+              </view>
+              <view class="dates flex items-center text-gray-400">
+                <view class="pr-2">{{ task.time }}</view>
+                <view>时长：{{ task.duration }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view v-if="isrotate === index">
+          这是子项目
+          <ProjectItem />
+        </view>
+      </view>
    </view>
  </view>
 </template>
@ -81,3 +116,66 @@ export default {
  },
 };
 </script>
+<style lang="scss" scoped>
+.firstTask {
+  background: linear-gradient(45deg, #9000ff, #5e00ff);
+  width: 32px;
+  height: 32px;
+  margin-right: 16px;
+  line-height: 32px;
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid #eee;
+}
+.sencondTask {
+  background: linear-gradient(45deg, #0081ff, #1cbbb4);
+  width: 32px;
+  height: 32px;
+  margin-right: 16px;
+  line-height: 32px;
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid #eee;
+}
+.thirdTask {
+  background: linear-gradient(45deg, #39b54a, #8dc63f);
+  width: 32px;
+  height: 32px;
+  margin-right: 16px;
+  line-height: 32px;
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid #eee;
+}
+.routine {
+  width: 32px;
+  height: 32px;
+  margin-right: 16px;
+  line-height: 32px;
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid #eee;
+}
+.event-pic {
+  margin: 0 14px;
+  width: 36px;
+  height: 36px;
+  background: linear-gradient(45deg, #ff9700, #ed1c24);
+}
+.title {
+  font-size: 15px;
+  margin-right: 16px;
+}
+.dates {
+  font-size: 12px;
+}
+.states {
+  font-size: 10px;
+  margin: 2px;
+}
+.Item {
+  border-bottom: 1px solid #fafafa;
+  height: 60px;
+  padding: 10px 16px;
+}
+</style>
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@ -89,17 +89,17 @@ export default {
     * 点击了图标 修改任务状态
     * @param {object} event
     */
-    changeStatus(event) {
+    changeStatus() {
      return false;
-      const { status, taskId, taskName, tip } = this;
-      tip.status = status;
-      tip.taskId = taskId;
-      tip.left = event.target.x;
-      tip.top = event.target.y;
-      tip.show = true;
-      tip.text = this.genetateTips(status, taskName);
+      // const { status, taskId, taskName, tip } = this;
+      // tip.status = status;
+      // tip.taskId = taskId;
+      // tip.left = event.target.x;
+      // tip.top = event.target.y;
+      // tip.show = true;
+      // tip.text = this.genetateTips(status, taskName);

-      this.setTip(tip);
+      // this.setTip(tip);
    },

    // 计算圆环的弧度百分比
--- a/src/components/Tips/Tips.vue
+++ b/src/components/Tips/Tips.vue
@ -62,11 +62,26 @@ export default {
     * 执行修改任务状态的动作
     * @param {number} type 状态码 0开始 1暂停 2继续 3完成 默认0
     */
-    onChangeStatus(type) {
+    async onChangeStatus(type) {
+      try {
        const param = { id: this.tip.taskId, type };
        // TODO: 发请求
-      const data = uni.$u.api.updateTaskType(param);
-      console.log(data);
+        await uni.$u.api.updateTaskType(param);
+        if (type === 0) {
+          this.$t.ui.showToast('项目已重新开始');
+        } else if (type === 1) {
+          this.$t.ui.showToast('项目已暂停');
+        } else if (type === 2) {
+          this.$t.ui.showToast('项目继续');
+        } else if (type === 3) {
+          this.$t.ui.showToast('项目结束');
+        }
+        this.tip.show = false;
+        location.reload();
+        // this.$router.go(0);
+      } catch (error) {
+        console.log(error);
+      }
    },

    // 点击了取消
--- a/src/components/Upload/Upload.vue
+++ b/src/components/Upload/Upload.vue
@ -1,27 +1,89 @@
 <template>
  <view>
    <view class="upload mx-4">
-      <u-icon name="plus" color="#ffffff" size="48" class="flex justify-center h-10 w-10 bg-blue-500 rounded-full"></u-icon>
-      <u-input type="textarea" placeholder="" class="inputUpload" />
+      <view v-if="!showUploadList">
+        <view v-for="(item, index) in lists" :key="index">
+          <image :src="item.url" mode="aspectFill"></image>
+        </view>
+      </view>
+      <u-upload
+        ref="uUpload"
+        :show-upload-list="showUploadList"
+        :custom-btn="true"
+        :action="action"
+        :before-upload="beforeUpload"
+        max-count="6"
+      >
+        <view slot="addBtn" class="bgIcon flex justify-center items-center rounded-full" hover-stay-time="150">
+          <u-icon name="plus" color="#ffffff" size="48" class="uploadIcon flex justify-center rounded-full"></u-icon>
+        </view>
+      </u-upload>
    </view>
  </view>
 </template>
 <script>
 export default {
  data() {
-    return {};
+    return {
+      //上传地址
+      action: 'http://www.example.com',
+      showUploadList: false,
+      lists: [],
+    };
+  },
+
+  onReady() {
+    // this.lists = this.refs.uUpload.lists;
+    // 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
+    this.lists = this.$refs.uUpload.lists.filter(val => {
+      return val.progress == 100;
+    });
+    console.log(this.lists);
+  },
+
+  methods: {
+    beforeUpload() {
+      return new Promise((resolve, reject) => {
+        this.$u
+          .post('url')
+          .then(res => {
+            console.log(res);
+            resolve();
+          })
+          .catch(err => {
+            reject(err);
+            console.log(err);
+          });
+      });
+    },
  },
-  methods: {},
 };
 </script>
 <style lang="scss">
 .upload {
-  display: flex;
-  flex-direction: row-reverse;
+  position: relative;
+  left: 80%;
+  bottom: 25px;
+  height: 5px;
 }
-.inputUpload {
+.one {
  position: relative;
  left: 85%;
  right: 5%;
 }
+.uploads {
+  position: relative;
+  width: 50px;
+  height: 50px;
+}
+.uploadIcon {
+  background: linear-gradient(45deg, #0081ff, #1cbbb4);
+  height: 50px;
+  width: 50px;
+}
+.bgIcon {
+  background: white;
+  height: 50px;
+  width: 50px;
+}
 </style>