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

4 years ago · eca7204a42
12 changed files with 233 additions and 61 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,7 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
+<<<<<<< HEAD
 - | 表单验证 | [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)
 财务 | 细节调整；根据任务获取财务条信息 | [414106a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/414106a)
@ -63,11 +64,76 @@
 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)
 - | 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)
+ - | 工作台按钮 | [6e434e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6e434e6)
+ - | 工作台功能 | [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)
+ - | 跳转财务详情 | [742720d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/742720d)
+ - | 未登录调用项目列表接口 | [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)
+ - | 小绿点隐藏 | [31f3dc7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/31f3dc7)
+ - | 引导页、广告页 | [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)
+>>>>>>> 83a14c40b72a78bb000ec18cf86ccc6faad98da2


 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+<<<<<<< HEAD
 - | 插件样式调整 | [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)
 - | 交付物相关细节调整 | [87ae00d](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/87ae00d)
@ -76,11 +142,22 @@
 - | 细节调整 | [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)
 - | 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)
+>>>>>>> 83a14c40b72a78bb000ec18cf86ccc6faad98da2


 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+<<<<<<< HEAD
 - | 插件接口修改 | [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)
 - | 查询查件详情 | [5935a3d](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/5935a3d)
@ -103,37 +180,62 @@
 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)
 - | 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)
+>>>>>>> 83a14c40b72a78bb000ec18cf86ccc6faad98da2


 ### 📝 文档
 范围|描述|commitId
 --|--|--
- - | 添加交付物http测试文件 | [0b7e6ab](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/0b7e6ab)
- - | deliver http 文件更新 | [568115c](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/568115c)
+ - | 添加交付物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)


 ### 📦 持续集成
 范围|描述|commitId
 --|--|--
- - | 测试ci | [6ab95f8](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/6ab95f8)
- - | 测试ci' | [d25f2a7](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/d25f2a7)
- - | 更新drone.yml | [63ec5a3](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/63ec5a3)
- - | 更新drone.yml | [a57d598](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/a57d598)
- - | 添加drone.yml | [9fbae89](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/9fbae89)
- - | 修改.drone.yml | [f5b52e3](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/f5b52e3)
- - | ci update | [d38262e](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/d38262e)
- - | drone | [8cddc7b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/8cddc7b)
+ - | 测试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 | [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)
+ - | 添加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)


 ### 🔧 测试
 范围|描述|commitId
 --|--|--
- - | 手机号登录 | [5ede115](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/5ede115)
+ - | 手机号登录 | [5ede115](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ede115)


 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+<<<<<<< HEAD
 - | 查看提交历史记录页面数据同步更新 | [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)
 - | 个人终端和ui配置插件 ，域资源管理插件，版本管理插件 | [c3caad0](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/c3caad0)
@ -161,21 +263,51 @@
 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)
 - | 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)
+ - | 个人终端和ui配置插件 ，域资源管理插件，版本管理插件 | [c3caad0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c3caad0)
+ - | 交付物插件代码审查 | [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)
+ - | 修改看财务条api地址 | [dc9fcc9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dc9fcc9)
+ - | 隐藏项目详情页缓存 | [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)
+>>>>>>> 83a14c40b72a78bb000ec18cf86ccc6faad98da2


 ### 🚀 性能优化
 范围|描述|commitId
 --|--|--
- - | 更新代码 | [0dd443b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/0dd443b)
+ - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b)


 ### chore
 范围|描述|commitId
 --|--|--
- - | editorconfig update | [0c08089](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/0c08089)
+ - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089)


 范围|描述|commitId
 --|--|--
- - | Initial commit | [52b8f49](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/52b8f49)
+ - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)

--- a/apis/finance.js
+++ b/apis/finance.js
@ -1,10 +1,12 @@
+import { computed } from 'vue';
 import store from '@/store/index';

-const fullPath = store.getters['finance/fullPath'];
-console.log('fullPath: ', fullPath);
+// const fullPath = store.getters['finance/fullPath'];
+// console.log('fullPath: ', fullPath);
+const domain = computed(() => store.state.domain);

 export function setupFinance(app) {
  uni.$u.api = { ...uni.$u.api } || {};
  // 根据任务id获取财务条信息
-  uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${fullPath}/getByTask`, { taskDetailId });
+  uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${domain.value}/finance/getByTask`, { taskDetailId });
 }
--- a/components/Calendar/Calendar.vue
+++ b/components/Calendar/Calendar.vue
@ -100,7 +100,7 @@ const props = defineProps({
  },
 });

-const emit = defineEmits(['handleFindPoint', 'handleFindPoint', 'days-change', 'selected-change']);
+const emit = defineEmits(['handleFindPoint', 'days-change', 'selected-change']);

 const data = reactive({
  weeks: ['日', '一', '二', '三', '四', '五', '六'], // 周
--- a/components/Upload/Upload.vue
+++ b/components/Upload/Upload.vue
@ -1,18 +1,17 @@
 <template>
  <view class="upload">
-    <u-icon name="plus" size="24px" class="flex justify-center w-12 h-12 bg-blue-100 rounded-full shadow-md"
-      @click="handleUpload"></u-icon>
+    <u-icon 
+      name="plus" 
+      size="24px" 
+      class="flex justify-center w-12 h-12 bg-blue-100 rounded-full shadow-md"
+      @click="handleUpload"
+    ></u-icon>
  </view>
 </template>

 <script setup>
-  import {
-    computed,
-    ref
-  } from 'vue';
-  import {
-    useStore
-  } from 'vuex';
+  import { computed, ref } from 'vue';
+  import { useStore } from 'vuex';
  import Config from '@/common/js/config.js';

  const emit = defineEmits(['success', 'error']);
@ -25,6 +24,11 @@

  // 导入wbs
  const handleUpload = async cur => {
+    // #ifdef APP-PLUS
+    uni.$ui.showToast('APP暂不支持导入');
+    // #endif
+
+    // #ifndef APP-PLUS
    if (list.value.length === 1) {
      store.commit('setDomain', list.value[0].url);

@ -35,7 +39,6 @@
          if (confirm) {
            try {
              const res = await uni.$u.api.import();
-              console.log('2222', res)
              // 导入WBS成功后
              // 直接打开导入的项目
              // emit('success');
@ -57,6 +60,7 @@
        url: '/pages/business/business'
      })
    }
+    // #endif
  };

  async function getList() {
--- a/manifest.json
+++ b/manifest.json
@ -79,13 +79,29 @@
                }
            },
            "splashscreen" : {
-                "androidStyle" : "common"
+                "androidStyle" : "default"
            }
        },
        "safearea" : {
            "bottom" : {
                "offset" : "none"
            }
+        },
+        "nativePlugins" : {
+            "GuoWei-SelectFileModule" : {
+                "__plugin_info__" : {
+                    "name" : "Android文件选择 - [试用版，仅用于自定义调试基座]",
+                    "description" : "目录方式，选择Android手机储存文件，支持多选、过滤",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4607",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "4607",
+                    "parameters" : {}
+                }
+            }
        }
    },
    /* 快应用特有相关 */
--- a/pages/detailWebview/detailWebview.vue
+++ b/pages/detailWebview/detailWebview.vue
@ -14,12 +14,11 @@ onLoad(options => {
    return;
  }
  if (options.url) {
+    console.log('options.url', options.url);
    src.value = options.url;
  }
  if (options.name) {
-    uni.setNavigationBarTitle({
-      title: options.name || '详情页',
-    });
+    uni.setNavigationBarTitle({ title: options.name || '详情页' });
  }
 });
 </script>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -22,7 +22,8 @@
    <view class="relative">
      <!-- <view class="relative" @touchmove="onMove"> -->
      <!-- 日历 -->
-      <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+      <!-- <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" /> -->
+      <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" />

      <!-- 上传 导入wbs -->
      <Upload @success="onUploadSuccess" @error="onUploadError" />
@ -30,7 +31,7 @@

    <view class="login-box absolute" @click="toLogin">
      <text v-if="!userInfo">游客</text>
-      <image v-else src="../../static/headimg.png" mode=""></image>
+      <image v-else src="../../static/headimg4.png" mode=""></image>
    </view>
    <!-- <u-button class="mt-4" @click="toLogin">登录</u-button> -->

@ -60,7 +61,7 @@
  });

  getProjects();
-  handleFindPoint();
+  // handleFindPoint();

  // 监听token
  watchEffect(() => {
@ -89,16 +90,17 @@
    });
  }

-  async function handleFindPoint(start, end) {
-    try {
-      const startTime = start || dayjs().startOf('month').valueOf();
-      const endTime = end || dayjs().endOf('month').valueOf();
-      const res = await uni.$u.api.findRedPoint(startTime, endTime);
-      store.commit('project/setDotList', res);
-    } catch (error) {
-      console.log('error: ', error);
-    }
-  }
+  // 小红点
+  // async function handleFindPoint(start, end) {
+  //   try {
+  //     const startTime = start || dayjs().startOf('month').valueOf();
+  //     const endTime = end || dayjs().endOf('month').valueOf();
+  //     const res = await uni.$u.api.findRedPoint(startTime, endTime);
+  //     store.commit('project/setDotList', res);
+  //   } catch (error) {
+  //     console.log('error: ', error);
+  //   }
+  // }

  // 点击了某个日期
  const onDateChange = event => {
@ -148,6 +150,29 @@
      uni.navigateTo({
        url: '/pages/user/login'
      });
+    } else {
+      uni.showModal({
+        content: '是否退出登录',
+        success: ({ confirm }) => {
+          if (confirm) {
+            signout();
+          }
+        }
+      })
+    }
+  }
+
+  /**
+   * 退出登录
+   */
+  function signout() {
+    try {
+      store.commit('user/setToken', '');
+      store.commit('user/setUser', '');
+      uni.$storage.setStorageSync('anyringToken', '');
+      uni.$storage.setStorageSync('user', '');
+    } catch (e) {
+      //TODO handle the exception
    }
  }
 </script>
@ -186,15 +211,19 @@
    display: flex;
    justify-content: center;
    align-items: center;
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
    border-radius: 50%;
    background-color: #eeeeee;
    text-align: center;
-    line-height: 50px;
+    line-height: 40px;
    border: 1px solid #ddd;
    overflow: hidden;

+    text {
+      font-size: 12px;
+    }
+
    image {
      display: inline-block;
      width: 40px;
--- a/plugins/p-finance-audit/p-finance-audit.vue
+++ b/plugins/p-finance-audit/p-finance-audit.vue
@ -14,19 +14,11 @@ const { projectId, projectName, token } = useGenerateWebviewParam();

 // DEBUG:打开财务审批详情页
 function openAudit() {
-  uni.$ui.openDetail({
-    url: 'https://www.tall.wiki/finance/index',
-    name: '财务审批',
-    token,
-    projectId,
-    id: task.id,
-    pn: projectName,
-    tn: task.name,
-  });
+  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
 }

 // DEBUG:打开财务统计详情页
 function openStatistical() {
-  uni.$ui.openDetail({ url: 'https://www.taobao.com', name: '财务统计' });
+  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
 }
 </script>
--- a/plugins/p-finance/p-finance.vue
+++ b/plugins/p-finance/p-finance.vue
@ -37,7 +37,6 @@ const data = ref(null);
 // 查询任务上的财务条数据
 async function getFinanceByTaskData() {
  try {
-    console.log('task: ', task);
    const detailId = task.detailId;
    data.value = await uni.$u.api.getFinanceByTask(detailId);
  } catch (error) {
--- a/static/headimg.png
+++ b/static/headimg.png
--- a/static/headimg4.png
+++ b/static/headimg4.png
--- a/utils/ui.js
+++ b/utils/ui.js
@ -67,7 +67,6 @@ export default {
      throw new Error('缺少url参数');
    }
    const query = stringify(options);
-    console.log('query: ', query);
    const path = `/pages/detailWebview/detailWebview?${query}`;
    uni.navigateTo({ url: path });
  },