删掉租期相关错误东西

This commit is contained in:
yml2213
2026-05-23 14:44:32 +08:00
parent e6cc9f1255
commit a6a1afb879
41 changed files with 127 additions and 312 deletions
@@ -3,7 +3,7 @@
<div class="page-header">
<p class="eyebrow">Create Order</p>
<h1>创建订单</h1>
<p>确认租期租金押金和账号资产快照</p>
<p>确认价格押金和账号资产快照</p>
</div>
</section>
</template>
@@ -91,7 +91,7 @@ async function handleConfirmReceive() {
confirming.value = true
try {
await confirmReceive(order.value.id)
ElMessage.success('已确认收号,订单进入租赁中')
ElMessage.success('已确认收号,订单进入使用中')
await loadOrder()
} catch (error) {
ElMessage.error(readError(error, '确认收号失败'))
@@ -197,7 +197,7 @@ function readError(error: unknown, fallback: string) {
<strong>{{ order.handoff_status }}</strong>
</div>
<div class="metric-card">
<span>租金</span>
<span>订单金额</span>
<strong>¥{{ order.rent_amount }}</strong>
</div>
<div class="metric-card">
@@ -207,9 +207,8 @@ function readError(error: unknown, fallback: string) {
</div>
<div v-if="order" class="order-panel">
<p>租期{{ order.rent_hours }} 小时</p>
<p>开始{{ formatDateTime(order.rent_start_at, '未开始') }}</p>
<p>结束{{ formatDateTime(order.rent_end_at, '未设置') }}</p>
<p>预计截止{{ formatDateTime(order.rent_end_at, '未设置') }}</p>
<el-button v-if="order.status === 'pending_handoff'" type="danger" :loading="cancelling" @click="handleCancel">
取消订单并释放账号
</el-button>
@@ -236,7 +235,7 @@ function readError(error: unknown, fallback: string) {
class="order-panel"
>
<h2>确认收号</h2>
<p>确认账号可以正常登录后订单会进入租赁中并重新计算租期结束时间</p>
<p>确认账号可以正常登录后订单会进入使用中并重新计算预计截止时间</p>
<el-button type="primary" :loading="confirming" @click="handleConfirmReceive">确认已收到账号</el-button>
</div>
+2 -3
View File
@@ -23,14 +23,13 @@ async function loadOrders() {
<div class="page-header">
<p class="eyebrow">Orders</p>
<h1>我的订单</h1>
<p>跟踪待交接租赁待归还申诉中和已完成订单</p>
<p>跟踪待交接使用待归还申诉中和已完成订单</p>
</div>
<el-table v-loading="loading" class="table-panel" :data="orders">
<el-table-column prop="order_no" label="订单号" min-width="210" />
<el-table-column prop="title" label="账号" min-width="180" />
<el-table-column prop="rent_hours" label="租期" width="90" />
<el-table-column prop="rent_amount" label="租金" width="100" />
<el-table-column prop="rent_amount" label="订单金额" width="100" />
<el-table-column prop="deposit_amount" label="押金" width="100" />
<el-table-column prop="status" label="状态" width="140" />
<el-table-column label="操作" width="100">