From 749cb105d3e17387d08e3b578c46d8750cd67a67 Mon Sep 17 00:00:00 2001 From: Min5203 <2318556978@qq.com> Date: Thu, 20 Jan 2022 14:05:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9F=A5=E7=9C=8B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- common/styles/tailwind.scss | 142 ++++++++-------- pages.json | 38 +++-- pages/checkerList/checkerList.vue | 23 +++ pages/submitlist/submitlist.vue | 159 +++++++++--------- .../p-deliver-checker/p-deliver-checker.vue | 151 ++++++++--------- plugins/p-deliver/p-deliver.vue | 3 +- 7 files changed, 277 insertions(+), 242 deletions(-) create mode 100644 pages/checkerList/checkerList.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index 697a625..d3ce9ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-19) +# 1.0.0 (2022-01-20) ### 🌟 新功能 范围|描述|commitId @@ -76,6 +76,7 @@ 范围|描述|commitId --|--|-- - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b) + - | 审查接口核对完成 | [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) - | 提交交付物，查看提交记录，修改交付物标题的接口核对完成 | [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) diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss index 8ffeeab..e1f030a 100644 --- a/common/styles/tailwind.scss +++ b/common/styles/tailwind.scss @@ -2198,9 +2198,9 @@ .-ml-px { margin-left: -1px; } - -.border-none{ - border-style: none; + +.border-none { + border-style: none; } .box-border { box-sizing: border-box; @@ -2213,22 +2213,22 @@ .border-l-2 { border-left-width: 2px; } -.border-b{ - border-bottom-width: 1px; +.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-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)); } -.border{ - border-width: 1px; +.border { + border-width: 1px; } -.border-solid{ - border-style: solid; +.border-solid { + border-style: solid; } .block { display: block; @@ -2439,15 +2439,15 @@ grid-auto-flow: column dense; } -.gap-1{ +.gap-1 { gap: 0.25rem; } -.gap-2{ +.gap-2 { gap: 0.5rem; } -.gap-3{ +.gap-3 { gap: 0.75rem; } @@ -2710,11 +2710,11 @@ .overflow-hidden { overflow: hidden; } -.visible{ - visibility: visible; +.visible { + visibility: visible; } -.invisible{ - visibility: hidden; +.invisible { + visibility: hidden; } .overflow-visible { overflow: visible; @@ -4354,21 +4354,20 @@ .h-3 { height: 0.75rem; } - -.h5{ - height: 1.25rem; -} - -.h-10{ - height: 2.5rem; + +.h5 { + height: 1.25rem; } +.h-10 { + height: 2.5rem; +} .h-full { height: 100%; } -.leading-10{ - line-height: 2.5rem; +.leading-10 { + line-height: 2.5rem; } .bg-gray-50 { --tw-bg-opacity: 1; @@ -4400,8 +4399,8 @@ .h-12 { height: 3.15rem; } -.h-8{ - height: 2.2rem; +.h-8 { + height: 2.2rem; } .bg-white { --tw-bg-opacity: 1; @@ -4415,10 +4414,6 @@ --tw-bg-opacity: 1; background-color: rgba(59, 130, 246, var(--tw-bg-opacity)); } -.text-green-400 { - --tw-text-opacity: 1; - color: rgba(52, 211, 153, var(--tw-text-opacity)); -} .text-black { --tw-text-opacity: 1; color: rgba(0, 0, 0, var(--tw-text-opacity)); @@ -4499,8 +4494,8 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } -.rounded-md{ -border-radius: 0.375rem; +.rounded-md { + border-radius: 0.375rem; } .shadow-md { @@ -4533,56 +4528,57 @@ border-radius: 0.375rem; box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } -.bg-red-500{ - --tw-bg-opacity: 1; - background-color: rgba(239, 68, 68, var(--tw-bg-opacity)); +.bg-red-500 { + --tw-bg-opacity: 1; + background-color: rgba(239, 68, 68, var(--tw-bg-opacity)); +} +.bg-yellow-500 { + --tw-bg-opacity: 1; + background-color: rgba(245, 158, 11, var(--tw-bg-opacity)); } -.bg-yellow-500{ - --tw-bg-opacity: 1; - background-color: rgba(245, 158, 11, var(--tw-bg-opacity)); +.leading-12 { + line-height: 3.15rem; } -.leading-12{ - line-height: 3.15rem; +.rounded-w-12 { + border-radius: 1.5rem; } -.rounded-w-12{ - border-radius: 1.5rem; +.bg-opacity-100 { + --tw-bg-opacity: 1; } -.bg-opacity-100{ - --tw-bg-opacity: 1; +.bg-grey { + background-color: rgba(0, 0, 0, 0.5); } -.bg-grey{ - background-color: rgba(0,0,0,0.5); +.rounded-md { + border-radius: 0.375rem; } -.rounded-md{ - border-radius: 0.375rem; +.border-t { + border-top-width: 1px; } -.border-t{ - border-top-width: 1px; +.border-gray-200 { + --tw-border-opacity: 1; + border-color: rgba(229, 231, 235, var(--tw-border-opacity)); } -.border-gray-200{ - --tw-border-opacity: 1; - border-color: rgba(229, 231, 235, var(--tw-border-opacity)); +.w-64 { + width: 16rem; } -.w-64{ - width: 16rem; +.w-32 { + width: 8rem; } -.w-32{ - width: 8rem +.w-58 { + width: 14.5rem; } -.w-58{ - width: 14.5rem; +.h-16 { + height: 4rem; } -.h-16{ - height: 4rem; +.break-all { + word-break: break-all; } -.break-all{ - word-break: break-all; +.h-1-4 { + height: 1.4rem; } -.h-1-4{ - height: 1.4rem; +.leading-1-4 { + line-height: 1.4rem; } -.leading-1-4{ - line-height: 1.4rem; +.h-screen { + height: 100vh; } - - diff --git a/pages.json b/pages.json index a5a9b62..d797bca 100644 --- a/pages.json +++ b/pages.json @@ -12,7 +12,7 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } - }, + }, // 用户名密码登录 { "path": "pages/user/accountLogin", @@ -20,24 +20,34 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } - }, - // 手机号登录 - { - "path": "pages/user/login", - "style": { - "navigationStyle": "custom", - "navigationBarTextStyle": "white" - } + }, + // 手机号登录 + { + "path": "pages/user/login", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } + // 提交的历史记录 ,{ "path" : "pages/submitList/submitList", - "style" : + "style" : + { + "navigationStyle": "historty", + "navigationBarTitleText": "历史交付物" + } + } + // 审核的历史记录 + ,{ + "path" : "pages/checkerList/checkerList", + "style" : { - "navigationStyle": "historty", - "navigationBarTitleText": "历史交付物" + "navigationStyle": "kkkkk", + "navigationBarTitleText": "审核记录" } - - } + + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/checkerList/checkerList.vue b/pages/checkerList/checkerList.vue new file mode 100644 index 0000000..6787716 --- /dev/null +++ b/pages/checkerList/checkerList.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue index 4b9df56..896530b 100644 --- a/pages/submitlist/submitlist.vue +++ b/pages/submitlist/submitlist.vue @@ -1,109 +1,114 @@ diff --git a/plugins/p-deliver-checker/p-deliver-checker.vue b/plugins/p-deliver-checker/p-deliver-checker.vue index cc8376e..9fd22df 100644 --- a/plugins/p-deliver-checker/p-deliver-checker.vue +++ b/plugins/p-deliver-checker/p-deliver-checker.vue @@ -6,45 +6,45 @@ {{ nameRef }} - + - {{ submitter }} {{ dayjs(+timeRef).format('MM-DD HH:mm') }} + {{ submitter }} {{ dayjs(+timeRef).format('MM-DD HH:mm') }} - {{linkRef}} + {{ linkRef }} 审核 - 更多记录 + 更多记录 - {{item.checkerName}} - {{item.remark}} - {{dayjs(+item.checkTime).format('MM-DD HH:mm')}} + {{ item.checkerName }} + {{ item.remark }} + {{ dayjs(+item.checkTime).format('MM-DD HH:mm') }} - {{item.status == null ? '待审核': item.status == '1' ? '已通过':'已驳回'}} + {{ item.status == null ? '待审核' : item.status === 1 ? '已通过' : '已驳回' }} 通过 驳回 - + - {{item.status == '1' ? '已通过':'已驳回'}} + {{ item.status == '1' ? '已通过' : '已驳回' }} - - - {{item.score}} - - + + + {{ item.score }} + + @@ -65,15 +65,16 @@ - - {{item}} - + {{ item }} + @@ -91,15 +92,16 @@ 审核驳回 - - {{item}} - + {{ item }} + @@ -114,41 +116,38 @@