From 0b7e6ab93c87b3e797cde26dda4ccf13c0ffc16a Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 17 Jan 2022 15:51:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=E4=BA=A4?= =?UTF-8?q?=E4=BB=98=E7=89=A9http=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 55 +++++++++++------------ rest/deliver.http | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 27 deletions(-) create mode 100644 rest/deliver.http diff --git a/CHANGELOG.md b/CHANGELOG.md index dc1fd8d..b5e38bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,73 +3,74 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) + - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) + - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) + 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) + - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) + - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 手机号登录 | [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) - | 插件的填写与提交，修改与删除 | [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) - - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) - - | 日历页首页 | [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) + - | 日历页首页 | [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) - | 时间轴页面 | [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) - - | 手机号登录 | [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) + - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) + - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) + - | 账户名密码登录 | [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) - - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) - - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) - - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) - 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) - - | 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 --|--|-- + - | 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) - | 细节调整 | [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) - - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) - - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) - - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) - - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) 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) + - | 修复一些内容 | [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) + - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) + - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) + - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) ### 📦 持续集成 范围|描述|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) ### 🔨 代码重构 范围|描述|commitId --|--|-- + - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b) - - | 项目列表 | [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) - | 原有功能提交别的分支 | [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) - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) - - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) + - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) ### 🚀 性能优化 diff --git a/rest/deliver.http b/rest/deliver.http new file mode 100644 index 0000000..7da368c --- /dev/null +++ b/rest/deliver.http @@ -0,0 +1,109 @@ +@url=https://test.tall.wiki/gateway/defaultwbs +@type=content-type: application/json +@token=eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2NDIzODg5NjMsInN1YiI6IjEyMTc2NDc2ODY1OTgxMzU4MDgiLCJhdXRoSWQiOiIxMTc3MTU4ODQ4ODg1MTY2MDgwIiwiZXhwIjoxNjQyNDc1MzYzfQ.3rZu2gphjGZC9bod_jGxt0RC-DOTPZScN6tdYJPlTxg + +### login +# @name login +POST https://test.tall.wiki/gateway/tall3/v3.0/users/signin +{{type}} + +{ + "client": 1, + "data": { + "credential": "123456", + "identifier": "zy11" + }, + "type": 3 +} + +### 查看检查记录 +POST {{url}}/deliver/queryCheckLog +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "deliverRecordId": "1482980930758123520" + } +} + + +### 查看交付物提交历史 +POST {{url}}/deliver/queryRecord +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "deliverId": "1482975132598411264" + } +} + +### 检查交付物 +POST {{url}}/deliver/checkDeliver +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "deliverRecordId": "1482980930758123520", + "projectId": "1418109550141382656", + "type": "2", + "remark": "我后悔了", + "score": "10.2" + } +} + +### 提交交付物信息 +POST {{url}}/deliver/submitDeliver +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "projectId": "1418109550141382656", + "deliverId": "1482975132598411264", + "fileList": [ + "asdasd" + ], + "checkerList":[ + "1418109552909623296", + "1418109555648503808" + ] + } +} + +### 查询交付物 +POST {{url}}/deliver/getDeliver +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "taskId": "1418109566541111296" + } +} + +### 修改编辑交付物名称 +POST {{url}}/deliver/saveDeliver +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "projectId": "1418109550141382656", + "taskId": "1418109566541111296", + "deliverName":"测试交付物1" + } +} + +### 查看成员 +POST {{url}}/deliver/queryChecker +{{type}} +Authorization: Bearer {{token}} + +{ + "param":{ + "projectId": "1418109550141382656" + } +} From 568115cda7f03c51f658d0a3028cbad0d5ee12ad Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 17 Jan 2022 15:55:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?docs:=20deliver=20http=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ rest/deliver.http | 49 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e38bc..fff1944 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,12 @@ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) +### 📝 文档 +范围|描述|commitId +--|--|-- + - | 添加交付物http测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab) + + ### 📦 持续集成 范围|描述|commitId --|--|-- diff --git a/rest/deliver.http b/rest/deliver.http index 7da368c..c263485 100644 --- a/rest/deliver.http +++ b/rest/deliver.http @@ -16,41 +16,38 @@ POST https://test.tall.wiki/gateway/tall3/v3.0/users/signin "type": 3 } -### 查看检查记录 -POST {{url}}/deliver/queryCheckLog +### 查看成员 +POST {{url}}/deliver/queryChecker {{type}} Authorization: Bearer {{token}} { "param":{ - "deliverRecordId": "1482980930758123520" + "projectId": "1418109550141382656" } } - -### 查看交付物提交历史 -POST {{url}}/deliver/queryRecord +### 修改编辑交付物名称 +POST {{url}}/deliver/saveDeliver {{type}} Authorization: Bearer {{token}} { "param":{ - "deliverId": "1482975132598411264" + "projectId": "1418109550141382656", + "taskId": "1418109566541111296", + "deliverName":"测试交付物1" } } -### 检查交付物 -POST {{url}}/deliver/checkDeliver +### 查询交付物 +POST {{url}}/deliver/getDeliver {{type}} Authorization: Bearer {{token}} { "param":{ - "deliverRecordId": "1482980930758123520", - "projectId": "1418109550141382656", - "type": "2", - "remark": "我后悔了", - "score": "10.2" + "taskId": "1418109566541111296" } } @@ -73,37 +70,39 @@ Authorization: Bearer {{token}} } } -### 查询交付物 -POST {{url}}/deliver/getDeliver +### 检查交付物 +POST {{url}}/deliver/checkDeliver {{type}} Authorization: Bearer {{token}} { "param":{ - "taskId": "1418109566541111296" + "deliverRecordId": "1482980930758123520", + "projectId": "1418109550141382656", + "type": "2", + "remark": "我后悔了", + "score": "10.2" } } -### 修改编辑交付物名称 -POST {{url}}/deliver/saveDeliver +### 查看交付物提交历史 +POST {{url}}/deliver/queryRecord {{type}} Authorization: Bearer {{token}} { "param":{ - "projectId": "1418109550141382656", - "taskId": "1418109566541111296", - "deliverName":"测试交付物1" + "deliverId": "1482975132598411264" } } -### 查看成员 -POST {{url}}/deliver/queryChecker +### 查看检查记录 +POST {{url}}/deliver/queryCheckLog {{type}} Authorization: Bearer {{token}} { "param":{ - "projectId": "1418109550141382656" + "deliverRecordId": "1482980930758123520" } } From 5ae68e2ac8215a85885453cb2cfd4fdbf68f1795 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 17 Jan 2022 16:41:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E4=BA=A4?= =?UTF-8?q?=E4=BB=98=E7=89=A9=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 ++ plugins/p-deliver/p-deliver.vue | 27 +++++++++++++++++++-------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fff1944..253ef14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ ### 📝 文档 范围|描述|commitId --|--|-- + - | 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) diff --git a/apis/plugin.js b/apis/plugin.js index 61267de..a3616b5 100644 --- a/apis/plugin.js +++ b/apis/plugin.js @@ -19,4 +19,6 @@ export function setupPlugin(app) { uni.$u.api.queryDeliverOfTask = param => uni.$u.post(`${defaultwbs}/deliver/queryDeliverOfTask`, param); // 检查交付物 uni.$u.api.checkDeliver = param => uni.$u.post(`${defaultwbs}/deliver/checkDeliver`, param); + // 根据任务id获取任务的交付物信息 + uni.$u.api.getDeliverByTaskId = param => uni.$u.post(`${defaultwbs}/deliver/getDeliver`, param); } diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index f9520e8..ad66c54 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -8,9 +8,9 @@ - + - {{ task.name }} + {{ deliver.deliverName }} @@ -66,8 +66,8 @@