From 880cf7c053c7df6f3a24ac96842e130e6895ed48 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 17 Jan 2022 21:50:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dp-deliver=E6=8A=A5?= =?UTF-8?q?=E9=94=99taskRef=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 63 +++++++++++++++++---------------- plugins/p-deliver/p-deliver.vue | 2 +- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73aa586..278b335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,83 +3,84 @@ ### 🌟 新功能 范围|描述|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) + - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f) + - | 手机号登录 | [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) - - | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2) - - | 日历页首页 | [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) - - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f) + - | 日历页首页 | [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) + - | 获取交付物信息 | [5ae68e2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ae68e2) + - | 表单验证 | [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 --|--|-- - - | 添加交付物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) ### 🔨 代码重构 范围|描述|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) - - | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15) - - | 项目列表 | [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) + - | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f) - | 重构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/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index 49b013e..d28c05b 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -77,7 +77,7 @@ const deliverRef = ref(true); // 交付物插件的显示与销毁 const linkValue = ref(''); // 链接的值 const showMask = ref(false); // 编辑和删除页面 const showEditModal = ref(false); // 编辑交付物标题的modal -const newInputRef = ref(taskRef.task.name); // 修改的插件名的值 +const newInputRef = ref(props.task.name); // 修改的插件名的值 const showDeleteModal = ref(false); // 删除二次提示的modal const content = '是否确定删除'; const uBadgeShow = ref(false); // u-badge的显示与隐藏 From ce808c42b4d10b0432cd918dcfa5f7ef2a8d7212 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 17 Jan 2022 23:16:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20deliver=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BA=BA=E9=87=8D=E6=9E=84=EF=BC=9B=E6=9B=B4=E6=96=B0=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=E6=95=B0=E6=8D=AE=E7=9A=84=E6=A3=80=E6=9F=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + apis/plugin.js | 6 +- common/styles/theme/default.scss | 8 +- components/Reviewer/Reviewer.vue | 144 +++++++++---------------------- plugins/p-deliver/p-deliver.vue | 62 +++++++------ 5 files changed, 79 insertions(+), 142 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 278b335..a268d8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ 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) + - | 修复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) - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) diff --git a/apis/plugin.js b/apis/plugin.js index a3616b5..9be2729 100644 --- a/apis/plugin.js +++ b/apis/plugin.js @@ -1,13 +1,12 @@ import Config from '@/common/js/config.js'; -const apiUrl = Config.apiUrl; +const { apiUrl } = Config; const defaultwbs = `${apiUrl}/defaultwbs`; export function setupPlugin(app) { uni.$u.api = { ...uni.$u.api } || {}; // 获取插件信息 - 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}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`); // 查询子任务 uni.$u.api.findSonTask = param => uni.$u.post(`${defaultwbs}/task/findSonTask`, param); @@ -19,6 +18,7 @@ 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); + // v4.0 // 根据任务id获取任务的交付物信息 uni.$u.api.getDeliverByTaskId = param => uni.$u.post(`${defaultwbs}/deliver/getDeliver`, param); } diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index cbdf29e..d2f401e 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -4,13 +4,7 @@ .u-card { font-size: 16px !important; background-color: #f3f3f3 !important; - .btns{ - color: #007aff; - } - .active { - background-color: #2979ff; - color: #ffffff; - } + .mask { position: absolute; top: 0; diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue index 135b903..55a2024 100644 --- a/components/Reviewer/Reviewer.vue +++ b/components/Reviewer/Reviewer.vue @@ -1,110 +1,44 @@ - - diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index d28c05b..700a712 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -22,21 +22,17 @@ - - - + - 粘贴 - 文件 - 拍照 + 粘贴 + 文件 + 拍照 - 修改 + 修改 删除 @@ -46,14 +42,12 @@ - 交付物标题名称 - - - + 交付物标题名称 + - 取消 - 确定 + 取消 + 确定 @@ -62,7 +56,7 @@ - + @@ -98,7 +92,7 @@ const submitState = computed(() => !linkValue.value); console.log('error: ', error); uni.$ui.showToast('获取交付物信息失败'); } -}()); +})(); // (async function getDeliverData(){ // try{ @@ -112,16 +106,31 @@ const submitState = computed(() => !linkValue.value); // uni.$ui.showToast('获取交付物信息失败') // } // }) - -// 提交后验证链接并修改状态 -function submit() { +// 验证提交的交付物信息格式 +function validateDeliverForm() { const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/; if (!reg.test(linkValue.value)) { // 显示toast信息 uni.$ui.showToast('请输入正确的链接'); - } else { - uBadgeShow.value = true; + return false; + } + // 没有检查人 提示选择检查人 + if (!checkedDelivers.value || !checkedDelivers.value.length) { + uni.$ui.showToast('请选择检查人'); + return false; } + return true; +} + +// 提交后验证链接并修改状态 +function submit() { + if (!validateDeliverForm()) return; + + + // else { + // // + // uBadgeShow.value = true; + // } } // 查看历史记录 @@ -134,7 +143,7 @@ function paste() { uni.getClipboardData({ success(res) { linkValue.value = res.data; - }, + } }); } @@ -145,7 +154,7 @@ async function uploadFile() { 'https://test.tall.wiki/filedeal/file/upload/multiple', {}, ['.xls', '.xlsx', '.zip', '.exe', '.pdf', '.doc', '.docx', '.ppt', '.pptx'], - 'files', + 'files' ); // console.log(data[0]) linkValue.value = data[0].visitUrl; @@ -161,7 +170,7 @@ async function uploadPhoto() { 'https://test.tall.wiki/filedeal/file/upload/multiple', {}, ['.xls', '.xlsx', '.zip', '.exe', '.pdf', '.doc', '.docx', '.ppt', '.pptx'], - 'files', + 'files' ); // console.log(data[0]) linkValue.value = data[0].visitUrl; @@ -205,5 +214,4 @@ async function confirmDelete() { } - +