Merge branch 'main' of http://129.211.33.98:3210/hjq/mart-admin

src/api/order/index.ts

@@ -0,0 +1,28 @@
+import request from '/@/utils/request';
+import { baseUrlHost } from '../baseUrlHost';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ * 注意在写get请求时，参数是params，而不是data，要标注好
+ * 
+ * 登录api接口集合
+ * @method getOrderAll 获取所有订单列表
+ */
+
+export function orderApi() {
+	return {
+		getOrderList: (params: object) => {
+			return request({
+				url: baseUrlHost + '/odOrder',
+				method: 'get',
+				params
+			});
+		},
+		getOrderDetail: (id: Number) => {
+			return request({
+				url: baseUrlHost + `/odOrder/${id}`,
+				method: 'get',
+			});
+		},
+	};
+}

src/i18n/lang/en.ts

@@ -10,6 +10,7 @@ export default {
 		systemDic: 'systemDic',
 		article: 'article',
 		message: 'message',
+		order: 'order',
 		articleDetail: 'articleDetail',
 		addArticle: 'addArticle',
 		editArticle: 'editArticle',

src/i18n/lang/zh-cn.ts

@@ -10,6 +10,7 @@ export default {
 		systemDic: '字典管理',
 		article: '文章管理',
 		message: '留言管理',
+		order: '订单管理',
 		articleDetail: '文章详情',
 		addArticle: '新增文章',
 		editArticle: '编辑文章',

src/i18n/lang/zh-tw.ts

@@ -10,6 +10,7 @@ export default {
 		systemDic: '字典管理',
 		article: '文章管理',
 		message: '聯言管理',
+		order: '訂單管理',
 		articleDetail: '文章詳情',
 		addArticle: '文章新增',
 		editArticle: '文章編輯',

src/router/route.ts

@@ -247,6 +247,21 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					icon: 'fa fa-wpforms',
 				},
 			},
+			{
+				path: '/order',
+				name: 'order',
+				component: () => import('/@/views/order/index.vue'),
+				meta: {
+					title: 'message.router.order',
+					isLink: '',
+					isHide: false,
+					isKeepAlive: true,
+					isAffix: false,
+					isIframe: false,
+					roles: ['admin', 'common'],
+					icon: 'iconfont icon-shuju', 
+				},
+			},
 			{
 				path: '/limits',
 				name: 'limits',

src/views/order/component/detail.vue

@@ -0,0 +1,99 @@
+<template>
+	<div class="system-menu-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="400px">
+			<el-form ref="DialogFormRef" :model="state.ruleForm" size="default" label-width="120px" v-loading="state.dialog.loading">
+				<el-form-item label="订单号：">
+                    {{ state.ruleForm.memberid }}
+                </el-form-item>
+                <el-form-item label="支付人账户：">
+                    {{ state.ruleForm.memberAccount }}
+                </el-form-item>
+                <el-form-item label="商家账户：">
+                    {{ state.ruleForm.merchantAccount }}
+                </el-form-item>
+                <el-form-item label="支付金额：">
+                    {{ state.ruleForm.amount }}
+                </el-form-item>
+				<el-form-item label="创建时间：">
+                    {{ dateFormatter() }}
+                </el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button plain @click="onCancel" size="default">关 闭</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="orderDialog">
+import { ElMessage } from 'element-plus';
+import {  reactive, ref } from 'vue';
+import { orderApi } from '/@/api/order';
+
+// 定义变量内容
+const DialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+		memberid: 0,
+        memberAccount: '',
+        merchantAccount: '',
+        amount: '',
+        createtime: ''
+	},
+	dialog: {
+		isShowDialog: false,
+		title: '',
+        loading: false
+	},
+});
+
+// 引入 api 请求接口
+const ordApi = orderApi();
+
+// 日期格式化
+const dateFormatter = () => {
+    if(state.ruleForm.createtime === null) return '暂无';
+	let date = state.ruleForm.createtime;
+  	return `${date[0]}-${date[1]}-${date[2]} ${date[3]}:${date[4]}:${date[5]}`;
+}
+
+//获取订单详情
+const getOrderDetailData = async(id? : number) => {
+    try {
+		state.dialog.loading = true;
+		let res = await ordApi.getOrderDetail(id);
+		if(res?.success){
+			state.ruleForm = res.data;
+		}else{
+			ElMessage.error('订单详情获取失败！');
+		}
+	} catch (error) {
+	} finally {
+		state.dialog.loading = false;
+	}
+}
+
+// 打开弹窗
+const openDialog = (id?: any) => {
+    console.log(id)
+	state.dialog.isShowDialog = true;
+    state.dialog.title = '人才留言';
+    getOrderDetailData(id)
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>

src/views/order/index.vue

@@ -0,0 +1,128 @@
+<template>
+    <div class="system-dept-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+				<el-table-column type="memberid" label="订单号" width="100"/>
+				<el-table-column prop="memberAccount" label="支付人账号" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="merchantAccount" label="商家账号" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="amount" label="支付金额" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="createtime" label="时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+						<el-button size="small" text type="primary" @click="toShowDetail(scope.row.id)">查看详情</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				@size-change="onHandleSizeChange"
+				@current-change="onHandleCurrentChange"
+				class="mt15"
+				:pager-count="5"
+				:page-sizes="[10, 20, 30]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.size"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+		<OrderDetail ref="OrderDetailRef" />
+	</div>
+</template>
+
+<script setup lang="ts" name="orderIndex">
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { orderApi } from '/@/api/order';
+import { ElMessage, TableColumnCtx } from 'element-plus';
+
+// 引入组件
+const OrderDetail = defineAsyncComponent(() => import('/@/views/order/component/detail.vue'));
+const OrderDetailRef = ref();
+
+// 表格数据
+const state = reactive({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			size: 10,
+		},
+	},
+});
+
+// 引入 api 请求接口
+const ordApi = orderApi();
+
+// 获取表格数据
+const getTableData = async() => {
+	try {
+		state.tableData.loading = true;
+		let res = await ordApi.getOrderList(state.tableData.param);
+		if(res?.success){
+			state.tableData.data = res.data.records;
+			state.tableData.total = res.data.total;
+		}else{
+			ElMessage.error('订单列表获取失败！');
+		}
+	} catch (error) {
+	} finally {
+		state.tableData.loading = false;
+	}
+};
+
+// 重置
+// const reset = () =>{
+// 	state.tableData.param = {
+// 		type: '',
+// 		current: 1,
+// 		size: 10,
+// 	}
+// 	getTableData();
+// }
+
+// 文章详情
+const toShowDetail = (id: any) => {
+    OrderDetailRef.value.openDialog(id);
+}
+
+// 日期格式化
+const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
+    if(row.createtime === null) return '暂无';
+	let date = row.createtime;
+  	return `${date[0]}-${date[1]}-${date[2]} ${date[3]}:${date[4]}:${date[5]}`;
+}
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.size = val;
+	getTableData();
+};
+
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.current = val;
+	getTableData();
+};
+
+onMounted(() => {
+	getTableData();
+})
+
+</script>
+
+<style scoped lang="scss">
+.system-dept-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>