Browse Source

Merge pull request 'fix: 提示信息显示bug及日常任务收缩问题' (#7) from featComponent into develop

Reviewed-on: https://dd.tall.wiki/gitea/wally/TALL-MUI-3/pulls/7
develop
aBin 4 years ago
parent
commit
5c262c4b9c
  1. 6
      CHANGELOG.md
  2. 5
      src/components/TimeLine/TimeLine.vue
  3. 2
      src/components/Tips/Tips.vue

6
CHANGELOG.md

@ -3,11 +3,13 @@
### 🌟 新功能
范围|描述|commitId
--|--|--
- | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d)
- | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4)
- | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671)
- | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9)
- | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e841392)
- | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411)
- | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc)
- | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f)
- | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644)
@ -29,6 +31,10 @@
### 🐛 Bug 修复
范围|描述|commitId
--|--|--
- | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6)
- | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01)
- | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46)
- | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601)
- | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a)

5
src/components/TimeLine/TimeLine.vue

@ -9,7 +9,7 @@
<!-- <Barrier /> -->
<scroll-view
:lower-threshold="300"
:scrollTop="scrollTop"
:scrollTop="top"
:scrollY="true"
:upper-threshold="300"
@scroll="scroll"
@ -28,14 +28,13 @@ export default {
name: 'TimeLine',
components: { TimeBox },
data() {
return { scrollTop: 0, top: 0 };
return { top: 0 };
},
computed: mapState('home', ['scrollTop', 'showTips']),
methods: {
...mapMutations('home', ['setScrollTop', 'setShrink']),
//
scroll(e) {
console.log(e.detail.scrollTop);
this.top = e.detail.scrollTop;
this.setShrink(this.top > this.scrollTop);
this.setScrollTop(this.top);

2
src/components/Tips/Tips.vue

@ -1,6 +1,6 @@
<template>
<view
class="absolute shadow-2xl shadow-2xl"
class="fixed shadow-2xl shadow-2xl"
style="z-index: 1000"
:style="{
left: client.left + 'px',

Loading…
Cancel
Save