update

admin-code/src/cool/request/service.js

@@ -4,9 +4,9 @@ import { baseUrl, env } from '@/config/env';
 export class BaseService {
 	constructor() {
 		const crud = {
-			page: 'page',
+			page: 'list',
 			list: 'list',
-			info: 'info',
+			info: 'detail',
 			add: 'add',
 			delete: 'delete',
 			update: 'update'
@@ -64,7 +64,7 @@ export class BaseService {
 
 	page(params) {
 		return this.request({
-			url: '/page',
+			url: '/list',
 			params: {
 				...params
 			}
@@ -73,7 +73,7 @@ export class BaseService {
 
 	info(params) {
 		return this.request({
-			url: '/info',
+			url: '/detail',
 			params: {
 				...params
 			}

admin-code/src/main.js

@@ -19,21 +19,19 @@ Vue.use(ElementUI);
 
 Vue.use(crud, {
 	crud: {
-		dict: {
-			sort: {
-				prop: 'order',
-				order: 'sort'
-			}
-		},
+		dict: {},
 		fn: {
 			permission(that) {
 				const { permission } = that.$store.state.menu;
 				const { add, delete: del, update } = that.service.permission;
 
 				that.permission = {
-					add: permission.includes(add),
-					delete: permission.includes(del),
-					update: permission.includes(update)
+					// add: permission.includes(add),
+					// delete: permission.includes(del),
+					// update: permission.includes(update)
+					add: true,
+					delete: true,
+					update: true
 				};
 			}
 		}

admin-code/src/mock/userInfo.js

@@ -192,6 +192,17 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		},
+		{
+			id: '200',
+			parentId: '27',
+			name: '订单列表',
+			type: 1,
+			icon: 'icon-user',
+			orderNum: 1,
+			router: '/order/list',
+			viewPath: 'views/order/list.vue',
+			keepAlive: 1
+		},
 		{
 			id: '17',
 			parentId: '27',
@@ -502,7 +513,7 @@ let menu = {
 // });
 
 Mock.mock(RegExp('/comm/person' + '.*'), 'get', req => {
-	console.table(req);
+	// console.table(req);
 	return {
 		code: 1,
 		data: userInfo,
@@ -511,7 +522,7 @@ Mock.mock(RegExp('/comm/person' + '.*'), 'get', req => {
 });
 
 Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
-	console.table(req);
+	// console.table(req);
 	return {
 		code: 1,
 		data: menu,
@@ -519,8 +530,8 @@ Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
 	};
 });
 
-Mock.mock(RegExp('/sys/user/page' + '.*'), 'get', req => {
-	console.table(req);
+Mock.mock(RegExp('/sys/user/list' + '.*'), 'get', req => {
+	// console.table(req);
 	return {
 		code: 1,
 		data: {

admin-code/src/service/index.js

@@ -2,11 +2,13 @@ import Vue from 'vue';
 import common from './common/index';
 import system from './system/index';
 import test from './test/index';
+import order from './order/index';
 
 Vue.prototype.$service = {
 	common,
 	system,
-	test
+	test,
+	order
 };
 
 export default Vue.prototype.$service;

admin-code/src/service/order/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool/index';
+
+@Service('order')
+export class OrderService extends BaseService {}
+
+export default new OrderService();

admin-code/src/views/order/list.vue

@@ -0,0 +1,85 @@
+<template>
+	<cl-crud @load="onLoad">
+		<template #table-column-status="{scope}">
+			<el-tag v-if="scope.row.status == 1" size="medium" type="danger">待配送</el-tag>
+			<el-tag v-else-if="scope.row.status == 2" size="medium" type="danger">配送中</el-tag>
+			<el-tag v-else-if="scope.row.status == 3" size="medium" type="danger">待通知</el-tag>
+			<el-tag v-else-if="scope.row.status == 4" size="medium" type="danger">已取消</el-tag>
+			<el-tag v-else-if="scope.row.status == 5" size="medium" type="success">已完成</el-tag>
+			<el-tag v-else size="medium" type="danger">待付款</el-tag>
+		</template>
+	</cl-crud>
+</template>
+
+<script>
+export default {
+	methods: {
+		onLoad({ ctx, app }) {
+			ctx.service(this.$service.order)
+				.set('table', {
+					columns: [
+						{
+							type: 'selection',
+							align: 'center',
+							width: '60'
+						},
+						{
+							prop: 'id',
+							label: '单号',
+							align: 'center'
+						},
+						{
+							prop: 'bookName',
+							label: '订花人',
+							align: 'center'
+						},
+						{
+							prop: 'receiveUserName',
+							label: '收花人',
+							align: 'center'
+						},
+						{
+							prop: 'prePrice',
+							label: '总价',
+							align: 'center'
+						},
+						{
+							prop: 'actPrice',
+							label: '实付款',
+							align: 'center',
+							emptyText: '无',
+							'min-width': 150
+						},
+						{
+							prop: 'reachTime',
+							label: '送达时间',
+							align: 'center'
+						},
+						{
+							prop: 'status',
+							label: '状态',
+							align: 'center'
+						},
+						{
+							prop: 'sendNum',
+							label: '编号',
+							align: 'center',
+							sortable: true,
+							width: 150
+						}
+					],
+
+					props: {
+						'default-sort': {
+							prop: 'createTime',
+							order: 'descending'
+						}
+					}
+				})
+				// .set('layout', [['refresh-btn', 'add-btn', 'multi-delete-btn'], ['data-table'], ['data-table']])
+				.done();
+			app.refresh({ status: 0 });
+		}
+	}
+};
+</script>

admin-code/src/views/system/menu/index.vue

@@ -15,9 +15,9 @@
 		</template>
 
 		<template #table-column-router="{scope}">
-			<el-link type="primary" :href="scope.row.router" v-if="scope.row.type == 1">{{
-				scope.row.router
-			}}</el-link>
+			<el-link type="primary" :href="scope.row.router" v-if="scope.row.type == 1">
+				{{ scope.row.router }}
+			</el-link>
 			<span v-else>{{ scope.row.router }}</span>
 		</template>
 

admin-code/src/views/system/user/index.vue

@@ -267,7 +267,6 @@ export default {
 				})
 				.on('refresh', async (data, { next }) => {
 					let { list } = await next(data);
-
 					list.map(e => {
 						if (e.roleName) {
 							this.$set(e, 'roleNameList', e.roleName.split(','));