fix: some
All checks were successful
构建并部署前端到测试环境 / deploy (push) Successful in 56s

This commit is contained in:
luo
2026-09-29 18:32:51 +08:00
parent d02ce01f6a
commit 1a5f3d1e7d
3 changed files with 65 additions and 37 deletions

View File

@@ -440,7 +440,9 @@
</div> </div>
<div class="binding-card-field"> <div class="binding-card-field">
<span class="binding-card-field-label">运营商</span> <span class="binding-card-field-label">运营商</span>
<span class="binding-card-field-value">{{ getCarrierAccountDisplay(bindingCard) }}</span> <span class="binding-card-field-value">{{
getCarrierAccountDisplay(bindingCard)
}}</span>
</div> </div>
<div class="binding-card-field"> <div class="binding-card-field">
<span class="binding-card-field-label">卡槽位置</span> <span class="binding-card-field-label">卡槽位置</span>
@@ -473,11 +475,7 @@
<div class="binding-card-field"> <div class="binding-card-field">
<span class="binding-card-field-label">实名时间</span> <span class="binding-card-field-label">实名时间</span>
<span class="binding-card-field-value"> <span class="binding-card-field-value">
{{ {{ bindingCard.real_name_at ? formatAssetInfoTime(bindingCard.real_name_at) : '-' }}
bindingCard.real_name_at
? formatAssetInfoTime(bindingCard.real_name_at)
: '-'
}}
</span> </span>
</div> </div>
<div class="binding-card-field"> <div class="binding-card-field">
@@ -529,6 +527,9 @@
<ElEmpty v-else description="暂无绑定卡" :image-size="80" style="margin-top: 16px" /> <ElEmpty v-else description="暂无绑定卡" :image-size="80" style="margin-top: 16px" />
<slot name="current-package" /> <slot name="current-package" />
<div class="package-list-slot">
<slot name="package-list" />
</div>
<!-- 设备实时信息 --> <!-- 设备实时信息 -->
<ElDivider class="info-section-divider" content-position="left"> <ElDivider class="info-section-divider" content-position="left">
@@ -560,6 +561,9 @@
</template> </template>
<slot v-if="cardInfo?.asset_type !== 'device'" name="current-package" /> <slot v-if="cardInfo?.asset_type !== 'device'" name="current-package" />
<div v-if="cardInfo?.asset_type !== 'device'" class="package-list-slot">
<slot name="package-list" />
</div>
<!-- IoT卡操作按钮 --> <!-- IoT卡操作按钮 -->
<ElAlert <ElAlert
@@ -895,10 +899,7 @@
return !isAgentOrEnterpriseAccount.value return !isAgentOrEnterpriseAccount.value
}) })
const getCarrierAccountDisplay = (card?: { const getCarrierAccountDisplay = (card?: { carrier_type?: string; carrier_name?: string }) => {
carrier_type?: string
carrier_name?: string
}) => {
if (isAgentOrEnterpriseAccount.value) { if (isAgentOrEnterpriseAccount.value) {
return getCarrierTypeName(card?.carrier_type) return getCarrierTypeName(card?.carrier_type)
} }
@@ -1300,6 +1301,10 @@
<style scoped lang="scss"> <style scoped lang="scss">
.info-card { .info-card {
&.basic-info { &.basic-info {
.package-list-slot {
margin-top: 16px;
}
.gateway-extend-text { .gateway-extend-text {
word-break: break-all; word-break: break-all;
} }

View File

@@ -4,7 +4,13 @@
<div class="card-header"> <div class="card-header">
<span>套餐列表</span> <span>套餐列表</span>
<div class="card-header-right"> <div class="card-header-right">
<ElSelect v-model="statusFilter" clearable placeholder="套餐状态" style="width: 140px" @change="handleStatusChange"> <ElSelect
v-model="statusFilter"
clearable
placeholder="套餐状态"
style="width: 140px"
@change="handleStatusChange"
>
<ElOption label="待生效" :value="0" /> <ElOption label="待生效" :value="0" />
<ElOption label="生效中" :value="1" /> <ElOption label="生效中" :value="1" />
<ElOption label="已用完" :value="2" /> <ElOption label="已用完" :value="2" />
@@ -59,7 +65,7 @@
@click="handleOrderNoClick(scope.row)" @click="handleOrderNoClick(scope.row)"
v-if="hasAuth('order:package_list_detail')" v-if="hasAuth('order:package_list_detail')"
> >
{{ scope.row.order_no }} <span class="order-no-link__text">{{ scope.row.order_no }}</span>
</ElButton> </ElButton>
<span v-else class="order-no-text">{{ scope.row.order_no }}</span> <span v-else class="order-no-text">{{ scope.row.order_no }}</span>
</ElTooltip> </ElTooltip>
@@ -861,6 +867,25 @@
padding: 0; padding: 0;
margin-left: 0; margin-left: 0;
justify-content: flex-start; justify-content: flex-start;
:deep(> span) {
display: block;
width: 100%;
min-width: 0;
}
}
:deep(.order-no-link__text) {
display: block;
width: 100%;
min-width: 0;
max-width: 100%;
overflow: hidden;
color: var(--el-color-primary);
cursor: pointer;
text-decoration: underline;
text-overflow: ellipsis;
white-space: nowrap;
} }
} }

View File

@@ -59,35 +59,33 @@
@navigate-to-device="handleNavigateToDevice" @navigate-to-device="handleNavigateToDevice"
/> />
</template> </template>
<template #package-list>
<PackageListCard
:package-list="packageList"
:total="packagePagination.total"
:page="packagePagination.page"
:page-size="packagePagination.pageSize"
:status="packagePagination.status"
:asset-identifier="cardInfo.identifier"
:bound-device-id="cardInfo.bound_device_id"
:bound-device-no="cardInfo.bound_device_no"
:loading="packageLoading"
@show-daily-records="handleShowDailyRecords"
@show-recharge="showRechargeDialog"
@page-change="handlePackagePageChange"
@size-change="handlePackageSizeChange"
@navigate-to-device="handleNavigateToDevice"
@navigate-to-order="handleNavigateToOrder"
@navigate-to-refund="handleNavigateToRefund"
@refresh="handlePackageRefresh"
@status-change="handlePackageStatusChange"
/>
</template>
</BasicInfoCard> </BasicInfoCard>
</div> </div>
</div> </div>
<!-- 第三行:套餐列表 --> <!-- 钱包(概况+流水) -->
<div class="row full-width">
<PackageListCard
:package-list="packageList"
:total="packagePagination.total"
:page="packagePagination.page"
:page-size="packagePagination.pageSize"
:status="packagePagination.status"
:asset-identifier="cardInfo.identifier"
:bound-device-id="cardInfo.bound_device_id"
:bound-device-no="cardInfo.bound_device_no"
:loading="packageLoading"
@show-daily-records="handleShowDailyRecords"
@show-recharge="showRechargeDialog"
@page-change="handlePackagePageChange"
@size-change="handlePackageSizeChange"
@navigate-to-device="handleNavigateToDevice"
@navigate-to-order="handleNavigateToOrder"
@navigate-to-refund="handleNavigateToRefund"
@refresh="handlePackageRefresh"
@status-change="handlePackageStatusChange"
/>
</div>
<!-- 第四行:钱包(概况+流水) -->
<div class="row full-width"> <div class="row full-width">
<WalletTransactionCard <WalletTransactionCard
:asset-identifier="cardInfo.identifier" :asset-identifier="cardInfo.identifier"