From f5c3e0b0ea97519cef8c0b65fab1d22d2484b5f0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 11 Jan 2025 18:08:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |   4 +-
 src/views/admin/system/user/face-manage.vue |   1 +
 src/views/hard/hard-order/index.vue         | 506 +++++++++++---------
 3 files changed, 293 insertions(+), 218 deletions(-)

diff --git a/.env.development b/.env.development
index 02523a1..b745ec1 100644
--- a/.env.development
+++ b/.env.development
@@ -8,13 +8,13 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 #VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 VITE_IMAGE_BASE_PATH = http://localhost:9999
 #VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
diff --git a/src/views/admin/system/user/face-manage.vue b/src/views/admin/system/user/face-manage.vue
index 5f7a75f..aba601c 100644
--- a/src/views/admin/system/user/face-manage.vue
+++ b/src/views/admin/system/user/face-manage.vue
@@ -124,6 +124,7 @@ const openDialog = async (id: number) => {
 	dialogVisible.value = true
 	resetForm()
 	detailId.value = id
+	state.queryForm.userId = id
 	getDataList()
 }
 
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index bc59cc4..1d9c4c4 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -1,176 +1,230 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-        <el-row :gutter="24">
-          <el-col :span="4">
-            <el-form-item class="w100" label="用户" prop="userIds">
-              <select-user v-model="state.queryForm.userIds" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item class="w100" label="商户" prop="mchIds">
-              <select-mch v-model="state.queryForm.mchIds" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item class="w100" label="创建时间" prop="payTimeList">
-              <el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
-            </el-form-item>
-          </el-col>
-          <el-form-item>
-            <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
-              }}</el-button>
-            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-tabs v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
-        <div v-for="(v) in tabList" :key="v.value">
-          <el-tab-pane :label="v.label" :name="v.value">
-            <div></div>
-          </el-tab-pane>
-        </div>
-      </el-tabs>
-      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="50" />
-        <el-table-column prop="username" label="用户" />
-        <el-table-column prop="userAvatar" label="头像">
-          <template #default="{ row }">
-            <preview-image :src="row.userAvatar" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="userMobile" width="120" label="手机号" />
-        <el-table-column width="200px" label="设备信息">
-          <template #default="{ row }">
-            <div class="status">
-              <span>商户</span>
-              <span>
-                {{ row.merchantName }}
-              </span>
-            </div>
-            <div class="status">
-              <span>设备名</span>
-              <span>
-                {{ row.hardName }}
-              </span>
-            </div>
-            <div class="status">
-              <span>设备类型</span>
-              <span>
-                {{ row.hardType }}
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column width="250px" label="订单信息">
-          <template #default="{ row }">
-            <div class="status">
-              <span>订单类型</span>
-              <span>
-                <dict-tag :options="hard_order_type" :value="row.orderType" />
-              </span>
-            </div>
-            <div class="status">
-              <span>支付方式</span>
-              <span>
-                <dict-tag :options="hard_pay_type" :value="row.payType" />
-              </span>
-            </div>
-            <div class="status">
-              <span>订单状态</span>
-              <span>
-                <dict-tag :options="hard_order_status" :value="row.orderStatus" />
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column width="200px" label="付款信息">
-          <template #default="{ row }">
-            <div class="status">
-              <span>商品总价</span>
-              <span class="color-success">
-                {{ displayPrice(row.totalPrice) }}
-              </span>
-            </div>
-            <div class="status">
-              <span>额外支付</span>
-              <span class="color-danger">
-                {{ displayPrice(row.extraPrice) }}
-              </span>
-            </div>
-            <div class="status">
-              <span>实际支付</span>
-              <span class="color-primary">
-                {{ displayPrice(row.payPrice) }}
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column width="270px" label="退款信息">
-          <template #default="{ row }">
-            <div class="status">
-              <span>退款金额</span>
-              <span class="color-success">
-                {{ displayPrice(row.refundPrice) }}
-              </span>
-            </div>
-            <div class="status">
-              <span>退款状态</span>
-              <span class="color-success">
-                <dict-tag :options="hard_refund_status" :value="row.refundStatus" />
-              </span>
-            </div>
-            <div class="status">
-              <span>退款时间</span>
-              <span>
-                {{ row.refundTime }}
-              </span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付时间" align="center" prop="payTime" width="180px" />
-        <el-table-column label="操作" width="200">
-          <template #default="{ row }">
-            <el-button icon="ShoppingCartFull" text type="primary"
-              @click="shopCarDialogRef.openDialog(row.id)">购物车</el-button>
-            <el-button icon="InfoFilled" link type="primary" @click="doRefund(row)">
-              详情
-            </el-button>
-            <el-button 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="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'"
-              @click="handleDelete([row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-    <shop-car ref="shopCarDialogRef" />
-  </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="4">
+						<el-form-item class="w100" label="用户" prop="userIds">
+							<select-user v-model="state.queryForm.userIds" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="商户" prop="mchIds">
+							<select-mch v-model="state.queryForm.mchIds" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item class="w100" label="创建时间" prop="payTimeList">
+							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
+						</el-form-item>
+					</el-col>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-tabs v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
+				<div v-for="v in tabList" :key="v.value">
+					<el-tab-pane :label="v.label" :name="v.value">
+						<div></div>
+					</el-tab-pane>
+				</div>
+			</el-tabs>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column prop="username" width="100" label="用户" />
+				<el-table-column prop="userAvatar" width="100" label="头像">
+					<template #default="{ row }">
+						<preview-image :src="row.userAvatar" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="userMobile" width="120" label="手机号" />
+				<el-table-column width="200px" label="商品简要信息">
+					<template #default="{ row }">
+						<div class="desc">
+							<span>商品</span>
+							<span>
+								{{ row.productDesc }}
+							</span>
+						</div>
+						<div class="status" v-if="row.hourType">
+							<span>用餐时间段</span>
+							<span>
+								<dict-tag :options="daily_menu" :value="row.hourType" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="250px" label="设备信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>商户</span>
+							<span>
+								{{ row.merchantName }}
+							</span>
+						</div>
+						<div class="status">
+							<span>设备名</span>
+							<span>
+								{{ row.hardName }}
+							</span>
+						</div>
+						<div class="status">
+							<span>设备类型</span>
+							<span>
+								<dict-tag :options="hard_type" :value="row.hardType" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="250px" label="订单信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>订单类型</span>
+							<span>
+								<dict-tag :options="hard_order_type" :value="row.orderType" />
+							</span>
+						</div>
+						<div class="status">
+							<span>支付方式</span>
+							<span>
+								<dict-tag :options="hard_pay_type" :value="row.payType" />
+							</span>
+						</div>
+						<div class="status">
+							<span>订单状态</span>
+							<span>
+								<dict-tag :options="hard_order_status" :value="row.orderStatus" />
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="200px" label="付款信息">
+					<template #default="{ row }">
+						<div class="status">
+							<span>商品总价</span>
+							<span class="color-success">
+								{{ displayPrice(row.totalPrice) }}
+							</span>
+						</div>
+						<div class="status">
+							<span>额外支付</span>
+							<span class="color-danger">
+								{{ displayPrice(row.extraPrice) }}
+							</span>
+						</div>
+						<div class="status">
+							<span>实际支付</span>
+							<span class="color-primary">
+								{{ displayPrice(row.payPrice) }}
+							</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="270px" label="退款信息">
+					<template #default="{ row }">
+						<div v-if="row.payRefundId">
+							<div class="status">
+								<span>退款金额</span>
+								<span class="color-success">
+									{{ displayPrice(row.refundPrice) }}
+								</span>
+							</div>
+							<div class="status">
+								<span>退款状态</span>
+								<span class="color-success">
+									<dict-tag :options="hard_refund_status" :value="row.refundStatus" />
+								</span>
+							</div>
+							<div class="status">
+								<span>退款时间</span>
+								<span>
+									{{ row.refundTime }}
+								</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="支付时间" align="center" prop="payTime" width="250px">
+					<template #default="{ row }">
+						<div class="status">
+							<span>创建时间</span>
+							<span>{{ row.createTime }} </span>
+						</div>
+						<div class="status">
+							<span>支付时间</span>
+							<span>{{ row.payTime }} </span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="{ row }">
+						<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)"
+							>购物车</el-button
+						>
+						<el-button icon="InfoFilled" link type="primary" @click="doRefund(row)"> 详情 </el-button>
+						<el-button
+							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="false"
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'hard_hardwareOrder_del'"
+							@click="handleDelete([row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<shop-car ref="shopCarDialogRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemHardwareOrder">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import * as hardOrder from "/@/api/hard/hard-order";
-import * as hardCar from "/@/api/hard/hard-car";
-import { getDicts } from '/@/api/admin/dict';
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardOrder from "/@/api/hard/hard-order"
+import * as hardCar from "/@/api/hard/hard-car"
+import { getDicts } from "/@/api/admin/dict"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 
 const { push } = useRouter()
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const ShopCar = defineAsyncComponent(() => import('../components/shop-car.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue"))
 // 定义查询字典
-const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type", "hard_refund_status")
+const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status, daily_menu } = useDict(
+	"hard_pay_type",
+	"hard_order_type",
+	"hard_order_status",
+	"hard_type",
+	"hard_refund_status",
+	"daily_menu",
+)
 // 定义变量内容
 const formDialogRef = ref()
 const shopCarDialogRef = ref()
@@ -184,90 +238,110 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: hardOrder.pageJoin
+	queryForm: {},
+	pageList: hardOrder.pageJoin,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 onMounted(async () => {
-  const { data } = await getDicts("hard_order_type")
-  data.unshift({ label: '全部', value: null })
-  tabList.value = data
+	const { data } = await getDicts("hard_order_type")
+	data.unshift({ label: "全部", value: null })
+	tabList.value = data
 })
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 const handleClick = (e: any) => {
-  state.queryForm.orderType = tabList.value[e.index].value
-  getDataList()
+	state.queryForm.orderType = tabList.value[e.index].value
+	getDataList()
 }
 
 const doRefund = (row: any) => {
-  push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.id, type: "view" } })
+	push({ path: "/hard/hard-after-sale/order-refund", query: { id: row.id, type: "view" } })
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/hard/hardwareOrder/export', Object.assign(state.queryForm, { ids: selectObjs }), 'hardwareOrder.xlsx')
+	downBlobFile("/hard/hardwareOrder/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardwareOrder.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await hardOrder.delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await hardOrder.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>
 
 <style scoped lang="scss">
-.status {
-  display: flex;
-  align-items: center;
-  margin-bottom: 2px;
+.desc {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
 
-  span {
-    display: inline-block;
-  }
+	span {
+		display: inline-block;
+	}
 
-  span:nth-child(1) {
-    width: 100px;
-    text-align: left;
-  }
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
 
-  span:nth-child(2) {
-    flex: 1;
-  }
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+	}
 }
-</style>
\ No newline at end of file
+
+.status {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
+
+	span {
+		display: inline-block;
+	}
+
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
+
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+</style>