Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replace detail page code with t-descriptions #707

Merged
merged 3 commits into from
Apr 2, 2024
Merged

feat: replace detail page code with t-descriptions #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6504214
feat: 使用描述组件对详情页代码升级
timi137137 Apr 2, 2024
1da1ff5
feat: 使用描述组件对个人中心代码升级
timi137137 Apr 2, 2024
335f417
chore: update version
timi137137 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tencent/tdesign-vue-next-starter",
"version": "0.9.0",
"version": "0.10.0",
"type": "module",
"scripts": {
"dev:mock": "vite --open --mode mock",
Expand Down
36 changes: 18 additions & 18 deletions src/pages/detail/advanced/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<template>
<div class="detail-advanced">
<t-card :title="$t('pages.detailCard.baseInfo.title')" :bordered="false">
<div class="info-block">
<div v-for="(item, index) in BASE_INFO_DATA" :key="index" class="info-item">
<h1>{{ item.name }}</h1>
<t-card :bordered="false">
<t-descriptions :title="$t('pages.detailCard.baseInfo.title')">
<t-descriptions-item v-for="(item, index) in BASE_INFO_DATA" :key="index" :label="item.name">
<span
:class="{
['inProgress']: item.type && item.type.value === 'inProgress',
Expand All @@ -13,8 +12,8 @@
<i v-if="item.type && item.type.key === 'contractStatus'" />
{{ item.value }}
</span>
</div>
</div>
</t-descriptions-item>
</t-descriptions>
</t-card>

<!-- 发票进度 -->
Expand Down Expand Up @@ -113,18 +112,19 @@
<t-dialog v-model:visible="visible" :header="$t('pages.detailCard.baseInfo.title')" @confirm="onConfirm">
<template #body>
<div class="dialog-info-block">
<div v-for="(item, index) in BASE_INFO_DATA" :key="index" class="info-item">
<h1>{{ item.name }}</h1>
<span
:class="{
['inProgress']: item.type && item.type.value === 'inProgress',
['pdf']: item.type && item.type.value === 'pdf',
}"
>
<i v-if="item.type && item.type.key === 'contractStatus'" />
{{ item.value }}
</span>
</div>
<t-descriptions :column="1">
<t-descriptions-item v-for="(item, index) in BASE_INFO_DATA" :key="index" :label="item.name">
<span
:class="{
['inProgress']: item.type && item.type.value === 'inProgress',
['pdf']: item.type && item.type.value === 'pdf',
}"
>
<i v-if="item.type && item.type.key === 'contractStatus'" />
{{ item.value }}
</span>
</t-descriptions-item>
</t-descriptions>
</div>
</template>
</t-dialog>
Expand Down
114 changes: 15 additions & 99 deletions src/pages/detail/base/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,28 @@
.detail-base {
:deep(.t-card) {
padding: var(--td-comp-paddingTB-xxl) var(--td-comp-paddingLR-xxl);
}

:deep(.t-card__header) {
padding: 0;
margin-bottom: var(--td-comp-margin-m);
}

:deep(.t-card__body) {
padding: 0;
}

:deep(.t-card__title) {
font: var(--td-font-title-large);
font-weight: 400;
}

&-info-steps {
padding-top: var(--td-comp-margin-xl);
}
}

.info-block {
column-count: 2;

.info-item {
padding-top: var(--td-comp-margin-xxl);
display: flex;
color: var(--td-text-color-primary);

h1 {
width: 160px;
font: var(--td-font-body-medium);
color: var(--td-text-color-secondary);
font-weight: normal;
text-align: left;

@media (max-width: @screen-sm-max) {
width: 80px;
}

@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
width: 120px;
}
}

.t-descriptions {
span {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: var(--td-comp-margin-xxl);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: var(--td-comp-margin-xxl);
}

i {
display: inline-block;
width: 8px;
height: 8px;
border-radius: var(--td-radius-circle);
background: var(--td-success-color);
display: inline-block;
width: 8px;
height: 8px;
border-radius: var(--td-radius-circle);
background: var(--td-success-color);
}

.inProgress {
color: var(--td-success-color);
color: var(--td-success-color);
}

.pdf {
color: var(--td-brand-color);

&:hover {
cursor: pointer;
}
}
}
}

.dialog-info-block {
.info-item {
padding: 12px 0;
display: flex;

h1 {
width: 84px;
font-family: var(--td-font-family);
font-size: 14px;
color: var(--td-text-color-secondary);
text-align: left;
line-height: 22px;
}

span {
margin-left: var(--td-comp-margin-xxl);
}

i {
display: inline-block;
width: 8px;
height: 8px;
border-radius: var(--td-radius-circle);
background: var(--td-success-color);
}

.green {
color: var(--td-success-color);
}
color: var(--td-brand-color);

.blue {
color: var(--td-brand-color);
&:hover {
cursor: pointer;
}
}
}
}
11 changes: 5 additions & 6 deletions src/pages/detail/base/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<template>
<div class="detail-base">
<t-card :title="$t('pages.detailBase.baseInfo.title')" :bordered="false">
<div class="info-block">
<div v-for="(item, index) in BASE_INFO_DATA" :key="index" class="info-item">
<h1>{{ item.name }}</h1>
<t-card :bordered="false">
<t-descriptions :title="$t('pages.detailBase.baseInfo.title')">
<t-descriptions-item v-for="(item, index) in BASE_INFO_DATA" :key="index" :label="item.name">
<span
:class="{
['inProgress']: item.type && item.type.value === 'inProgress',
Expand All @@ -13,8 +12,8 @@
<i v-if="item.type && item.type.key === 'contractStatus'" />
{{ item.value }}
</span>
</div>
</div>
</t-descriptions-item>
</t-descriptions>
</t-card>

<t-card :title="$t('pages.detailBase.changelog.title')" class="container-base-margin-top" :bordered="false">
Expand Down
19 changes: 9 additions & 10 deletions src/pages/user/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@
<t-icon name="ellipsis" />
</t-button>
</template>
<t-row class="content" justify="space-between">
<t-col v-for="(item, index) in USER_INFO_LIST" :key="index" class="contract" :span="item.span ?? 3">
<div class="contract-title">
{{ $t(item.title) }}
</div>
<div class="contract-detail">
{{ item.content }}
</div>
</t-col>
</t-row>
<t-descriptions :column="4" item-layout="vertical">
<t-descriptions-item v-for="(item, index) in USER_INFO_LIST" :key="index" :label="$t(item.title)">
{{ item.content }}
</t-descriptions-item>
</t-descriptions>
</t-card>

<t-card class="content-container" :bordered="false">
Expand Down Expand Up @@ -185,4 +180,8 @@ watch(

<style lang="less" scoped>
@import './index.less';

.t-descriptions {
margin-top: 24px;
}
</style>
Loading