Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/hard/hard-order/index.vue

@@ -65,13 +65,16 @@
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column width="200" label="用户">
 					<template #default="{ row }">
-						<div class="flex flex-row items-center justify-center">
+						<div v-if="row.userId && row.userId != -1" class="flex flex-row items-center justify-center">
 							<preview-image width="50px" height="50px" :src="row.userAvatar" />
 							<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
 								<span> {{ row.username }}</span>
 								<span> {{ row.userMobile }}</span>
 							</div>
 						</div>
+						<div v-else>
+							<span>未知用户</span>
+						</div>
 					</template>
 				</el-table-column>
 				<el-table-column width="200px" label="商品">
@@ -194,7 +197,7 @@
 				</el-table-column>
 				<el-table-column fixed="right" label="操作" width="200">
 					<template #default="{ row }">
-						<div class="grid grid-cols-2 justify-between">
+						<div class="grid grid-cols-2 justify-evenly">
 							<el-button
 								v-if="row.orderType !== '5'"
 								icon="Printer"
@@ -214,23 +217,30 @@
 							>
 								购物车
 							</el-button>
-							<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)"> 钱包明细 </el-button>
+							<el-button
+								icon="Money"
+								link
+								type="primary"
+								v-if="row.userId && row.userId != '-1'"
+								@click="transactionListRef.openDialog(row.walletId)"
+							>
+								钱包明细
+							</el-button>
 							<el-button icon="InfoFilled" link type="primary" v-auth="'wallet_walletTransaction_update_balance'" @click="doRefund(row)">
 								订单详情
 							</el-button>
-						</div>
-						<el-button
-							v-if="false"
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'hard_hardwareOrder_edit'"
-							@click="formDialogRef.openDialog(row.id)"
-							>编辑
-						</el-button>
-						<div v-if="row.orderType !== '5'">
 							<el-button
-								v-if="!row.payRefundId"
+								v-if="false"
+								icon="edit-pen"
+								text
+								type="primary"
+								v-auth="'hard_hardwareOrder_edit'"
+								@click="formDialogRef.openDialog(row.id)"
+							>
+								编辑
+							</el-button>
+							<el-button
+								v-if="!row.payRefundId && row.orderType !== '5'"
 								icon="stamp"
 								text
 								type="primary"
@@ -239,10 +249,10 @@
 							>
 								退款
 							</el-button>
+							<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])">
+								删除
+							</el-button>
 						</div>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])">
-							删除
-						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>