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/assets/imgs/jyh/license/allow.webp b/src/assets/imgs/jyh/license/allow.webp new file mode 100644 index 0000000..6d99135 Binary files /dev/null and b/src/assets/imgs/jyh/license/allow.webp differ diff --git a/src/assets/imgs/jyh/license/notAllow.webp b/src/assets/imgs/jyh/license/notAllow.webp new file mode 100644 index 0000000..7944552 Binary files /dev/null and b/src/assets/imgs/jyh/license/notAllow.webp differ diff --git a/src/assets/imgs/jyh/license/warning.webp b/src/assets/imgs/jyh/license/warning.webp new file mode 100644 index 0000000..fc134ac Binary files /dev/null and b/src/assets/imgs/jyh/license/warning.webp differ 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/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/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 @@ 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 @@ + + + + + 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 6735d3d..c6f73d5 100644 --- a/src/views/Jyh/Version/Detail/index.vue +++ b/src/views/Jyh/Version/Detail/index.vue @@ -2,8 +2,8 @@
首页 - 软件商城-软件版本列表 - 软件商城-软件版本详情 + + 软件详情