From aa4f17fddbd050706f5ef0671dd7f3e62f2c634b Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Mon, 17 Jan 2022 17:08:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
common/styles/tailwind.scss | 9 ++
common/styles/theme/default.scss | 48 ++++----
components/Globals/Globals.vue | 1 +
components/Reviewer/Reviewer.vue | 9 +-
pages.json | 2 +-
pages/submitlist/submitlist.vue | 13 +-
plugins/p-deliver-check/p-deliver-check.vue | 1 -
.../p-deliver-checker/p-deliver-checker.vue | 113 ++++++++++++++++++
plugins/p-deliver/p-deliver.vue | 43 +++----
10 files changed, 175 insertions(+), 65 deletions(-)
create mode 100644 plugins/p-deliver-checker/p-deliver-checker.vue
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1fd8d..c574c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
范围|描述|commitId
--|--|--
- | 交付物插件代码审查 | [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)
diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss
index e31149b..fea7e9a 100644
--- a/common/styles/tailwind.scss
+++ b/common/styles/tailwind.scss
@@ -4557,4 +4557,13 @@ border-radius: 0.375rem;
--tw-border-opacity: 1;
border-color: rgba(229, 231, 235, var(--tw-border-opacity));
}
+.w-64{
+ width: 16rem;
+}
+.w-32{
+ width: 8rem
+}
+.break-all{
+ word-break: break-all;
+}
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index 127c9b7..cbdf29e 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -26,29 +26,27 @@
border-right:1px solid #D1D5DB ;
}
}
- .u-navbar {
- background-color: #007aff !important;
- color: #fff;
- .uicon-nav-back {
- color: #fff !important;
- }
- }
- .box {
- border-radius: 8px;
- background: #fff;
- padding: 16px;
- overflow: hidden;
-}
-
-.warp {
- display: flex;
- align-items: center;
- justify-content: center;
- height: 80%;
-}
-.rect {
- width: 80%;
- height: 380rpx;
- background-color: #fff;
-}
+ .warp {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 50%;
+ }
+ .rect {
+ width: 80%;
+ height: 375rpx;
+ background-color: #fff;
+ }
+ .rect2{
+ width: 80%;
+ height: 500rpx;
+ background-color: #fff;
+ }
+ .linkBox{
+ ::v-deep .input{
+ .u-input__input{
+ color: #60A5FA;
+ }
+ }
+ }
}
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index 698da06..b3a5981 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -29,6 +29,7 @@
:style-type="plugin.styleType || 0"
v-for="plugin in pluginArr"
/>
+
diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue
index 9dd89a0..135b903 100644
--- a/components/Reviewer/Reviewer.vue
+++ b/components/Reviewer/Reviewer.vue
@@ -7,7 +7,8 @@
-
+
+
{{item.name}}
@@ -98,9 +99,9 @@
// console.log(arrList.value)
}
- defineExpose({
- arrList
- })
+ // defineExpose({
+ // arrList
+ // })
diff --git a/pages.json b/pages.json
index 3a9aae2..a5a9b62 100644
--- a/pages.json
+++ b/pages.json
@@ -37,7 +37,7 @@
"navigationBarTitleText": "历史交付物"
}
- }
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue
index 84748f4..88d44c6 100644
--- a/pages/submitlist/submitlist.vue
+++ b/pages/submitlist/submitlist.vue
@@ -29,13 +29,11 @@
{{items.state}}
-
+
-
-
- {{items.grade}}
+ {{items.grade}}
-
+
@@ -80,10 +78,7 @@
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index f9520e8..1f44338 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -22,7 +22,9 @@
-
+
+
+
粘贴
文件
@@ -69,24 +71,34 @@ import { ref, computed} from 'vue';
const taskRef = defineProps({ task: { type: Object, default: () => {} } })
// console.log(taskRef.task.name)
-
// 插件名称
const deliverRef = ref(true); // 交付物插件的显示与销毁
-const textValue = ref('入职插件V0.8原型输出'); // 插件名的值
const linkValue = ref(''); // 链接的值
-const historyIcon = ref(false); // 查看历史记录的图标
const showMask = ref(false); // 编辑和删除页面
const showEditModal = ref(false); // 编辑交付物标题的modal
const newInputRef = ref(taskRef.task.name); // 修改的插件名的值
-// const reviewerData = ref(); // 获取选中的审核人
const showDeleteModal = ref(false) // 删除二次提示的modal
-const content = ref('是否确定删除')
+const content ='是否确定删除'
const uBadgeShow = ref(false) //u-badge的显示与隐藏
// 判断提交按钮的状态
const submitState = computed(() => !linkValue.value);
+// (async function getDeliverData(){
+// try{
+// const {id:taskId} = props.task;
+// if(!taskId) return;
+// const param = {"taskId":props.task.id}
+// const data = await uni.$u.api.getDeliverByTaskId(param)
+// deliver.value = data
+// }catch(error){
+// console.log('error', error);
+// uni.$ui.showToast('获取交付物信息失败')
+// }
+// })
+
+
// 提交后验证链接并修改状态
function submit() {
const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/;
@@ -174,26 +186,7 @@ async function confirmDelete() {
deliverRef.value = false;
}
-