Sfoglia il codice sorgente

refactor(system): 优化订单状态显示及调整道具日志列顺序

- 在订单列表中,增加进行中和已关闭状态的显示
- 调整道具日志列表中当前操作数量列的位置,移到操作类型列之后
fugui001 4 mesi fa
parent
commit
28a8a96444

+ 1 - 1
src/views/system/business/itemsLog/index.vue

@@ -63,7 +63,6 @@
           </template>
         </el-table-column>
         <el-table-column label="道具名称" align="center" prop="itemName" />
-        <el-table-column label="当前操作数量" align="center" prop="scoreNum" />
         <el-table-column label="操作类型" align="center">
           <template #default="scope">
             <span v-if="scope.row.type === 1">新增</span>
@@ -72,6 +71,7 @@
             <span v-else>未知</span>
           </template>
         </el-table-column>
+        <el-table-column label="当前操作数量" align="center" prop="scoreNum" />
         <el-table-column label="操作前数量" align="center" prop="beforeNum" />
         <el-table-column label="操作后数量" align="center" prop="afterNum" />
         <el-table-column label="描述" align="center" prop="remark" />

+ 5 - 2
src/views/system/business/order/index.vue

@@ -76,8 +76,11 @@
         <el-table-column label="手机号" align="center" prop="phone" />
         <el-table-column label="订单状态" align="center" width="120">
           <template #default="{ row }">
-            <el-tag :type="row.status === 'success' ? 'success' : 'danger'" size="small">
-              {{ row.status === 'success' ? '成功' : '交易失败' }}
+            <el-tag
+              :type="row.status === 'success' ? 'success' : row.status === 'pending' ? 'warning' : row.status === 'close' ? 'danger' : 'info'"
+              size="small"
+            >
+              {{ row.status === 'success' ? '成功' : row.status === 'pending' ? '进行中' : row.status === 'close' ? '已关闭' : '未知状态' }}
             </el-tag>
           </template>
         </el-table-column>