Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/hard/hard-after-sale/index.vue

@@ -50,7 +50,7 @@
 						</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="退款状态" align="center">
+				<el-table-column label="退款状态" align="center" min-width="120px">
 					<template #default="{ row }">
 						<dict-tag :options="hard_sale_status" :value="row.status" />
 					</template>
@@ -69,7 +69,8 @@
 							type="primary"
 							v-auth="'hard_hardAfterSale_edit'"
 							@click="formDialogRef.openDialog(row.id)"
-							>编辑
+						>
+							编辑
 						</el-button>
 						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'" @click="handleDelete([row.id])">
 							删除

src/views/hard/hard-door-manager/index.vue

@@ -62,7 +62,16 @@
 										class="bg-blue-50 w-20 h-20 border border-black mx-4 my-1 flex items-center justify-center cursor-pointer rounded-lg"
 										@click="clickPutaway(floorIndex, posIndex)"
 									>
-										<span>点击上架</span>
+										<div v-if="item.pic" class="relative">
+											<el-icon
+												@click.stop="deleteGoods(floorIndex, posIndex)"
+												class="absolute right-[-8px] top-[-8px] text-xl text-blue-600 z-50"
+											>
+												<CircleClose />
+											</el-icon>
+											<preview-image width="86px" height="86px" :src="item.pic" @click.stop />
+										</div>
+										<span v-else>点击上架</span>
 									</div>
 									<div class="h-10">{{ item.name }}</div>
 								</div>
@@ -90,6 +99,7 @@ import { onMounted, ref } from "vue"
 import { useMessage } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
 import * as hardDoorManager from "/@/api/hard/hard-door-manager"
+import { ElMessageBox } from "element-plus"
 
 const InfoSetting = defineAsyncComponent(() => import("./info-setting.vue"))
 const VolumeSetting = defineAsyncComponent(() => import("./volume-setting.vue"))
@@ -156,6 +166,13 @@ const refreshDoor = (row: any, curPos: { hardId: string; floorIndex: number; pos
 	state.doorGoods[curPos.floorIndex][curPos.posIndex] = row
 }
 
+// 删除商品
+const deleteGoods = async (floorIndex: number, posIndex: number) => {
+	ElMessageBox.confirm("确定删除吗？", "删除", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(async () => {
+		state.doorGoods[floorIndex][posIndex] = {}
+	})
+}
+
 const doRefresh = async () => {
 	try {
 		loading.value = true

src/views/wallet/wallet-setting/components/refund/index.vue

@@ -3,14 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<div class="flex justify-center flex-col">
 				<div>
-					<el-form
-						ref="dataFormRef"
-						:model="form"
-						:rules="dataRules"
-						formDialogRef
-						label-width="90px"
-						v-loading="loading"
-					>
+					<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
 						<el-row :gutter="24">
 							<el-col :span="24" class="mb20">
 								<el-form-item label="退款理由" prop="afterSaleRefundReasons">
@@ -23,12 +16,7 @@
 										multiple
 										placeholder="请输入退款理由"
 									>
-										<el-option
-											v-for="reason in form.afterSaleRefundReasons"
-											:key="reason"
-											:label="reason"
-											:value="reason"
-										/>
+										<el-option v-for="reason in form.afterSaleRefundReasons" :key="reason" :label="reason" :value="reason" />
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -43,12 +31,7 @@
 										multiple
 										placeholder="请输入退货理由"
 									>
-										<el-option
-											v-for="reason in form.afterSaleReturnReasons"
-											:key="reason"
-											:label="reason"
-											:value="reason"
-										/>
+										<el-option v-for="reason in form.afterSaleReturnReasons" :key="reason" :label="reason" :value="reason" />
 									</el-select>
 								</el-form-item>
 							</el-col>