From 8dba578b0c4a54d001b762825d45d012b9835005 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 27 Jan 2022 18:14:52 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E8=A7=92=E8=89=B2=E4=B8=8D=E6=98=AF=E7=AC=AC=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E6=97=B6=E6=98=BE=E7=A4=BA=E5=87=BA=E9=94=99=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
hooks/project/useInit.js | 5 ++---
pages/project/project.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3b7dce..4ac8622 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
- | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
- | 插件api | [08bdf74](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/08bdf74)
- | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
+ - | 登录按钮 | [527b0e5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/527b0e5)
- | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
- | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
diff --git a/hooks/project/useInit.js b/hooks/project/useInit.js
index ab40cf6..52d52a2 100644
--- a/hooks/project/useInit.js
+++ b/hooks/project/useInit.js
@@ -53,7 +53,6 @@ export default function useInit() {
} else {
store.commit('role/setInvisibleRoles', data ? data.invisibleList : []);
store.commit('role/setVisibleRoles', data ? data.visibleList : []);
- console.log('222222')
setInitialRoleId(data ? data.visibleList : []);
setAllTasksByRoles(data ? data.visibleList : []);
}
@@ -68,7 +67,7 @@ export default function useInit() {
const storageRoleId = uni.$storage.getStorageSync('roleId');
const currentRoleId = storageRoleId || (currentRole ? currentRole.id : '');
store.commit('role/setRoleId', currentRoleId);
- console.log('11111111')
+ store.commit('role/setRoleIndex', index);
// 清空storage
uni.$storage.setStorageSync('roleId', '');
}
@@ -94,7 +93,7 @@ export default function useInit() {
const params = { projectId: options.p, num: 0 };
getProjectById(params);
// 根据项目id获取角色列表
- getRoles(params);
+ getRoles(params);
// 根据项目id获取成员列表
store.dispatch('role/getAllMembers', { projectId: options.p });
}
diff --git a/pages/project/project.vue b/pages/project/project.vue
index 4b7cd93..b3f9890 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -6,7 +6,7 @@
-
+ {{roleIndex}}
Date: Thu, 27 Jan 2022 18:15:46 +0800
Subject: [PATCH 02/10] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4=E6=89=93?=
=?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
pages/project/project.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ac8622..0f1e2fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@
- | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd)
交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889)
+ - | 解决默认角色不是第一个时显示出错问题 | [8dba578](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dba578)
- | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
- | 日历列表H5在手机端不显示 | [0b4ae72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b4ae72)
- | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
diff --git a/pages/project/project.vue b/pages/project/project.vue
index b3f9890..b3e978c 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -6,7 +6,7 @@
- {{roleIndex}}
+
Date: Thu, 27 Jan 2022 18:23:00 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96c=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
apis/plugin.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1e2fe..c54a6aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@
- | 插件样式调整 | [7411d3a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7411d3a)
- | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
- | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
+ - | 删除打印 | [3e75576](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3e75576)
- | 细节调整 | [ebf678f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf678f)
- | 细节调整 | [759ef52](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/759ef52)
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
diff --git a/apis/plugin.js b/apis/plugin.js
index f3b15ea..3aeb134 100644
--- a/apis/plugin.js
+++ b/apis/plugin.js
@@ -2,7 +2,7 @@ import Config from '@/common/js/config.js';
import { computed } from 'vue';
import store from '@/store/index.js';
-const { apiUrl } = Config.apiUrl;
+const { apiUrl } = Config;
// const defaultwbs = `${apiUrl}/defaultwbs`;
const domain = computed(() => store.state.domain);
console.log('domain: ', domain.value);
From 7d16f4a49fa317bd32a68a95fe2606ef920486ab Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Thu, 27 Jan 2022 18:35:51 +0800
Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20=E5=AE=A1=E6=A0=B8=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E4=BA=A4=E4=BB=98=E7=89=A9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 165 ++++++++++----------
plugins/p-deliver-check/p-deliver-check.vue | 2 +-
2 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54a6aa..c55bdcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,119 +3,120 @@
### 🌟 新功能
范围|描述|commitId
--|--|--
- - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
- - | 财务条插件的进度条和上方悬浮按钮界面 | [8322e92](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8322e92)
- 财务 | 细节调整;根据任务获取财务条信息 | [414106a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/414106a)
- - | 插件的填写提交,编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5)
+ - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
+ - | app端请求路径不对 | [b31fa14](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b31fa14)
+ deliver 交付物 | 点击交付物链接webview打开链接 | [daa59f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/daa59f1)
+ - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
+ - | get请求 | [3a61439](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3a61439)
+ project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
+ theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
+ - | token过期策略 | [8f16ae1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f16ae1)
+ - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
+ - | 主体颜色 | [bb5c0e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bb5c0e3)
+ - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
+ - | 刷新token重新运行api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf)
+ - | 域名配置 | [b68272d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b68272d)
+ - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f)
+ - | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35)
+ - | 将时间轴改成swiper滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9)
+ - | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
+ - | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806)
+ - | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903)
+ - | 引导页、广告页 | [4aa76ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4aa76ff)
+ - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
+ - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
+ - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
+ - | 插件api | [08bdf74](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/08bdf74)
- | 插件的填写与提交,修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
+ - | 插件的填写提交,编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5)
- | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
- - | 插件api | [08bdf74](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/08bdf74)
+ - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
+ - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
+ - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
+ - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
+ - | 时间轴调整 | [81d2500](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/81d2500)
+ - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
+ - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
+ - | 未登录调用项目列表接口 | [aab6489](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aab6489)
+ - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
+ - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
+ - | 状态栏、导入 | [f30bac2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f30bac2)
- | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
- - | 登录按钮 | [527b0e5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/527b0e5)
- | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
- - | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
- - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- - | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
- - | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806)
- - | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903)
+ - | 登录按钮 | [527b0e5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/527b0e5)
+ - | 细节调整;解开查所有成员的api | [ee18175](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ee18175)
- | 缓存改变 | [9685d55](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9685d55)
- | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2)
- | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8)
- - | 将时间轴改成swiper滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9)
+ - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
- | 解决时间轴日常任务不显示问题 | [c532a93](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c532a93)
- - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
- - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
- - | 设置项目域名 | [1a835f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1a835f1)
- | 设置状态栏 | [9871356](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9871356)
- - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f)
- - | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35)
- - | 时间轴调整 | [81d2500](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/81d2500)
- - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
- - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
- - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
- - | 刷新token重新运行api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf)
- - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 未登录调用项目列表接口 | [aab6489](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aab6489)
- - | 细节调整;解开查所有成员的api | [ee18175](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ee18175)
- - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
+ - | 设置项目域名 | [1a835f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1a835f1)
+ - | 财务条插件的进度条和上方悬浮按钮界面 | [8322e92](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8322e92)
+ 财务 | 细节调整;根据任务获取财务条信息 | [414106a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/414106a)
+ - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
- | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
- - | 引导页、广告页 | [4aa76ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4aa76ff)
- - | 域名配置 | [b68272d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b68272d)
- - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- - | 主体颜色 | [bb5c0e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bb5c0e3)
- - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
- - | 状态栏、导入 | [f30bac2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f30bac2)
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | app端请求路径不对 | [b31fa14](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b31fa14)
- deliver 交付物 | 点击交付物链接webview打开链接 | [daa59f1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/daa59f1)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- - | get请求 | [3a61439](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3a61439)
- project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
- theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- - | token过期策略 | [8f16ae1](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f16ae1)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
+ - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
### 🎨 代码样式
范围|描述|commitId
--|--|--
- - | 插件样式调整 | [7411d3a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7411d3a)
- - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
+ - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
- | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
- | 删除打印 | [3e75576](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3e75576)
+ - | 插件样式调整 | [7411d3a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7411d3a)
+ - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
- | 细节调整 | [ebf678f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf678f)
- | 细节调整 | [759ef52](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/759ef52)
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
- - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
### 🐛 Bug 修复
范围|描述|commitId
--|--|--
- - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714)
- - | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322)
- - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
+ app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
+ createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0)
+ - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
+ - | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd)
交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889)
- - | 解决默认角色不是第一个时显示出错问题 | [8dba578](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dba578)
- - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
- - | 日历列表H5在手机端不显示 | [0b4ae72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b4ae72)
+ - | 修复p-deliver报错taskRef的问题 | [880cf7c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/880cf7c)
+ - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
- | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
- - | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
+ - | 子组件传参 | [489e218](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/489e218)
+ - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
+ - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
+ - | 日历列表H5在手机端不显示 | [0b4ae72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b4ae72)
- | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
+ - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714)
+ - | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322)
+ - | 获取c插件信息 | [7b02efc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7b02efc)
+ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+ - | 解决默认角色不是第一个时显示出错问题 | [8dba578](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dba578)
- | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75)
- - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
- - | 修复p-deliver报错taskRef的问题 | [880cf7c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/880cf7c)
- - | 子组件传参 | [489e218](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/489e218)
- app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
- createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0)
- - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
### 📝 文档
范围|描述|commitId
--|--|--
- - | 添加交付物http测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab)
- | deliver http 文件更新 | [568115c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/568115c)
+ - | 添加交付物http测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab)
### 📦 持续集成
范围|描述|commitId
--|--|--
- - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
- - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
+ - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
+ - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
+ - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
- | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
+ - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
+ - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
- | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)
- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
- - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
### 🔧 测试
@@ -127,31 +128,31 @@
### 🔨 代码重构
范围|描述|commitId
--|--|--
- - | 查看提交历史记录页面数据同步更新 | [749cb10](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/749cb10)
- - | 调整进度条样式 | [b142651](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b142651)
- - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
+ api | 调整mock api放入mock.js下;main中加入环境变量的判断 | [053ac31](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/053ac31)
+ - | deliver检查人重构;更新真实数据的检查人 | [ce808c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ce808c4)
+ - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
- | 交付物代码整理重构 未完 | [d7c6e51](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d7c6e51)
+ - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
交付物 | 调整交付物细节;完善逻辑 | [25ccd36](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/25ccd36)
+ - | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e)
+ - | 修改错误单词‘confirmDeleDte’ | [ddbb04c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ddbb04c)
+ - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
+ - | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
- | 审查接口核对完成 | [43ae604](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/43ae604)
- | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f)
- | 审核记录查看 | [915aa06](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/915aa06)
- | 审核记录查看 | [121d43f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/121d43f)
- - | 提交交付物,查看提交记录,修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530)
- | 提交交付物,修改交付物名称,查看交付物历史记录接口完成 | [f222bdf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f222bdf)
+ - | 提交交付物,查看提交记录,修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530)
- | 提取deliver store;细节调整 | [4d901ac](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4d901ac)
- - | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
+ - | 查看提交历史记录页面数据同步更新 | [749cb10](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/749cb10)
- | 细节调整 | [7f9cf1f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7f9cf1f)
- | 细节调整 | [3d1c463](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d1c463)
- - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
- - | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e)
- - | 修改错误单词‘confirmDeleDte’ | [ddbb04c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ddbb04c)
- - | 隐藏项目详情页缓存 | [90c1699](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/90c1699)
- - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
- - | 重构财务条组件;添加财务mock | [03a1cdb](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a1cdb)
+ - | 调整进度条样式 | [b142651](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b142651)
- | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- api | 调整mock api放入mock.js下;main中加入环境变量的判断 | [053ac31](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/053ac31)
- - | deliver检查人重构;更新真实数据的检查人 | [ce808c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ce808c4)
- - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
+ - | 重构财务条组件;添加财务mock | [03a1cdb](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a1cdb)
+ - | 隐藏项目详情页缓存 | [90c1699](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/90c1699)
+ - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
### 🚀 性能优化
diff --git a/plugins/p-deliver-check/p-deliver-check.vue b/plugins/p-deliver-check/p-deliver-check.vue
index f6a17a2..28e3795 100644
--- a/plugins/p-deliver-check/p-deliver-check.vue
+++ b/plugins/p-deliver-check/p-deliver-check.vue
@@ -4,7 +4,7 @@
- 审核状态
+ {{ deliverData ? deliverData.deliverName : '' }} 审核状态
From 5935a3dd619b8bd5d99e7f4d416c45459fddc8be Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 27 Jan 2022 18:50:51 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=9F=A5?=
=?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
components/Globals/Globals.vue | 3 ++-
components/Plugin/Plugin.vue | 3 ++-
components/Render/Render.vue | 3 ++-
components/TimeLine/component/TimeBox.vue | 1 +
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54a6aa..bef7034 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
- | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714)
- | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322)
- | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5)
+ - | 获取c插件信息 | [7b02efc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7b02efc)
交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd)
交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889)
- | 解决默认角色不是第一个时显示出错问题 | [8dba578](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dba578)
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index 6fa96bf..fcd4e5d 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -22,7 +22,8 @@
:class="[`row-span-${plugin.row}`, `col-span-${plugin.col}`]"
:task="item"
:key="plugin.pluginTaskId"
- :plugin-task-id="plugin.pluginTaskId"
+ :plugin-task-id="plugin.pluginTaskId"
+ :business-plugin-id="plugin.businessPluginId"
:plugin-id="plugin.pluginId"
:param="plugin.param"
:style-type="plugin.styleType || 0"
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index 73de8b8..3c249d4 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -22,7 +22,7 @@
-
+
@@ -35,6 +35,7 @@ const props = defineProps({
pluginId: { default: '1', type: String },
styleType: { default: 0, type: Number },
pluginTaskId: { default: '', type: String },
+ businessPluginId: { default: '', type: String },
param: { type: String, default: '' },
});
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index a88b66e..e9f229c 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -49,6 +49,7 @@ defineProps({
pluginId: { default: '1', type: String },
styleType: { default: 0, type: Number },
pluginTaskId: { default: '', type: String },
+ businessPluginId: { default: '', type: String },
param: { type: String, default: '' },
});
@@ -80,7 +81,7 @@ export default {
methods: {
// 获取插件信息
async getPlugin() {
- const params = { pluginId: this.pluginId, styleType: this.styleType };
+ const params = { businessPluginId: this.businessPluginId };
this.$catchReq.getOtherPlugin(params, (err, res) => {
if (err) {
console.error('err: ', err);
diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue
index 7a3fba5..16c9971 100644
--- a/components/TimeLine/component/TimeBox.vue
+++ b/components/TimeLine/component/TimeBox.vue
@@ -39,6 +39,7 @@
:task="task"
:key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId"
+ :business-plugin-id="plugin.businessPluginId"
:plugin-id="plugin.pluginId"
:param="plugin.param"
:style-type="data.styleType || 0"
From b674733790e2003e4cdb2157f7683c1d2a0b9011 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 27 Jan 2022 20:05:53 +0800
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
apis/plugin.js | 2 +-
components/Globals/Globals.vue | 15 ++++++++
components/PrettyExchange/PrettyExchange.vue | 37 ++++++++++++++++++-
components/Projects/ProjectItem.vue | 38 ++++++++++++++++++--
pages/index/index.vue | 1 -
pages/project/project.vue | 12 ++++---
7 files changed, 96 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b8bf2d..5137e47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -138,6 +138,7 @@
- | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f)
- | 审核记录查看 | [915aa06](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/915aa06)
- | 审核记录查看 | [121d43f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/121d43f)
+ - | 审核添加交付物名称 | [7d16f4a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7d16f4a)
- | 提交交付物,查看提交记录,修改交付物标题的接口核对完成 | [7c08530](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7c08530)
- | 提交交付物,修改交付物名称,查看交付物历史记录接口完成 | [f222bdf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f222bdf)
- | 提取deliver store;细节调整 | [4d901ac](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4d901ac)
diff --git a/apis/plugin.js b/apis/plugin.js
index 3aeb134..838d7a7 100644
--- a/apis/plugin.js
+++ b/apis/plugin.js
@@ -12,7 +12,7 @@ export function setupPlugin(app) {
// 获取插件信息
// uni.$u.api.getOtherPlugin = param =>
// uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`);
- uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/opt/business/businessPluginById?businessPluginId=${param.businessPluginId}`);
+ uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/opt/business/businessPluginById`, param);
// 查询子任务
uni.$u.api.findSonTask = param => uni.$u.post(`${domain.value}/task/findSonTask`, param);
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index fcd4e5d..3f3d70e 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -14,6 +14,10 @@
+
+
+
+
@@ -62,12 +66,23 @@ const store = useStore();
const isShrink = computed(() => store.state.task.isShrink); // 全局任务是否收缩
const showGlobalSkeleton = computed(() => store.state.task.showGlobalSkeleton); // 全局任务骨架屏
+const visibleRoles = computed(() => store.state.role.visibleRoles); // 展示的角色信息
+const roleIndex = computed(() => store.state.role.roleIndex); // 时间轴角色索引
+const roleId = computed(() => store.state.role.roleId); // 当前展示查看的角色id
+
// 手动展开日常任务
function openCard() {
if (isShrink.value) {
store.commit('task/setShrink', false);
}
}
+
+// 跳转工作台
+function toWorkbench() {
+ uni.navigateTo({
+ url: '/pages/workbench/workbench'
+ });
+}
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index 94e6b11..91c787c 100644
--- a/components/Projects/ProjectItem.vue
+++ b/components/Projects/ProjectItem.vue
@@ -1,6 +1,6 @@
-
+
@@ -18,6 +18,10 @@
+
+ 工作台
+
+
@@ -26,7 +30,7 @@
-
+
@@ -100,6 +104,13 @@ const data = reactive({
projectId: 0,
});
+// 跳转工作台
+function toWorkbench() {
+ uni.navigateTo({
+ url: '/pages/workbench/workbench'
+ });
+}
+
// 打开项目详情
function openProject(project) {
const { name, id, url } = project;
@@ -128,4 +139,27 @@ function openMenu(project) {
height: 4rpx;
margin: 0 20rpx 0 90rpx;
}
+
+.workbench-btn {
+ position: relative;
+ right: 10px;
+ width: 80px;
+ height: 36px;
+ line-height: 36px;
+ border-radius: 18px;
+ overflow: hidden;
+ border: 1px solid #2B85E4;
+
+ button {
+ font-size: 12px;
+ background-color: #1890FF;
+ color: #FFFFFF;
+ width: 100%;
+ height: 100%;
+
+ &:after {
+ border: none;
+ }
+ }
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 661a8b5..f220d9c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -139,7 +139,6 @@
// }
function toLogin() {
- console.log(11)
if (!userInfo.value) {
uni.navigateTo({
url: '/pages/user/login'
diff --git a/pages/project/project.vue b/pages/project/project.vue
index b3e978c..d1dba4c 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -6,7 +6,7 @@
-
+
{
watch(roleId, newValue => {
if (newValue) {
// 判断如果allTasks里有就不用加了
- if (allTasks.value.length && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task) return;
+ if (allTasks.value.length && allTasks.value[roleIndex.value] && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task) return;
console.log('当角色发生变化时', newValue);
store.commit('task/setTimeNode', Date.now());
@@ -189,11 +189,13 @@ function setScrollPosition() {
store.commit('task/setScrollToTaskId', `a${taskId}`);
uni.$storage.setStorageSync('taskId', ''); // 记录后即刻清除本地存储
} else {
- if (allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length) {
- } else {
- allTasks.value[roleIndex.value].task = [];
+ if (allTasks.value[roleIndex.value]) {
+ if (!(allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length)) {
+ allTasks.value[roleIndex.value].task = [];
+ }
}
+
const item = allTasks.value[roleIndex.value].task.find(task => task.detailId);
if (item) {
store.commit('task/setScrollToTaskId', `a${item.id}`);
From 5ff7706376b694ab13468b8e885fef5ea5ee3c76 Mon Sep 17 00:00:00 2001
From: jun feng
Date: Fri, 28 Jan 2022 00:50:43 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=E7=BB=99=E8=B4=A2=E5=8A=A1?=
=?UTF-8?q?=E6=9D=A1=E4=BC=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
components/Globals/Globals.vue | 10 +++++++---
hooks/project/useGenerateWebviewParam.js | 17 +++++++++++++++++
plugins/p-finance-audit/p-finance-audit.vue | 16 +++++++++++++++-
plugins/p-source-manage/p-source-manage.vue | 16 +++++++++++++++-
store/project/getters.js | 5 +++++
6 files changed, 60 insertions(+), 5 deletions(-)
create mode 100644 hooks/project/useGenerateWebviewParam.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5137e47..cc63342 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
- | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
- | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 工作台功能 | [b674733](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b674733)
- | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
- | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806)
- | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903)
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index 3f3d70e..b771b9c 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -14,7 +14,11 @@
-
+
@@ -26,7 +30,7 @@
:class="[`row-span-${plugin.row}`, `col-span-${plugin.col}`]"
:task="item"
:key="plugin.pluginTaskId"
- :plugin-task-id="plugin.pluginTaskId"
+ :plugin-task-id="plugin.pluginTaskId"
:business-plugin-id="plugin.businessPluginId"
:plugin-id="plugin.pluginId"
:param="plugin.param"
@@ -80,7 +84,7 @@ function openCard() {
// 跳转工作台
function toWorkbench() {
uni.navigateTo({
- url: '/pages/workbench/workbench'
+ url: '/pages/workbench/workbench',
});
}
diff --git a/hooks/project/useGenerateWebviewParam.js b/hooks/project/useGenerateWebviewParam.js
new file mode 100644
index 0000000..a8697c1
--- /dev/null
+++ b/hooks/project/useGenerateWebviewParam.js
@@ -0,0 +1,17 @@
+import { computed } from 'vue';
+import { useStore } from 'vuex';
+
+export default function useGenerateWebviewParam() {
+ const store = useStore();
+ console.log('store: ', store);
+
+ const projectId = computed(() => store.getters['project/projectId']);
+ const token = computed(() => store.state.user.token);
+ const projectName = computed(() => store.getters['project/projectName']);
+ console.log('projectName: ', projectName);
+ return {
+ projectId: projectId.value,
+ token: token.value,
+ projectName: projectName.value,
+ };
+}
diff --git a/plugins/p-finance-audit/p-finance-audit.vue b/plugins/p-finance-audit/p-finance-audit.vue
index 6a8f726..e1e8150 100644
--- a/plugins/p-finance-audit/p-finance-audit.vue
+++ b/plugins/p-finance-audit/p-finance-audit.vue
@@ -6,9 +6,23 @@
diff --git a/store/project/getters.js b/store/project/getters.js
index 39b22a7..d5ce747 100644
--- a/store/project/getters.js
+++ b/store/project/getters.js
@@ -6,6 +6,11 @@ const getters = {
projectId({ project }) {
return project.id;
},
+
+ // 项目名称
+ projectName({ project }) {
+ return project && project.name ? project.name : '';
+ },
};
export default getters;
From fa92a11d7dc279d179c2ed3a788bd20ba27208fa Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Fri, 28 Jan 2022 00:52:30 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat:=20=E7=BB=99=E8=B4=A2=E5=8A=A1?=
=?UTF-8?q?=E6=9D=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc63342..41750a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
- | 登录按钮 | [527b0e5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/527b0e5)
- | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
- | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
+ - | 给财务条传参数 | [5ff7706](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ff7706)
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- | 工作台功能 | [b674733](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b674733)
- | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
From d749dfb8cd6eac179db922cd1a99bf896a00f79d Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 28 Jan 2022 09:20:52 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=E5=B9=BF=E5=91=8A=E9=A1=B5?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 8 ++++----
CHANGELOG.md | 3 ++-
components/Adv/Adv.vue | 9 +++++++--
pages.json | 16 ----------------
pages/index/index.vue | 13 +++++++++----
5 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/App.vue b/App.vue
index 664440b..c279b04 100644
--- a/App.vue
+++ b/App.vue
@@ -25,11 +25,11 @@ export default {
// 查询广告页和引导页并缓存
// #ifdef APP-PLUS
- // uni.$storage.setStorageSync('isOpenApp', true);
- // this.$store.commit('setIsOpenApp', true);
+ uni.$storage.setStorageSync('isOpenApp', true);
+ this.$store.commit('setIsOpenApp', true);
// 判断是否第一次打开App
- // let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
- // this.$store.commit('setFirstOpenApp');
+ let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
+ this.$store.commit('setFirstOpenApp');
this.getGuide(0);
this.getGuide(1);
// #endif
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5137e47..841db52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-27)
+# 1.0.0 (2022-01-28)
### 🌟 新功能
范围|描述|commitId
@@ -15,6 +15,7 @@
- | 登录图标、日历页今日 | [7de419d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7de419d)
- | 服务、插件缓存、导入选择服务列表、 | [cc8004b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/cc8004b)
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 工作台功能 | [b674733](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b674733)
- | 广告页、引导页 | [fe87d00](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fe87d00)
- | 广告页、引导页 | [1c89806](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1c89806)
- | 广告页、引导页改为组件 | [2be7903](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2be7903)
diff --git a/components/Adv/Adv.vue b/components/Adv/Adv.vue
index a2e12cf..11f75ae 100644
--- a/components/Adv/Adv.vue
+++ b/components/Adv/Adv.vue
@@ -10,7 +10,7 @@
- {{ time }} 跳过
+ {{ time }} 跳过
@@ -43,6 +43,11 @@
}
}, 1000);
+ function toIndex() {
+ uni.$storage.setStorageSync('isOpenApp', false);
+ store.commit('setIsOpenApp', false);
+ }
+
// setTimeout(() => {
// // 判断是否第一次打开App
// let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
@@ -64,7 +69,7 @@
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index 91c787c..6b8599b 100644
--- a/components/Projects/ProjectItem.vue
+++ b/components/Projects/ProjectItem.vue
@@ -18,9 +18,7 @@
-
- 工作台
-
+ 工作台
@@ -141,25 +139,16 @@ function openMenu(project) {
}
.workbench-btn {
- position: relative;
- right: 10px;
+ margin-right: 10px;
width: 80px;
height: 36px;
line-height: 36px;
border-radius: 18px;
overflow: hidden;
border: 1px solid #2B85E4;
-
- button {
- font-size: 12px;
- background-color: #1890FF;
- color: #FFFFFF;
- width: 100%;
- height: 100%;
-
- &:after {
- border: none;
- }
- }
+ background-color: #1890FF;
+ font-size: 12px;
+ color: #FFFFFF;
+ text-align: center;
}
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 17643ce..37e7c4e 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -8,7 +8,7 @@