From e5b2e4d08a9fa3f12aef0434f846484ec13fccfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Sat, 15 Mar 2025 10:58:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=80=9A=E7=9F=A5=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/jyh.scss | 30 +++++++++++- .../PersonalCenter/Detail/EarlyWarning.vue | 26 ++++------ .../Detail/EarlyWarningOrganization.vue | 47 +++++++++++++++++++ .../Detail/EarlyWarningPerson.vue | 47 +++++++++++++++++++ 4 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue create mode 100644 src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue diff --git a/src/assets/css/jyh.scss b/src/assets/css/jyh.scss index a703187..0cbae40 100644 --- a/src/assets/css/jyh.scss +++ b/src/assets/css/jyh.scss @@ -117,11 +117,29 @@ background: transparent; li { - background: #F3F3F3; + //background: #F3F3F3; + background: transparent; } .active { - background: #ffffff !important; + //background: #ffffff !important; + } + } +} +.jyh-tabs-4 { + .devui-tabs__nav { + background: transparent; + + li { + background: transparent; + padding: 8px 0; + margin-right: 24px; + } + + .active { + background: transparent !important; + border: 0px !important; + border-bottom: 2px solid black !important; } } } @@ -246,3 +264,11 @@ text-align: left; } } + +.devui-status:before { + margin-right: 12px; +} + +.yellow-status:before { + background-color: #FAC20A !important; +} diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarning.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarning.vue index ecb1de5..fa5a86f 100644 --- a/src/views/Jyh/PersonalCenter/Detail/EarlyWarning.vue +++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarning.vue @@ -1,28 +1,20 @@ diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue new file mode 100644 index 0000000..d4dcc34 --- /dev/null +++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue new file mode 100644 index 0000000..f1ae10a --- /dev/null +++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue @@ -0,0 +1,47 @@ + + + + + From 1dc4e44935809866ba1c01328e595cf58c4d1a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Sat, 15 Mar 2025 10:58:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/config/home.ts | 2 +- src/views/Jyh/PersonalCenter/index.vue | 2 +- src/views/Jyh/Search/index.vue | 2 +- src/views/Jyh/Version/Detail/index.vue | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/router/config/home.ts b/src/router/config/home.ts index 1dcdc58..08ba130 100644 --- a/src/router/config/home.ts +++ b/src/router/config/home.ts @@ -68,7 +68,7 @@ export default [ } }, { - path: 'repoDetail/basicInfo/:versionId', + path: 'repoDetail/:versionId', name: 'VersionDetail', component: () => import('@/views/Jyh/Version/Detail/index.vue'), meta: { diff --git a/src/views/Jyh/PersonalCenter/index.vue b/src/views/Jyh/PersonalCenter/index.vue index 40a9acf..8a84aa1 100644 --- a/src/views/Jyh/PersonalCenter/index.vue +++ b/src/views/Jyh/PersonalCenter/index.vue @@ -3,7 +3,7 @@
首页 - 高级搜索 + 个人中心
diff --git a/src/views/Jyh/Search/index.vue b/src/views/Jyh/Search/index.vue index d88c24d..33bd383 100644 --- a/src/views/Jyh/Search/index.vue +++ b/src/views/Jyh/Search/index.vue @@ -3,7 +3,7 @@ 首页 - 软件商城-软件版本列表 + 开源软件列表 diff --git a/src/views/Jyh/Version/Detail/index.vue b/src/views/Jyh/Version/Detail/index.vue index 921e9e9..91df046 100644 --- a/src/views/Jyh/Version/Detail/index.vue +++ b/src/views/Jyh/Version/Detail/index.vue @@ -2,8 +2,8 @@
首页 - 软件商城-软件版本列表 - 软件商城-软件版本详情 + + 软件详情
@@ -29,7 +29,7 @@ - +
From 26d04feae82676b8238d610ce47a44ab084af297 Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Sat, 15 Mar 2025 12:01:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E8=AE=B8=E5=8F=AF=E8=AF=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/jyh/license/allow.webp | Bin 0 -> 722 bytes src/assets/imgs/jyh/license/notAllow.webp | Bin 0 -> 678 bytes src/assets/imgs/jyh/license/warning.webp | Bin 0 -> 722 bytes src/components/LicenseInfo/SidePanel.vue | 121 +++++++++++++++++----- src/views/Jyh/LicenseInfo/index.vue | 71 ++++++++----- 5 files changed, 137 insertions(+), 55 deletions(-) create mode 100644 src/assets/imgs/jyh/license/allow.webp create mode 100644 src/assets/imgs/jyh/license/notAllow.webp create mode 100644 src/assets/imgs/jyh/license/warning.webp diff --git a/src/assets/imgs/jyh/license/allow.webp b/src/assets/imgs/jyh/license/allow.webp new file mode 100644 index 0000000000000000000000000000000000000000..6d99135a2efafe799b0883e54c1457bfa67d5231 GIT binary patch literal 722 zcmWIYbaOk!#J~{l>J$(bU=hK^z`$St#L^55vJ4EK&dvcR7=c^{#uFft1t^u9S5g$@ z?xYYA8KuDffPoPR!5}fYxB$Y!N&;1Vy9QBvSr@Ac{DPb*sl~}aB_DuTr3h#_&`lyh zwn#dJtpQ>uLD)7Rc6mub2~bS{h+PyCD76yiG=MiFvFeykZN(39n0wkHz(ij*%EoWfhjbvaDzQDl16%CdH5;)wZ0F;se zx+@^ikU)OW(Aq$Nu@6DEpSEpN-( zFVcBk>+I}*f7JKxJ#m_5Xk5 IYhYji07CnxZ2$lO literal 0 HcmV?d00001 diff --git a/src/assets/imgs/jyh/license/notAllow.webp b/src/assets/imgs/jyh/license/notAllow.webp new file mode 100644 index 0000000000000000000000000000000000000000..7944552ecc3544832e88d64802b4b7aacb0bce89 GIT binary patch literal 678 zcmWIYbaR`>#J~{l>J$(bU=hK^z`$St#PVR|>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>fl4;UDM5DXHNiwhtutRzs?w`&l!mvynKz%R&|l3JV$RPq6cRf>R?1KlJ7WQ(Lj z*cu>q5`=97VwaZ`lmOKPfY?PLLC!#S3XrXlj>JwvVkZ|AfzZ zZ((5Ab{-*y2$O=uqC~K9EI^VeEscTU({cs|-be-p;R_55T+v`TAc4be3P33tpu6&c zFr6WXA(cUa!IL46A(=rB$T9*(sv(1!qfdZGK2RZ}x`Kem!!&V0!RBVSNp~{z7z&sk z@H6N!THHQ7|4QU$c@CE^^-KlUSGTv0ewwKiT|Q?jt!Hj3%$r@8%`Ry==c?p8`;x#M=df!J?=vz0QNp|lRd9DF#P-IQvc5}{(t|I|NrIs?tc#j HYGVKZkBW|^ literal 0 HcmV?d00001 diff --git a/src/assets/imgs/jyh/license/warning.webp b/src/assets/imgs/jyh/license/warning.webp new file mode 100644 index 0000000000000000000000000000000000000000..fc134ac917bc2df73bf8cffe2ba694b47f27ea82 GIT binary patch literal 722 zcmWIYbaOk!#J~{l>J$(bU=hK^z`$St#L{5o>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>fl4;UDM5DXHNiwhtutRzs?w`&l!mvynKz%R&|l3JV$RPq6cRf>R?1KlJ7WQ(Lj z*cu>q5`=97VwaZ`lmOKPfY?PLLC!#S3XrXlj>JwvVkZ|AfzZ zZ((5Ab{-*y2$O=uqC~K9EI^VeEscTU({cs|-be-p;R_55T+v`TAc4be3P33tpu6&c zFr6WXA(cUa!IL46A(=rB$T9*(sv(1!qfdaxT%bZmbp-*BhiT%1g3Zmh%5FcaWH`aJ zfkz>iRbkta`BOxvJGuN==Eabm1`2M)>?!z9mtb5h&*&x_dsw(uJjg; zH-bA_?=sBeS@2L(+4QPSQNAvpsO&74!!rz<{w`j4JK4PR`TI+k0#-VoFUwcf^}qCX zfg#M?vRX3mN^K(p!@oaXruF~l+KAl$e{LR77XWo7 Bqrw0H literal 0 HcmV?d00001 diff --git a/src/components/LicenseInfo/SidePanel.vue b/src/components/LicenseInfo/SidePanel.vue index bdfb202..e118232 100644 --- a/src/components/LicenseInfo/SidePanel.vue +++ b/src/components/LicenseInfo/SidePanel.vue @@ -13,12 +13,19 @@
-
-
- +
+

许可证属性

+
+
+
- 允许的 +
+
+ +
+ 允许的 +
Commercial Use Modify Distribute @@ -28,7 +35,12 @@
- 必要的 +
+
+ +
+ 必要的 +
Include Copyright Include License State changes @@ -37,7 +49,12 @@
- 受限的 +
+
+ +
+ 受限的 +
Place Warranty Hold Liable Use Trademark @@ -73,25 +90,84 @@ const emit = defineEmits(['close']); display: flex; flex-direction: column; align-items: start; - gap: 8px; - padding: 12px; - - .dheader, .dcontent{ + .dheader { width: 100%; - border-bottom: 1px solid gray; - padding: 12px; } - .dfooter { + .dcontent { + border-radius: 8px; + border: 1px solid #EEF0F5; + margin: 20px 0; width: 100%; - padding: 12px; + &-title { + height: 40px; + background-color: $devui-area; + display: flex; + justify-content: left; + align-items: center; + h1 { + padding-left: 20px; + color: #252B3A; + font-weight: 800; + font-size: 14px; + line-height: 22px; + letter-spacing: 0px; + } + } + + &-body { + padding: 20px; + + &-col-title { + width: 100%; + height: 23px; + border-radius: 14px; + border: 1px solid; + display: flex; + align-items: center; + img { + width: 14px; + height: 14px; + } + &-icon { + height: 100%; + width: 32px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 14px 0 0 14px; + margin-right: 8px; + } + + &-1 { + border-color: #24B286; + .dcontent-body-col-title-icon { + background-color: #24B286; + } + } + &-2 { + border-color: #FAC20A; + .dcontent-body-col-title-icon { + background-color: #FAC20A; + } + } + &-3 { + border-color: $devui-danger; + .dcontent-body-col-title-icon { + background-color: $devui-danger; + } + } + } + } } .title { font-size: 20px; font-weight: bold; display: flex; + width: 100%; justify-content: space-between; + align-items: center; d-icon { cursor: pointer; } @@ -111,6 +187,10 @@ const emit = defineEmits(['close']); } .dfooter { + border-radius: 8px; + border: 1px solid #EEF0F5; + padding: 20px; + width: 100%; display: flex; flex-direction: column; align-items: start; @@ -118,20 +198,7 @@ const emit = defineEmits(['close']); } .side-panel { - padding: 20px; border: 1px solid #ccc; border-radius: 4px; } - -.color-danger { - color: $devui-danger; -} - -.color-info { - color: $devui-warning; -} - -.color-allow { - color: $devui-success; -} \ No newline at end of file diff --git a/src/views/Jyh/LicenseInfo/index.vue b/src/views/Jyh/LicenseInfo/index.vue index 7cf7322..cdb69fe 100644 --- a/src/views/Jyh/LicenseInfo/index.vue +++ b/src/views/Jyh/LicenseInfo/index.vue @@ -1,42 +1,60 @@