商品可永久

src/views/computingResource/resourceList.vue

@@ -173,7 +173,7 @@
                   <span style="font-weight: 600; font-size: 16px; color: #FF9811;">
                     ￥{{ row.price ? (row.price / 100).toFixed(2) : '-' }}
                   </span>
-                                <span style="margin-left: 4px; font-size: 14px; color: #606266;">
+                                <span v-if="row.feeInfo" style="margin-left: 4px; font-size: 14px; color: #606266;">
                     /{{ row.feeInfo }}
                   </span>
                 </template>
@@ -226,7 +226,7 @@
                     </el-row>
                     <el-divider></el-divider>
                     <div class="flex-justify-end price">
-                      ￥{{ item.price ? (item.price / 100).toFixed(2) : '-' }}/{{ item.feeInfo }}
+                      ￥{{ item.price ? (item.price / 100).toFixed(2) : '-' }}<template v-if="item.feeInfo">/{{ item.feeInfo }}</template>
                     </div>
                     <!--<div class="flex-justify-end month-expenses">约￥15/月</div>-->
                     <el-divider></el-divider>

src/views/console/myOrder.vue

@@ -170,7 +170,7 @@
             type="success"
             :closable="false"
             show-icon
-            :title="`资源使用中，租赁结束时间：${parseTime(form.rentEndTime, '{y}-{m}-{d} {h}:{i}:{s}')}`"
+            :title="form.rentEndTime ? `资源使用中，租赁结束时间：${parseTime(form.rentEndTime, '{y}-{m}-{d} {h}:{i}:{s}')}` : '资源使用中（永久）'"
         />
         <el-alert
             v-else-if="form.status === 7"

src/views/console/naturalResources.vue

@@ -26,7 +26,8 @@
       <!-- 阶段 F：倒计时（仅 DELIVERED 显示），剩余 ≤3 天橙色警示 -->
       <el-table-column label="剩余时间" align="center" width="140">
         <template #default="scope">
-          <span v-if="scope.row.status === 6" :class="{ 'warn-text': remainingDays(scope.row) <= 3 && remainingDays(scope.row) >= 0 }">
+          <span v-if="!scope.row.rentEndTime && scope.row.status === 6">永久</span>
+          <span v-else-if="scope.row.status === 6" :class="{ 'warn-text': remainingDays(scope.row) <= 3 && remainingDays(scope.row) >= 0 }">
             剩余 {{ formatRemaining(scope.row.rentEndTime) }}
           </span>
           <span v-else>-</span>
@@ -39,7 +40,7 @@
       </el-table-column>
       <el-table-column label="租赁结束时间" align="center" prop="rentEndTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.rentEndTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.rentEndTime ? parseTime(scope.row.rentEndTime, '{y}-{m}-{d}') : '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -66,7 +67,7 @@
             type="success"
             :closable="false"
             show-icon
-            :title="`资源使用中，租赁结束时间：${parseTime(form.rentEndTime, '{y}-{m}-{d}')}`"
+            :title="form.rentEndTime ? `资源使用中，租赁结束时间：${parseTime(form.rentEndTime, '{y}-{m}-{d}')}` : '资源使用中（永久）'"
         />
         <el-alert
             v-else-if="form.status === 4"
@@ -156,7 +157,7 @@
         </div>
 
         <div class="info-block">
-          <div class="info-item flex-align-center flex-space-between">
+          <div v-if="form.rentEndTime" class="info-item flex-align-center flex-space-between">
             <div class="label">租期</div>
             <div class="value">{{ form.skuName }}</div>
           </div>
@@ -172,11 +173,11 @@
           <div class="label">申请时间</div>
           <div class="value">{{ parseTime(form.createTime, '{y}-{m}-{d}') }}</div>
         </div>
-        <div class="info-item  flex-align-center flex-space-between">
+        <div v-if="form.rentEndTime" class="info-item  flex-align-center flex-space-between">
           <div class="label">租赁开始时间</div>
           <div class="value">{{ parseTime(form.rentStartTime, '{y}-{m}-{d}') }}</div>
         </div>
-        <div class="info-item  flex-align-center flex-space-between">
+        <div v-if="form.rentEndTime" class="info-item  flex-align-center flex-space-between">
           <div class="label">租赁结束时间</div>
           <div class="value">{{ parseTime(form.rentEndTime, '{y}-{m}-{d}') }}</div>
         </div>