diff --git a/Dockerfile b/Dockerfile index 6e2c55b6c5e9a66786e1b00f1614f1c71b809574..2eb77eb574aec03c2e46ef6159071eb211c2ef82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/nginx:1.24.0-22.03 FROM openeuler/openeuler:22.03-lts-sp1 -ENV PATH /usr/share/nginx/sbin:$PATH ENV NGINX_CONFIG_FILE /etc/nginx/nginx.conf ENV NGINX_CONFIG_PATH /etc/nginx/ ENV NGINX_PID /var/run/nginx.pid diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh index 4602342eca40777fa9eeb9ec2af3af6ecf53b913..d72cb306899d5bffd224ba119f20584b3ddcada1 100644 --- a/deploy/entrypoint.sh +++ b/deploy/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash bash /etc/nginx/monitor.sh $DET_URL $DST_PATH & -nginx -g 'daemon off;' \ No newline at end of file +/usr/share/nginx/sbin/nginx -g 'daemon off;' \ No newline at end of file diff --git a/src/assets/footer/code-zgz.png b/src/assets/footer/code-zgz.png index ba38aaee5973fac8246cfa37ff0f1d5bc92e193d..9e9f12ff0b578efdb23b5543c40b9f836f630359 100644 Binary files a/src/assets/footer/code-zgz.png and b/src/assets/footer/code-zgz.png differ diff --git a/src/components/DetailAside.vue b/src/components/DetailAside.vue index 5214c45a14ffd780de0d97911cd9a3c4d07c5aea..e4b333b4d835488ad25cf9310f9689f18bf88578 100644 --- a/src/components/DetailAside.vue +++ b/src/components/DetailAside.vue @@ -156,7 +156,7 @@ const { locale } = useLocale(); const jumpTo = (id: string) => { if (props.type) { const detailType = props.type === 'IMAGE' ? 'image' : props.type === 'RPM' ? 'package' : 'epkg'; - const newHref = `/${locale.value}/${detailType}/detail?type=${props.type}&pkgId=${encodeURIComponent(id)}`; + const newHref = `/${locale.value}/${detailType}/detail?pkgId=${encodeURIComponent(id)}`; return newHref; } }; diff --git a/src/components/DetailHeader.vue b/src/components/DetailHeader.vue index 56eb7f34803f6bd5d881e75cf86163eaaa24edb0..5f59d3d872b598fb37ff217725d42080b2dc9059 100644 --- a/src/components/DetailHeader.vue +++ b/src/components/DetailHeader.vue @@ -50,24 +50,24 @@ const onExternalDialog = (href: string) => {
维护者信息
-维护者:{{ maintainer.maintainerId }}
-+
维护者:{{ maintainer.maintainerId }}
+
{{ `mailto:${maintainer.maintainerEmail}` }}
+
> 更多信息
为您找到符合条件的筛选{{ total }}个
diff --git a/src/views/image/TheDetail.vue b/src/views/image/TheDetail.vue
index 628399a5b13875a79a2b3b84eccf9c80f224f30c..65dfd916db472839a350635aa1acdc1190486d98 100644
--- a/src/views/image/TheDetail.vue
+++ b/src/views/image/TheDetail.vue
@@ -1,6 +1,6 @@
@@ -135,8 +134,8 @@ const queryVer = () => {
> 基本信息 版本号:{{ version }}
{{ item.name }}
- {{ item.type }}
-
-
为您找到符合条件的筛选{{ total }}个
diff --git a/src/views/package/TheDetail.vue b/src/views/package/TheDetail.vue
index ba7b39637193d8b3085e9e4196cf1bd4799a97e9..3bd52eb071b5074ec969f32d08d30de6d02c39c1 100644
--- a/src/views/package/TheDetail.vue
+++ b/src/views/package/TheDetail.vue
@@ -6,14 +6,17 @@ import { useRoute } from 'vue-router';
import { useMarkdown } from '@/composables/useMarkdown';
import type { AppInfoT, MaintainerT, DetailItemT, MoreMessgeT } from '@/@types/app';
import { getDetails, getVer } from '@/api/api-domain';
+import { moreColumns } from '@/data/detail/index';
+import { useViewStore } from '@/stores/common';
+import { useI18n } from 'vue-i18n';
+
import defaultImg from '@/assets/default-logo.png';
import AppFeedback from '@/components/AppFeedback.vue';
import DetailHead from '@/components/DetailHeader.vue';
import DetailAside from '@/components/DetailAside.vue';
import ExternalLink from '@/components/ExternalLink.vue';
-import { moreColumns } from '@/data/detail/index';
-import { useViewStore } from '@/stores/common';
+const { t } = useI18n();
const route = useRoute();
const { mkit } = useMarkdown();
const tabValue = ref('rpmpkg');
@@ -99,7 +102,9 @@ const getDetailValue = (data: any) => {
appData.value.bin_code = data.binDownloadUrl;
appData.value.cover = data?.iconUrl || defaultImg;
appData.value.repository = data.srcRepo;
- queryVer();
+ if (data.name) {
+ queryVer();
+ }
};
const showExternalDlg = ref(false);
@@ -137,7 +142,7 @@ const queryVer = () => {
{{ `${GITEE}/${maintainer.maintainerGiteeId}` }}
diff --git a/src/components/OCardItem.vue b/src/components/OCardItem.vue
index 60d6324d92d4b78d0e913998ff7ccd53717be0ca..44542409d28a1ed47091b1be58a19b183885a62d 100644
--- a/src/components/OCardItem.vue
+++ b/src/components/OCardItem.vue
@@ -17,8 +17,8 @@ defineProps({
const { locale } = useLocale();
const { t } = useI18n();
-const jumpTo = (id: PkgIdsT, type: PkgTypeT) => {
- return `/${locale.value}/apppkg/detail?type=${type}${id.IMAGE ? `&appPkgId=${encodeURIComponent(id.IMAGE)}` : ''}${
+const jumpTo = (id: PkgIdsT, type?: PkgTypeT) => {
+ return `/${locale.value}/apppkg/detail?${type ? `type=${type}` : ''}${id.IMAGE ? `&appPkgId=${encodeURIComponent(id.IMAGE)}` : ''}${
id.EPKG ? `&epkgPkgId=${encodeURIComponent(id.EPKG)}` : ''
}${id.RPM ? `&rpmPkgId=${encodeURIComponent(id.RPM)}` : ''}`;
};
@@ -38,7 +38,7 @@ const repeatTags = (v: string) => {
>