From 4f3d91437e41eb8675bc99af7fabc45966005fe1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 26 Mar 2024 15:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D=E8=8B=B1?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/iconfont2/iconfont.css | 10 +- src/assets/iconfont2/iconfont.ttf | Bin 7532 -> 8288 bytes src/assets/style/style.css | 244 +++++++ src/assets/style/style.less | 259 ++++++++ src/component/HomePage/ExportModel.vue | 602 ++++++++++++------ src/component/HomePage/TaskPage.vue | 211 +++--- src/component/HomePage/UpgradePlan.vue | 23 +- .../{TaskDetailPage.vue => generalModel.vue} | 166 +---- src/component/Pay/allOrder.vue | 17 +- src/component/Pay/creditsDetail.vue | 18 +- src/component/Pay/payOrder.vue | 4 +- src/lang/en.ts | 56 ++ src/tool/https.js | 4 +- src/tool/util.js | 1 - src/views/HomeMain.vue | 10 +- 15 files changed, 1156 insertions(+), 469 deletions(-) rename src/component/HomePage/{TaskDetailPage.vue => generalModel.vue} (70%) diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 4832f46e..132e5da3 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1710811554594') format('truetype'); + src: url('iconfont.ttf?t=1711431581952') format('truetype'); } .iconfont { @@ -119,7 +119,15 @@ content: "\e68b"; } +.icon-renwu:before { + content: "\e63f"; +} + .icon-caizhi:before { content: "\e647"; } +.icon-shangchuantupian:before { + content: "\e61e"; +} + diff --git a/src/assets/iconfont2/iconfont.ttf b/src/assets/iconfont2/iconfont.ttf index 03ae05bc2e7bbbad6502ce9c9c9d77941025365b..25207e73be5faa1b0bab0da9d290f41f9ae218ab 100644 GIT binary patch delta 1219 zcmaJ=Pi)&{6o1clzQoR-Cb8qLPU0jsaSJLbNp>e&YaEW&qmeva~N-|lTh zKiAg321wCBZga4+yZ2}GhZ=zXfSNx1=)T#^08%g6_U+g9Utd`N1A+n-0DfDErqA}- z-?O3cJ^uma0pPqUJsvJI((z3Uj1KX^=v6LRZ_KNJ=YgL`tF%irx&Z=)sQ($rf&fuh za7A~~)!nRXxlg-Ax9m1YUvl~Ie=9$8mqy1ZTtUK}r?vjSs{v;VKm-+{;DaTaAA~R@ zKnF%&E<*?wAqDAimtRKlz`F-M`sfp3N7MmaGRl~*nP^f*M$O<}IyFd-F8hA*eIs2C z3gZ>_QhewKm>u)S{By)?!Wz`!dAI^MNt~P!!9+~av6L$|@Yz_ofU?5OoMBO1p`x1b z=M1K(6jsU>|5%(SC;+#o(322r_oy_NxN3tfD$!0)~-WMJb66?nyUe0BrEE!YqjqX!S5JIsSYl)&G zX)=u8J*VQ3k#Z;eXM7GUxCk%8HQ0n(0KS}2@YHH}y3wU$3Y#ltk#dYOPcBtqdFrY( zNf*+hQpF0j`Z0oQXt4!kNT326jHJa;oSr<&?@Cyjqswy&0uUZc zr~7VL>~^VN8Y~nR27bZci)PQ}&_4Zl%IQQ+{yj)nKT@U0D?Wi{iSeX3{gu*}eSF}q zhzV_VK8Kuhs{h21!^hsol5@m%TU0c$8;^IH5)Y0Kmu_>I8EL7SK$2z0S5sj$eQ#~_ g-`;0!d+SzbE4tgU`6~twzRx@$Xn<=k zv#>V*WnCTu?ik=Tj5&Qa7A=mD_kqyw2vsMdLGu+MYUB#VRk89;@4XN&EacPr`1WKH zkQ}b&^rFdx0)o2x%=QO|%tnL;yWexeM%QL=u3<@KO73uY6WY;;n0wcohUkrQ_^{tT0<*vQ=hxmLYft;y)@_6t15sLA{!y z;}AiSNI;>fhKpS0ey;FN-pzY?pLHR0$balf7@c6`?V}p}w^H~mKt>blAt69{9@L@{ zZu+MeHSi;7Z@apftWmskg4TtYw|XR19tAjolr8C=o!gpwy1{-9_?Vpy?g%Voy@peE QvaObR+-W_#Ze*SHZ`W#R00000 diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 2a0a1258..9cbedd1b 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -424,6 +424,250 @@ li { .modal_component .ant-modal-content .ant-modal-body { padding: 0; } +.ant-drawer-content-wrapper { + width: 50rem !important; +} +.generalModel_page { + width: 100%; + height: 100%; + padding: 9rem; + overflow: hidden; + position: relative; + display: flex; + flex-direction: column; +} +.generalModel_page .generalModel_table_search { + margin-top: 2rem; + padding: 2rem 3.5rem 5rem 2.8rem; + background: #fff; + display: flex; + justify-content: flex-start; + align-items: center; +} +.generalModel_page .generalModel_table_search .generalModel_search { + width: auto; +} +.generalModel_page .generalModel_table_search .generalModel_search .generalModel_search_item { + background: #343579; + border-color: #343579; + height: 4rem; + padding: 0.64rem 1.5rem; + font-size: 1.6rem; + border-radius: 2px; + display: inline-block; + color: #fff; + cursor: pointer; +} +.generalModel_page .generalModel_table_search .generalModel_state { + position: relative; + display: flex; + align-items: center; + width: auto; + flex-wrap: wrap; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item { + display: flex; + align-items: center; + margin-right: 5rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item > span { + font-size: 2rem; + font-weight: 400; + color: #030303; + margin-right: 15px; + flex-shrink: 0; + display: block; + min-width: 5rem; + text-align: left; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item .ant-picker-range { + height: 5rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item .ant-select-lg { + font-size: 14px; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item .ant-select-lg .ant-select-selector { + height: 5rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item .ant-select-lg .ant-select-selector .ant-select-selection-item { + line-height: 5rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_state_item .ant-select-lg .ant-select-selector input { + line-height: 5rem; + height: 5rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .generalModel_current { + background: #fff; + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; +} +.generalModel_page .generalModel_table_search .generalModel_state .header_user_content { + position: absolute; + border: 2px solid; + border-radius: 1rem; + overflow: hidden; + top: 0; + transform: translateY(6rem); + z-index: 2; + display: none; + margin-left: -2rem; +} +.generalModel_page .generalModel_table_search .generalModel_state .header_user_content .username { + padding: 0 2rem; + color: #000; +} +.generalModel_page .generalModel_table_search .generalModel_state .header_user_content .username:hover { + background: #e1e1e1; +} +.generalModel_page .generalModel_table_search .generalModel_state .header_user_content.active { + display: block; +} +.generalModel_table_content { + width: 100%; + height: 100%; + flex: 1; + padding-bottom: 3rem; + background: #fff; + border-radius: 2rem; + overflow: hidden; +} +.generalModel_table_content .ant-table { + background: transparent; +} +.generalModel_table_content .ant-table-body { + overflow-y: auto !important; + -ms-overflow-style: none; + overflow: -moz-scrollbars-none; +} +.generalModel_table_content .ant-table-body::-webkit-scrollbar { + width: 0 !important; +} +.generalModel_table_content .ant-table-thead > tr > th { + background: #ffffff00; + border-bottom: none; + backdrop-filter: blur(1rem); +} +.generalModel_table_content .ant-table-tbody > tr > td { + border: none; + background: transparent; +} +.generalModel_table_content .ant-table-tbody > tr > td img { + max-width: 100%; + max-height: 10rem; + object-fit: contain; +} +.generalModel_table_content .ant-table-tbody > tr:hover > td { + background: #ffffff3a; +} +.generalModel_table_content .ant-table-pagination-right { + padding-right: 3.5rem; +} +.generalModel_table_content .operate_list { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 1rem; + justify-content: center; +} +.generalModel_table_content .operate_list .operate_item { + font-size: 1.4rem; + font-family: Roboto; + font-weight: 400; + color: #343579; + cursor: pointer; +} +.generalModelOperate { + display: flex; + flex-direction: column; + border-right: 1px solid #e5e5e5; + position: relative; +} +.generalModelOperate .ant-modal-content { + border-radius: calc(1rem * 1.2); + overflow: hidden; +} +.generalModelOperate .ant-modal-content .ant-modal-header { + background-color: #fff; + border-bottom: none; +} +.generalModelOperate .ant-modal-content .ant-modal-body { + display: flex; + flex-direction: column; + padding: calc(5rem * 1.2) calc(5rem * 1.2) !important; + background: #f9fafb; +} +.generalModelOperate .ant-modal-content .ant-progress-circle.ant-progress-status-success .ant-progress-text { + color: #000; +} +.generalModelOperate .ant-modal-content .ant-progress-circle .ant-progress-text { + color: rgba(0, 0, 0, 0.55); + font-size: calc(1.6rem * 1.2); +} +.generalModelOperate .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector { + border-color: #d9d9d9; + box-shadow: none; +} +.generalModelOperate .ant-select:hover .ant-select-selector { + border-color: #d9d9d9; +} +.generalModelOperate .generalModelOperate_title { + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0, 0, 0, 0.65); +} +.generalModelOperate .generalModelOperate_closeIcon { + top: calc(2rem * 1.2); + right: calc(2rem * 1.2); + cursor: pointer; + width: calc(4rem * 1.2); + height: calc(4rem * 1.2); + display: flex; + align-items: center; + justify-content: center; + position: absolute; +} +.generalModelOperate .generalModelOperate_closeIcon .fi-rr-cross-small::before { + padding: calc(0.2rem * 1.2); + border-radius: 5px; + border: solid 2px rgba(0, 0, 0, 0.25); + transition: 1s all; + color: rgba(0, 0, 0, 0.55); +} +.generalModelOperate .generalModelOperate_closeIcon.generalModelOperate_closeIcon:hover .fi-rr-cross-small::before { + border: solid 2px rgba(0, 0, 0, 0.55); + color: #000000; +} +.generalModelOperate .generalModelOperate_endBtn { + display: flex; + justify-content: center; +} +.generalModelOperate .generalModelOperate_endBtn > div { + height: 3.2rem; + padding: 4px 1.5rem; + font-size: 1.4rem; + transition: all 0.3s; + border: 1px solid; + cursor: pointer; +} +.generalModelOperate .generalModelOperate_endBtn .generalModelOperate_btn_cancel { + border-color: #d9d9d9; +} +.generalModelOperate .generalModelOperate_endBtn .generalModelOperate_btn_cancel:hover { + color: #39215b; + border-color: #39215b; +} +.generalModelOperate .generalModelOperate_endBtn .generalModelOperate_btn_ok { + margin-left: 10rem; + background: #39215b; + border-color: #39215b; + color: #fff; +} +.generalModelOperate .generalModelOperate_endBtn .generalModelOperate_btn_ok:hover { + border-color: #543087; + background: #543087; +} .ant-modal-body { font-size: 1.4rem; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index dfbc7dab..24226b8c 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -507,6 +507,265 @@ input:focus{ } } } +.ant-drawer-content-wrapper{//抽屉 + width: 50rem !important; +} +.generalModel_page {//常用查询列表样式 + width: 100%; + height: 100%; + padding: 9rem; + overflow: hidden; + // min-width: 1440px; + position: relative; + display: flex; + flex-direction: column; + .generalModel_table_search { + display: flex; + margin-top: 2rem; + padding: 2rem 3.5rem 5rem 2.8rem; + background: #fff; + display: flex; + justify-content: flex-start; + align-items: center; + + .generalModel_search{ + width: auto; + .generalModel_search_item{ + background: #343579; + border-color: #343579; + height: 4rem; + padding: .64rem 1.5rem; + font-size: 1.6rem; + border-radius: 2px; + display: inline-block; + color: #fff; + cursor: pointer; + } + } + .generalModel_state { + position: relative; + display: flex; + align-items: center; + width: auto; + flex-wrap: wrap; + .generalModel_state_item{ + display: flex; + align-items: center; + margin-right: 5rem; + >span{ + font-size: 2rem; + font-weight: 400; + color: #030303; + margin-right: 15px; + flex-shrink: 0; + display: block; + min-width: 5rem; + text-align: left; + } + .ant-picker-range{ + height: 5rem; + } + .ant-select-lg{ + font-size: 14px; + .ant-select-selector{ + height: 5rem; + .ant-select-selection-item{ + line-height: 5rem; + } + input{ + line-height: 5rem; + height: 5rem; + } + } + } + } + .generalModel_current{ + background: #fff; + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + } + .header_user_content { + position: absolute; + border: 2px solid; + border-radius: 1rem; + overflow: hidden; + top: 0; + transform: translateY(6rem); + z-index: 2; + display: none; + margin-left: -2rem; + .username{ + padding: 0 2rem; + color: #000; + } + .username:hover{ + background: #e1e1e1; + } + &.active{ + display: block; + } + } + } + } +} + +.generalModel_table_content { + width: 100%; + // height: 100%; + height: 100%; + flex: 1; + padding-bottom: 3rem; + background: #fff; + border-radius: 2rem; + overflow: hidden; + .ant-table { + background: transparent; + } + + .ant-table-body { + overflow-y: auto !important; + -ms-overflow-style: none; + overflow: -moz-scrollbars-none; + + &::-webkit-scrollbar { + width: 0 !important; + } + } + .ant-table-thead > tr > th { + background: #ffffff00; + border-bottom: none; + backdrop-filter: blur(1rem); + } + + .ant-table-tbody > tr > td { + border: none; + background: transparent; + // color: #fff; + img{ + max-width: 100%; + max-height: 10rem; + object-fit: contain; + } + } + .ant-table-tbody > tr { + &:hover > td { + background: #ffffff3a; + } + } + .ant-table-pagination-right { + padding-right: 3.5rem; + } + .operate_list { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 1rem; + justify-content: center; + .operate_item { + font-size: 1.4rem; + font-family: Roboto; + font-weight: 400; + color: #343579; + cursor: pointer; + } + } +} +.generalModelOperate{//常用model样式 + display: flex; + flex-direction: column; + border-right: 1px solid #e5e5e5; + position: relative; + .ant-modal-content { + border-radius: calc(1rem * 1.2); + overflow: hidden; + .ant-modal-header { + background-color: #fff; + border-bottom: none; + } + .ant-modal-body { + display: flex; + flex-direction: column; + padding: calc(5rem * 1.2) calc(5rem * 1.2) !important; + // height: calc(65vh - 6.4rem); + background: #f9fafb; + } + //进度完成字体颜色 + .ant-progress-circle.ant-progress-status-success .ant-progress-text { + color: #000; + } + .ant-progress-circle .ant-progress-text { + color: rgba(0, 0, 0, 0.55); + font-size: calc(1.6rem * 1.2); + } + } + .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{ + border-color: #d9d9d9; + box-shadow: none; + } + .ant-select:hover .ant-select-selector{ + border-color: #d9d9d9; + } + .generalModelOperate_title { + font-size: var(--aida-fsize2); + font-weight: 900; + color: rgba(0, 0, 0, 0.65); + } + .generalModelOperate_closeIcon { + top: calc(2rem * 1.2); + right: calc(2rem * 1.2); + cursor: pointer; + width: calc(4rem * 1.2); + height: calc(4rem * 1.2); + display: flex; + align-items: center; + justify-content: center; + position: absolute; + .fi-rr-cross-small::before { + padding: calc(0.2rem * 1.2); + border-radius: 5px; + border: solid 2px rgba(0, 0, 0, 0.25); + transition: 1s all; + color: rgba(0, 0, 0, 0.55); + } + &.generalModelOperate_closeIcon:hover .fi-rr-cross-small::before { + border: solid 2px rgba(0, 0, 0, 0.55); + color: rgba(0, 0, 0, 1); + } + } + .generalModelOperate_endBtn{ + display: flex; + justify-content: center; + >div{ + height: 3.2rem; + padding: 4px 1.5rem; + font-size: 1.4rem; + transition: all .3s; + border: 1px solid; + cursor: pointer; + } + .generalModelOperate_btn_cancel{ + border-color: #d9d9d9; + + } + .generalModelOperate_btn_cancel:hover{ + color: #39215b; + border-color: #39215b; + } + + .generalModelOperate_btn_ok{ + margin-left: 10rem; + background: #39215b; + border-color: #39215b; + color: #fff; + } + .generalModelOperate_btn_ok:hover{ + border-color: #543087; + background: #543087; + } + } +} .ant-modal-body{ font-size: 1.4rem; } diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index fded42aa..51fd58d5 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1,6 +1,6 @@ + \ No newline at end of file diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue index 4ea21c36..2ec80030 100644 --- a/src/component/HomePage/TaskPage.vue +++ b/src/component/HomePage/TaskPage.vue @@ -3,15 +3,15 @@ v-model:visible="visible" class="task_page" style="color: #000" - title="Task List" + :title="$t('taskPage.TaskList')" placement="right" @after-visible-change="afterVisibleChange" > -
-
+
+ +
+ + +
- - + +
{{ item.imageName }}
@@ -40,6 +38,7 @@
{{ item.status }}
+
{{ $t('taskPage.download') }}
@@ -47,29 +46,34 @@
- + diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue index 42e195f2..14368603 100644 --- a/src/component/HomePage/UpgradePlan.vue +++ b/src/component/HomePage/UpgradePlan.vue @@ -15,7 +15,7 @@
-
Buy credlts
+
{{ $t('payOrder.BuyCredlts') }}
@@ -62,10 +61,15 @@ {{$t('Header.language')}}
+
+ + + {{$t('Header.TaskList')}} +
- View Orders + {{$t('Header.ViewOrders')}}