ccsens_tall
/
TALL-MUI-4
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feat' of http://101.201.226.163:3000/TALL/TALL-MUI-4 into feat

test2
Min5203 4 years ago
parent
c3caad0377 6e434e6bd9
commit
d3e12a8a0a
20 changed files with 295 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      App.vue
  2. 127
      CHANGELOG.md
  3. 4
      apis/plugin.js
  4. 9
      components/Adv/Adv.vue
  5. 20
      components/Globals/Globals.vue
  6. 12
      components/Plugin/Plugin.vue
  7. 24
      components/PrettyExchange/PrettyExchange.vue
  8. 27
      components/Projects/ProjectItem.vue
  9. 3
      components/Render/Render.vue
  10. 1
      components/TimeLine/component/TimeBox.vue
  11. 17
      hooks/project/useGenerateWebviewParam.js
  12. 3
      hooks/project/useInit.js
  13. 16
      pages.json
  14. 14
      pages/index/index.vue
  15. 8
      pages/project/project.vue
  16. 2
      pages/workbench/workbench.vue
  17. 2
      plugins/p-deliver-check/p-deliver-check.vue
  18. 16
      plugins/p-finance-audit/p-finance-audit.vue
  19. 16
      plugins/p-source-manage/p-source-manage.vue
  20. 5
      store/project/getters.js

8
App.vue
View File

@ -25,11 +25,11 @@ export default {
// 查询广告页和引导页并缓存 // 查询广告页和引导页并缓存
// #ifdef APP-PLUS // #ifdef APP-PLUS
// uni.$storage.setStorageSync('isOpenApp', true); uni.$storage.setStorageSync('isOpenApp', true);
// this.$store.commit('setIsOpenApp', true); this.$store.commit('setIsOpenApp', true);
// 判断是否第一次打开App // 判断是否第一次打开App
// let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp'); let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
// this.$store.commit('setFirstOpenApp'); this.$store.commit('setFirstOpenApp');
this.getGuide(0); this.getGuide(0);
this.getGuide(1); this.getGuide(1);
// #endif // #endif

127
CHANGELOG.md
View File

@ -3,6 +3,7 @@
### 🌟 新功能 ### 🌟 新功能
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
<<<<<<< HEAD
- | 表单验证 | [8f3bc1e](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8f3bc1e) - | 表单验证 | [8f3bc1e](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8f3bc1e)
- | 财务条插件的进度条和上方悬浮按钮界面 | [8322e92](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8322e92) - | 财务条插件的进度条和上方悬浮按钮界面 | [8322e92](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8322e92)
财务 | 细节调整；根据任务获取财务条信息 | [414106a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/414106a) 财务 | 细节调整；根据任务获取财务条信息 | [414106a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/414106a)
@ -59,11 +60,73 @@
theme | theme demo | [9175758](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/9175758) theme | theme demo | [9175758](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/9175758)
- | token过期策略 | [8f16ae1](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8f16ae1) - | token过期策略 | [8f16ae1](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8f16ae1)
- | vue3 | [12ed2ad](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/12ed2ad) - | vue3 | [12ed2ad](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/12ed2ad)
=======
- | 表单验证 | [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)
- | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
- | 插件面板分开显示 | [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)
- | 给财务条传参数 | [5ff7706](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ff7706)
- | 给财务条详情页传参 | [fa92a11](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fa92a11)
- | 更新代码 | [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)
- | 缓存改变 | [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)
- | 解决时间轴日常任务不显示问题 | [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)
- | 项目列表 | [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)
>>>>>>> 6e434e6bd9f98841dd37e5e61a9a5dfc216429a5
### 🎨 代码样式 ### 🎨 代码样式
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
<<<<<<< HEAD
- | 插件样式调整 | [7411d3a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/7411d3a) - | 插件样式调整 | [7411d3a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/7411d3a)
- | 更新代码 | [aa6093a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/aa6093a) - | 更新代码 | [aa6093a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/aa6093a)
- | 交付物相关细节调整 | [87ae00d](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/87ae00d) - | 交付物相关细节调整 | [87ae00d](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/87ae00d)
@ -71,11 +134,22 @@
- | 细节调整 | [759ef52](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/759ef52) - | 细节调整 | [759ef52](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/759ef52)
- | 细节调整 | [bdd5f87](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/bdd5f87) - | 细节调整 | [bdd5f87](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/bdd5f87)
- | calender格式及细节调整 | [db9602b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/db9602b) - | calender格式及细节调整 | [db9602b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/db9602b)
=======
- | 插件样式调整 | [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)
- | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
>>>>>>> 6e434e6bd9f98841dd37e5e61a9a5dfc216429a5
### 🐛 Bug 修复 ### 🐛 Bug 修复
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
<<<<<<< HEAD
- | 插件接口修改 | [53c6b90](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/53c6b90) - | 插件接口修改 | [53c6b90](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/53c6b90)
- | 查询插件 | [542d714](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/542d714) - | 查询插件 | [542d714](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/542d714)
- | 登录页验证码获取 | [108e322](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/108e322) - | 登录页验证码获取 | [108e322](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/108e322)
@ -94,6 +168,30 @@
app.vue | 修复获取token报错的问题 | [9120d54](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/9120d54) app.vue | 修复获取token报错的问题 | [9120d54](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/9120d54)
createTask | 修复createTask v-model的问题 | [b20d3f0](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/b20d3f0) createTask | 修复createTask v-model的问题 | [b20d3f0](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/b20d3f0)
- | defineExpose, defineEmits不需要引入 | [902cacc](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/902cacc) - | defineExpose, defineEmits不需要引入 | [902cacc](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/902cacc)
=======
- | 插件接口修改 | [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)
- | 查询查件详情 | [5935a3d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5935a3d)
- | 登录页验证码获取 | [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)
- | 广告页不显示 | [d749dfb](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d749dfb)
- | 获取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)
- | 解决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)
- | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
- | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
- | 项目列表排序 | [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)
>>>>>>> 6e434e6bd9f98841dd37e5e61a9a5dfc216429a5
### 📝 文档 ### 📝 文档
@ -125,6 +223,7 @@
### 🔨 代码重构 ### 🔨 代码重构
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
<<<<<<< HEAD
- | 查看提交历史记录页面数据同步更新 | [749cb10](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/749cb10) - | 查看提交历史记录页面数据同步更新 | [749cb10](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/749cb10)
- | 调整进度条样式 | [b142651](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/b142651) - | 调整进度条样式 | [b142651](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/b142651)
- | 交付物插件代码审查 | [5f4d47b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/5f4d47b) - | 交付物插件代码审查 | [5f4d47b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/5f4d47b)
@ -150,6 +249,34 @@
api | 调整mock api放入mock.js下；main中加入环境变量的判断 | [053ac31](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/053ac31) api | 调整mock api放入mock.js下；main中加入环境变量的判断 | [053ac31](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/053ac31)
- | deliver检查人重构；更新真实数据的检查人 | [ce808c4](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/ce808c4) - | deliver检查人重构；更新真实数据的检查人 | [ce808c4](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/ce808c4)
- | project init 重构 | [2457a87](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/2457a87) - | project init 重构 | [2457a87](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/2457a87)
=======
- | 查看提交历史记录页面数据同步更新 | [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)
- | 交付物代码整理重构 未完 | [d7c6e51](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d7c6e51)
交付物 | 调整交付物细节；完善逻辑 | [25ccd36](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/25ccd36)
- | 审查接口核对完成 | [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)
- | 审核添加交付物名称 | [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)
- | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
- | 细节调整 | [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)
- | 重构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)
>>>>>>> 6e434e6bd9f98841dd37e5e61a9a5dfc216429a5
### 🚀 性能优化 ### 🚀 性能优化

4
apis/plugin.js
View File

@ -2,7 +2,7 @@ import Config from '@/common/js/config.js';
import { computed } from 'vue'; import { computed } from 'vue';
import store from '@/store/index.js'; import store from '@/store/index.js';
const { apiUrl } = Config.apiUrl; const { apiUrl } = Config;
// const defaultwbs = `${apiUrl}/defaultwbs`; // const defaultwbs = `${apiUrl}/defaultwbs`;
const domain = computed(() => store.state.domain); const domain = computed(() => store.state.domain);
console.log('domain: ', domain.value); console.log('domain: ', domain.value);
@ -12,7 +12,7 @@ export function setupPlugin(app) {
// 获取插件信息 // 获取插件信息
// uni.$u.api.getOtherPlugin = param => // uni.$u.api.getOtherPlugin = param =>
// uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); // 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); uni.$u.api.findSonTask = param => uni.$u.post(`${domain.value}/task/findSonTask`, param);

9
components/Adv/Adv.vue
View File

@ -10,7 +10,7 @@
<image v-else src="/static/adv.jpg"></image> <image v-else src="/static/adv.jpg"></image>
<view class="time-box absolute">{{ time }} 跳过</view> <view class="time-box absolute" @click="toIndex">{{ time }} 跳过</view>
</view> </view>
</template> </template>
@ -43,6 +43,11 @@
} }
}, 1000); }, 1000);
function toIndex() {
uni.$storage.setStorageSync('isOpenApp', false);
store.commit('setIsOpenApp', false);
}
// setTimeout(() => { // setTimeout(() => {
// // 判断是否第一次打开App // // 判断是否第一次打开App
// let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp'); // let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp');
@ -64,7 +69,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.adv-box { .adv-box {
width: 100%; width: 100%;
height: 100%; height: calc(100vh - var(--status-bar-height));
image { image {
width: 100%; width: 100%;

20
components/Globals/Globals.vue
View File

@ -14,6 +14,14 @@
<skeleton :banner="false" :loading="showGlobalSkeleton" :row="3" animate class="u-line-2 skeleton"></skeleton> <skeleton :banner="false" :loading="showGlobalSkeleton" :row="3" animate class="u-line-2 skeleton"></skeleton>
<view class="grid"> <view class="grid">
<view
class="py-3 u-font-14 rounded-md bg-white"
style="height: 100%"
v-if="visibleRoles[roleIndex] && visibleRoles[roleIndex].name === '我'"
>
<button class="text-xs bg-blue-500 text-white leading-6" style="width: 500rpx" @click="toWorkbench">工作台</button>
</view>
<template v-for="item in globals" :key="item.id"> <template v-for="item in globals" :key="item.id">
<template v-if="item.plugins && item.plugins.length"> <template v-if="item.plugins && item.plugins.length">
<view v-for="(pluginArr, i) in item.plugins" :key="i" class="pb-3"> <view v-for="(pluginArr, i) in item.plugins" :key="i" class="pb-3">
@ -23,6 +31,7 @@
:task="item" :task="item"
:key="plugin.pluginTaskId" :key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId" :plugin-task-id="plugin.pluginTaskId"
:business-plugin-id="plugin.businessPluginId"
:plugin-id="plugin.pluginId" :plugin-id="plugin.pluginId"
:param="plugin.param" :param="plugin.param"
:style-type="plugin.styleType || 0" :style-type="plugin.styleType || 0"
@ -61,12 +70,23 @@ const store = useStore();
const isShrink = computed(() => store.state.task.isShrink); // 全局任务是否收缩 const isShrink = computed(() => store.state.task.isShrink); // 全局任务是否收缩
const showGlobalSkeleton = computed(() => store.state.task.showGlobalSkeleton); // 全局任务骨架屏 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() { function openCard() {
if (isShrink.value) { if (isShrink.value) {
store.commit('task/setShrink', false); store.commit('task/setShrink', false);
} }
} }
// 跳转工作台
function toWorkbench() {
uni.navigateTo({
url: '/pages/workbench/workbench',
});
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

12
components/Plugin/Plugin.vue
View File

@ -24,8 +24,15 @@
<p-finance v-else-if="pluginId === '18'" class="p-2" /> <p-finance v-else-if="pluginId === '18'" class="p-2" />
<!-- TODO:需要新的id绑定 个人和终端按钮--> <!-- TODO:需要新的id绑定 个人和终端按钮-->
<!-- <p-account-management /> --> <!-- <p-account-management /> -->
<Render
<Render v-else :task="task" :pluginId="pluginId" :styleType="styleType" :pluginTaskId="pluginTaskId" :param="param" /> v-else
:task="task"
:pluginId="pluginId"
:styleType="styleType"
:pluginTaskId="pluginTaskId"
:businessPluginId="businessPluginId"
:param="param"
/>
</view> </view>
</template> </template>
@ -38,6 +45,7 @@ const props = defineProps({
pluginId: { default: '1', type: String }, pluginId: { default: '1', type: String },
styleType: { default: 0, type: Number }, styleType: { default: 0, type: Number },
pluginTaskId: { default: '', type: String }, pluginTaskId: { default: '', type: String },
businessPluginId: { default: '', type: String },
param: { type: String, default: '' }, param: { type: String, default: '' },
}); });

24
components/PrettyExchange/PrettyExchange.vue
View File

@ -14,6 +14,7 @@
</view> </view>
</view> </view>
<!-- 点击排序之后的效果 -->
<view v-else> <view v-else>
<view <view
:id="'cu-' + index" :id="'cu-' + index"
@ -48,6 +49,8 @@
</view> </view>
</view> </view>
<view class="workbench-btn" v-if="index === 0" @click="toWorkbench">工作台</view>
<!-- 箭头 --> <!-- 箭头 -->
<view v-if="item.sonProjectList && item.sonProjectList.length"> <view v-if="item.sonProjectList && item.sonProjectList.length">
<u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon> <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
@ -484,6 +487,13 @@
}, },
}); });
} }
// 跳转工作台
function toWorkbench() {
uni.navigateTo({
url: '/pages/workbench/workbench'
})
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -504,4 +514,18 @@
height: 2px; height: 2px;
margin-left: 30px; margin-left: 30px;
} }
.workbench-btn {
margin-right: 10px;
width: 80px;
height: 36px;
line-height: 36px;
border-radius: 18px;
overflow: hidden;
border: 1px solid #2B85E4;
background-color: #1890FF;
font-size: 12px;
color: #FFFFFF;
text-align: center;
}
</style> </style>

27
components/Projects/ProjectItem.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="w-full"> <view class="w-full">
<!-- 有子项目 --> <!-- 有子项目 父项目 -->
<view class="flex items-center justify-between p-3"> <view class="flex items-center justify-between p-3">
<u-icon @click="openMenu(item)" class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon> <u-icon @click="openMenu(item)" class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon>
@ -18,6 +18,8 @@
</view> </view>
</view> </view>
<view class="workbench-btn" v-if="index === 0" @click="toWorkbench">工作台</view>
<!-- 箭头 --> <!-- 箭头 -->
<view v-if="item.sonProjectList && item.sonProjectList.length"> <view v-if="item.sonProjectList && item.sonProjectList.length">
<u-icon @click="emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon> <u-icon @click="emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
@ -26,7 +28,7 @@
<u-icon @click="openProject(item)" class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon> <u-icon @click="openProject(item)" class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon>
</view> </view>
<!-- 有子项目 --> <!-- 子项目 -->
<view class="ml-8" v-if="item.show"> <view class="ml-8" v-if="item.show">
<view :id="'cu-' + index + '-' + subIndex" :key="subIndex" class="cu-item flex-col" v-for="(subItem, subIndex) in item.sonProjectList"> <view :id="'cu-' + index + '-' + subIndex" :key="subIndex" class="cu-item flex-col" v-for="(subItem, subIndex) in item.sonProjectList">
<!-- <view :key="subItem.id" v-for="subItem in item.sonProjectList"> --> <!-- <view :key="subItem.id" v-for="subItem in item.sonProjectList"> -->
@ -100,6 +102,13 @@ const data = reactive({
projectId: 0, projectId: 0,
}); });
// 跳转工作台
function toWorkbench() {
uni.navigateTo({
url: '/pages/workbench/workbench'
});
}
// 打开项目详情 // 打开项目详情
function openProject(project) { function openProject(project) {
const { name, id, url } = project; const { name, id, url } = project;
@ -128,4 +137,18 @@ function openMenu(project) {
height: 4rpx; height: 4rpx;
margin: 0 20rpx 0 90rpx; margin: 0 20rpx 0 90rpx;
} }
.workbench-btn {
margin-right: 10px;
width: 80px;
height: 36px;
line-height: 36px;
border-radius: 18px;
overflow: hidden;
border: 1px solid #2B85E4;
background-color: #1890FF;
font-size: 12px;
color: #FFFFFF;
text-align: center;
}
</style> </style>

3
components/Render/Render.vue
View File

@ -49,6 +49,7 @@ defineProps({
pluginId: { default: '1', type: String }, pluginId: { default: '1', type: String },
styleType: { default: 0, type: Number }, styleType: { default: 0, type: Number },
pluginTaskId: { default: '', type: String }, pluginTaskId: { default: '', type: String },
businessPluginId: { default: '', type: String },
param: { type: String, default: '' }, param: { type: String, default: '' },
}); });
@ -80,7 +81,7 @@ export default {
methods: { methods: {
// 获取插件信息 // 获取插件信息
async getPlugin() { async getPlugin() {
const params = { pluginId: this.pluginId, styleType: this.styleType }; const params = { businessPluginId: this.businessPluginId };
this.$catchReq.getOtherPlugin(params, (err, res) => { this.$catchReq.getOtherPlugin(params, (err, res) => {
if (err) { if (err) {
console.error('err: ', err); console.error('err: ', err);

1
components/TimeLine/component/TimeBox.vue
View File

@ -39,6 +39,7 @@
:task="task" :task="task"
:key="plugin.pluginTaskId" :key="plugin.pluginTaskId"
:plugin-task-id="plugin.pluginTaskId" :plugin-task-id="plugin.pluginTaskId"
:business-plugin-id="plugin.businessPluginId"
:plugin-id="plugin.pluginId" :plugin-id="plugin.pluginId"
:param="plugin.param" :param="plugin.param"
:style-type="data.styleType || 0" :style-type="data.styleType || 0"

17
hooks/project/useGenerateWebviewParam.js
View File

@ -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,
};
}

3
hooks/project/useInit.js
View File

@ -53,7 +53,6 @@ export default function useInit() {
} else { } else {
store.commit('role/setInvisibleRoles', data ? data.invisibleList : []); store.commit('role/setInvisibleRoles', data ? data.invisibleList : []);
store.commit('role/setVisibleRoles', data ? data.visibleList : []); store.commit('role/setVisibleRoles', data ? data.visibleList : []);
console.log('222222')
setInitialRoleId(data ? data.visibleList : []); setInitialRoleId(data ? data.visibleList : []);
setAllTasksByRoles(data ? data.visibleList : []); setAllTasksByRoles(data ? data.visibleList : []);
} }
@ -68,7 +67,7 @@ export default function useInit() {
const storageRoleId = uni.$storage.getStorageSync('roleId'); const storageRoleId = uni.$storage.getStorageSync('roleId');
const currentRoleId = storageRoleId || (currentRole ? currentRole.id : ''); const currentRoleId = storageRoleId || (currentRole ? currentRole.id : '');
store.commit('role/setRoleId', currentRoleId); store.commit('role/setRoleId', currentRoleId);
console.log('11111111') store.commit('role/setRoleIndex', index);
// 清空storage // 清空storage
uni.$storage.setStorageSync('roleId', ''); uni.$storage.setStorageSync('roleId', '');
} }

16
pages.json
View File

@ -1,21 +1,5 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
// #ifdef APP-PLUS
{
"path": "pages/guide/adv",
"style": {
"navigationBarText": "TALL",
"navigationStyle": "custom"
}
},
{
"path": "pages/guide/guide",
"style": {
"navigationBarText": "TALL",
"navigationStyle": "custom"
}
},
// #endif
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {

14
pages/index/index.vue
View File

@ -6,14 +6,19 @@
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<!-- 广告 --> <!-- 广告 -->
<!-- <Adv v-if="isOpenApp"></Adv> --> <Adv v-if="isOpenApp"></Adv>
<!-- 引导页 --> <!-- 引导页 -->
<!-- <Guide v-else-if="!firstOpenApp"></Guide> --> <Guide v-else-if="!firstOpenApp"></Guide>
<!-- #endif --> <!-- #endif -->
<!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> --> <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
<!-- #ifdef APP-PLUS -->
<theme v-if="!isOpenApp && firstOpenApp" class="relative flex flex-col h-full bg-gray-50">
<!-- #endif -->
<!-- #ifdef H5 -->
<theme class="relative flex flex-col h-full bg-gray-50"> <theme class="relative flex flex-col h-full bg-gray-50">
<!-- #endif -->
<view class="relative"> <view class="relative">
<!-- <view class="relative" @touchmove="onMove"> --> <!-- <view class="relative" @touchmove="onMove"> -->
<!-- 日历 --> <!-- 日历 -->
@ -45,8 +50,8 @@
const store = useStore(); const store = useStore();
const token = computed(() => store.state.user.token); const token = computed(() => store.state.user.token);
const uTips = ref(null); const uTips = ref(null);
// const firstOpenApp = computed(() => store.state.firstOpenApp); const firstOpenApp = computed(() => store.state.firstOpenApp); // 是否第一次打开APP false 是第一次 true不是
// const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP true 是 false 不是
const userInfo = computed(() => store.state.user.user); const userInfo = computed(() => store.state.user.user);
const data = reactive({ const data = reactive({
@ -139,7 +144,6 @@
// } // }
function toLogin() { function toLogin() {
console.log(11)
if (!userInfo.value) { if (!userInfo.value) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/user/login' url: '/pages/user/login'

8
pages/project/project.vue
View File

@ -68,7 +68,7 @@ onMounted(() => {
watch(roleId, newValue => { watch(roleId, newValue => {
if (newValue) { if (newValue) {
// 判断如果allTasks里有就不用加了 // 判断如果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); console.log('当角色发生变化时', newValue);
store.commit('task/setTimeNode', Date.now()); store.commit('task/setTimeNode', Date.now());
@ -189,10 +189,12 @@ function setScrollPosition() {
store.commit('task/setScrollToTaskId', `a${taskId}`); store.commit('task/setScrollToTaskId', `a${taskId}`);
uni.$storage.setStorageSync('taskId', ''); // 记录后即刻清除本地存储 uni.$storage.setStorageSync('taskId', ''); // 记录后即刻清除本地存储
} else { } else {
if (allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length) { if (allTasks.value[roleIndex.value]) {
} else { if (!(allTasks.value[roleIndex.value].task && allTasks.value[roleIndex.value].task.length)) {
allTasks.value[roleIndex.value].task = []; allTasks.value[roleIndex.value].task = [];
} }
}
const item = allTasks.value[roleIndex.value].task.find(task => task.detailId); const item = allTasks.value[roleIndex.value].task.find(task => task.detailId);
if (item) { if (item) {

2
pages/workbench/workbench.vue
View File

@ -8,7 +8,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
image { image {
width: 100%; width: 100%;
height: 100%; height: calc(100vh - var(--status-bar-height));
object-fit: cover; object-fit: cover;
} }
</style> </style>

2
plugins/p-deliver-check/p-deliver-check.vue
View File

@ -4,7 +4,7 @@
<view class="flex justify-between" @click="collapsed = !collapsed"> <view class="flex justify-between" @click="collapsed = !collapsed">
<!-- {{ deliverData ? deliverData.deliverName : '' }} --> <!-- {{ deliverData ? deliverData.deliverName : '' }} -->
<text> 审核状态 </text> <text> {{ deliverData ? deliverData.deliverName : '' }} 审核状态 </text>
<!-- 展开折叠按钮 --> <!-- 展开折叠按钮 -->
<u-icon :name="collapsed ? 'arrow-up' : 'arrow-down'"></u-icon> <u-icon :name="collapsed ? 'arrow-up' : 'arrow-down'"></u-icon>
</view> </view>

16
plugins/p-finance-audit/p-finance-audit.vue
View File

@ -6,9 +6,23 @@
</template> </template>
<script setup> <script setup>
import { inject } from 'vue';
import useGenerateWebviewParam from '@/hooks/project/useGenerateWebviewParam';
const task = inject('task');
const { projectId, projectName, token } = useGenerateWebviewParam();
// DEBUG:打开财务审批详情页 // DEBUG:打开财务审批详情页
function openAudit() { function openAudit() {
uni.$ui.openDetail({ url: 'https://www.taobao.com', name: '财务审批' }); uni.$ui.openDetail({
url: 'https://www.tall.wiki/finance/index',
name: '财务审批',
token,
projectId,
id: task.id,
pn: projectName,
tn: task.name,
});
} }
// DEBUG:打开财务统计详情页 // DEBUG:打开财务统计详情页

16
plugins/p-source-manage/p-source-manage.vue
View File

@ -4,8 +4,22 @@
</template> </template>
<script setup> <script setup>
import { inject } from 'vue';
import useGenerateWebviewParam from '@/hooks/project/useGenerateWebviewParam';
const task = inject('task');
const { projectId, projectName, token } = useGenerateWebviewParam();
function openSourceManage() { function openSourceManage() {
// DEBUG: 假数据 换成财务条 资源管理的地址 // DEBUG: 假数据 换成财务条 资源管理的地址
uni.$ui.openDetail({ url: 'http://m.jd.com', name: '资源管理' }); uni.$ui.openDetail({
url: 'https://www.tall.wiki/finance/index',
name: '资源管理',
token,
projectId,
id: task.value.id,
pn: projectName,
tn: task.value.name,
});
} }
</script> </script>

5
store/project/getters.js
View File

@ -6,6 +6,11 @@ const getters = {
projectId({ project }) { projectId({ project }) {
return project.id; return project.id;
}, },
// 项目名称
projectName({ project }) {
return project && project.name ? project.name : '';
},
}; };
export default getters; export default getters;

Write Preview
Loading…
Cancel
Save