From 03a7c35d7262a4288112e6b57811c4412d0793a1 Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Tue, 18 Jan 2022 09:25:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=80=9A=E8=BF=87=E4=B8=8E=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 +-
 common/styles/tailwind.scss                   | 21 ++++-
 common/styles/theme/default.scss              | 25 ++++--
 .../p-deliver-checker/p-deliver-checker.vue   | 82 ++++++++++++++++---
 plugins/p-deliver/p-deliver.vue               | 20 +----
 5 files changed, 114 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73aa586..c6e6d54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-17)
+# 1.0.0 (2022-01-18)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -74,6 +74,7 @@
 范围|描述|commitId
 --|--|--
  - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
+ - | 审核插件的基本信息展示 | [4f2815f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/4f2815f)
  - | 完善历史记录页面和修改插件的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)
diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss
index fea7e9a..8ffeeab 100644
--- a/common/styles/tailwind.scss
+++ b/common/styles/tailwind.scss
@@ -2213,7 +2213,13 @@
 .border-l-2 {
   border-left-width: 2px;
 }
-
+.border-b{
+	border-bottom-width: 1px;
+}
+.border-gray-400{
+	--tw-border-opacity: 1;
+	border-color: rgba(156, 163, 175, var(--tw-border-opacity));
+}
 .border-gray-300 {
   --tw-border-opacity: 1;
   border-color: rgba(209, 213, 219, var(--tw-border-opacity));
@@ -4563,7 +4569,20 @@ border-radius: 0.375rem;
 .w-32{
 	width: 8rem
 }
+.w-58{
+	width: 14.5rem;
+}
+.h-16{
+	height: 4rem;
+}
 .break-all{
 	word-break: break-all;
 }
+.h-1-4{
+	height: 1.4rem;
+}
+.leading-1-4{
+	line-height: 1.4rem;
+}
+
 
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index cbdf29e..61807d2 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -30,18 +30,13 @@
 	  display: flex;
 	  align-items: center;
 	  justify-content: center;
-	  height: 50%;
+	  height: 100%;
 	}
 	.rect {
 	  width: 80%;
 	  height: 375rpx;
 	  background-color: #fff;
 	}
-	.rect2{
-		width: 80%;
-		height: 500rpx;
-		background-color: #fff;
-	}
 	.linkBox{
 		::v-deep .input{
 		  .u-input__input{
@@ -49,4 +44,22 @@
 		  }
 	  }
 	}
+	// 审核插件
+	.common-list{
+	  height: 12.5rem;
+	  overflow-y: scroll;
+	  view{
+	    border-bottom: 1px solid #E5E7EB;
+	  }
+	}
+	.rect2{
+		width: 80%;
+		height: 1000rpx;
+		background-color: #fff;
+	}
+	.rect3{
+		width: 80%;
+		height: 895rpx;
+		background-color: #fff;
+	}
 }
diff --git a/plugins/p-deliver-checker/p-deliver-checker.vue b/plugins/p-deliver-checker/p-deliver-checker.vue
index d60a70d..6a92759 100644
--- a/plugins/p-deliver-checker/p-deliver-checker.vue
+++ b/plugins/p-deliver-checker/p-deliver-checker.vue
@@ -22,8 +22,8 @@
           <!-- 当前审核人（自己） -->
           <view class="mt-3">
             <span class="text-sm mr-4">冯教授</span>
-            <u-button size="mini" shape="circle" class="btn mr-4" type="primary" @click="approved">通过</u-button>
-            <u-button size="mini" shape="circle" class="btn" type="error" @click="rebut">驳回</u-button>
+            <u-button size="mini" shape="circle" class="mr-4 h-1-4 leading-1-4" type="primary" @click="approved">通过</u-button>
+            <u-button size="mini" shape="circle" class="h-1-4 leading-1-4" type="error" @click="rebut">驳回</u-button>
           </view>
           <!-- 其他审核人 -->
           <view class="mt-3 text-sm flex justify-between">
@@ -65,11 +65,52 @@
               </view>
             </view>
             <view>
-              <u-input :border="true" class="m-5" placeholder="请输入通过建议" type="textarea"></u-input>
+              <textarea class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
+              placeholder="请输入通过建议"
+              maxlength="30"
+              v-model="adviceRef"
+              ></textarea>
+              <!-- <view @click="adviceRef = '加油，再接再厉！' " class="mx-5">
+                加油，再接再厉！
+              </view> -->
+              <view class="common-list">
+                <view v-for="item in commonWords" class="h-12 leading-12 w-62 mx-5" @click="adviceRef = item">
+                   {{item}}
+                 </view>
+              </view>
             </view>
             <view class="flex justify-around h-12 mt-7 justify-self-stretch boxModalBorder">
-              <view class="leading-12 flex-1 text-center deleteModalBorder"> 取消 </view>
-              <view class="text-blue-700 leading-12 flex-1 text-center"> 确定 </view>
+              <view class="leading-12 flex-1 text-center deleteModalBorder" @click="approvedModal = false"> 取消 </view>
+              <view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmAdvice"> 确定 </view>
+            </view>
+          </view>
+        </view>
+      </u-mask>
+
+      <!-- 审批驳回的modal -->
+      <u-mask :show="rebutModal" @click="rebutModal = false">
+        <view class="warp">
+          <view class="rect3" @tap.stop>
+            <!-- 通过modal的标题 -->
+            <view class="text-center my-6 font-semibold"> 审核驳回 </view>
+            <view>
+              <textarea class="border-solid border border-gray-300 m-5 w-58 h-16 p-2 rounded-md"
+              placeholder="请输入通过建议"
+              maxlength="30"
+              v-model="rebutRef"
+              ></textarea>
+              <!-- <view @click="adviceRef = '加油，再接再厉！' " class="mx-5">
+                加油，再接再厉！
+              </view> -->
+              <view class="common-list">
+                <view v-for="item in rebutWordes" class="h-12 leading-12 w-62 mx-5" @click="rebutRef = item">
+                   {{item}}
+                 </view>
+              </view>
+            </view>
+            <view class="flex justify-around h-12 mt-7 justify-self-stretch boxModalBorder">
+              <view class="leading-12 flex-1 text-center deleteModalBorder" @click="rebutModal = false"> 取消 </view>
+              <view class="text-blue-700 leading-12 flex-1 text-center" @click="confirmReject"> 确定 </view>
             </view>
           </view>
         </view>
@@ -80,29 +121,44 @@
 
 <script setup>
 import { ref } from 'vue';
-
 const nameRef = ref('入职插件V0.8原型输出');
 const iconRef = ref(false);
 const submitter = ref('黛西');
 const timeRef = ref('12/28 15:55');
-const approvedModal = ref(false);
-const score = ref(1);
+const approvedModal = ref(false);  //审核通过的modal
+const rebutModal = ref(false)  //审核驳回的modal
+const score = ref(1);         //分数
+const adviceRef = ref('')     // 审核通过的审批语
+const rebutRef = ref('')      // 审核驳回的审批语
+const commonWords = ['加油，再接再厉！','很棒！','不错，很详细！','加油，再接再厉']  // 审核通过常用的审批语
+const rebutWordes = ['不详细','还有需要改进的地方','驳回审批1','驳回审批2']   //审核驳回常用的审批语
 
+// 通过的按钮事件
 function approved() {
   // console.log('通过')
   approvedModal.value = true;
 }
-
+// 驳回的按钮事件
 function rebut() {
+  rebutModal.value = true
   console.log('驳回');
 }
+
+// 审核通过发送相关请求
+function confirmAdvice(){
+  // TODO:发送请求
+  // console.log('确定')
+  approvedModal.value = false
+}
+// 审核驳回发送相关请求
+function confirmReject(){
+  // TODO:发送请求
+  rebutModal.value = false
+}
 </script>
 
 <style scoped lang="scss">
-.btn {
-  height: 1.4rem;
-  line-height: 1.4rem;
-}
+
 .progressDot {
   width: 50rpx;
   height: 50rpx;
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 49b013e..8f33fc1 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -70,14 +70,14 @@
 import { ref, computed } from 'vue';
 
 const props = defineProps({ task: { type: Object, default: () => {} } });
-// console.log(props.task.name)
+
 
 // 插件名称
 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(''); // 修改的插件名的值
 const showDeleteModal = ref(false); // 删除二次提示的modal
 const content = '是否确定删除';
 const uBadgeShow = ref(false); // u-badge的显示与隐藏
@@ -98,20 +98,7 @@ const submitState = computed(() => !linkValue.value);
     console.log('error: ', error);
     uni.$ui.showToast('获取交付物信息失败');
   }
-}());
-
-// (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() {
@@ -177,6 +164,7 @@ function confirmEditDeliverName() {
     // TODO: 提示不能为空
     uni.$ui.showToast('输入不能为空');
   } else {
+    
     // 请求成功 才会清空 请求失败保留
     showEditModal.value = false;
     showMask.value = false;

From ddbb04cad9db48e0f82c441f0e605c032f316349 Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Tue, 18 Jan 2022 11:05:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=8D=95=E8=AF=8D=E2=80=98confirmDeleDte=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                    | 2 ++
 plugins/p-deliver/p-deliver.vue | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2959082..65e8140 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
  - | 删除多余的引入 | [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)
+ - | 修复p-deliver报错taskRef的问题 | [880cf7c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/880cf7c)
  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)
@@ -81,6 +82,7 @@
  - | 修改插件名的输入框和查看历史记录 | [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)
  - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
+ - | 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)
 
 
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 66c8fea..b752032 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -39,7 +39,7 @@
       >
       <view class="bg-red-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click.stop="deleteDeliver">删除</view>
       <!-- 删除的二次提示modal -->
-      <u-modal v-model="showDeleteModal" :content="content" :show-cancel-button="true" @confirm="confirmDeleDte"></u-modal>
+      <u-modal v-model="showDeleteModal" :content="content" :show-cancel-button="true" @confirm="confirmDelete"></u-modal>
     </view>
 
     <!-- 编辑交付物标题的modal -->
@@ -187,7 +187,7 @@ function deleteDeliver() {
   showDeleteModal.value = true;
 }
 // 二次确认后删除
-async function confirmDeleDte() {
+async function confirmDelete() {
   // TODO: 删除二次确认
   // TODO: 确定后 发删除交付物的请求
   try {