update

admin-update/src/config/config.js

@@ -1,5 +1,5 @@
 import Vue from 'vue';
 // 项目配置--由bat脚本变更
-export const ProjectName = 'sass';
+export const ProjectName = 'business';
 
 Vue.prototype.$projectName = ProjectName;

admin-update/src/config/env.js

@@ -1,6 +1,8 @@
 import store from 'store';
 import { getUrlParam, getFirstHost } from '@/cool/utils';
 
+const env = process.env;
+
 // 路由模式
 const routerMode = 'hash';
 
@@ -8,7 +10,7 @@ const routerMode = 'hash';
 const imgHostUrl = `${window.location.protocol}//img.${getFirstHost()}.com`;
 
 // 请求地址
-const baseUrl = (function() {
+const baseUrl = (() => {
 	let proxy = getUrlParam('proxy');
 	console.log('proxy', proxy);
 
@@ -18,12 +20,12 @@ const baseUrl = (function() {
 		proxy = store.get('proxy') || 'dev';
 	}
 
-	switch (process.env.NODE_ENV) {
+	switch (env.NODE_ENV) {
 		case 'development':
 			return `/${proxy}`;
 		case 'production':
-			// return `http://api.s.huaml.com`;
-			return `${window.location.protocol}//api.s.${getFirstHost()}.com`;
+			// return `http://api.b.huaml.com`;
+			return `${window.location.protocol}//api.b.${getFirstHost()}.com`;
 		default:
 			return '';
 	}
@@ -32,4 +34,4 @@ const baseUrl = (function() {
 // 阿里字体图标库 https://at.alicdn.com/t/**.css
 const iconfontUrl = ``;
 
-export { routerMode, baseUrl, iconfontUrl, imgHostUrl };
+export { env, routerMode, baseUrl, iconfontUrl, imgHostUrl };

admin-update/src/config/b-config.js → admin-update/src/config/s-config.js

@@ -1,5 +1,5 @@
 import Vue from 'vue';
 // 项目配置--由bat脚本变更
-export const ProjectName = 'business';
+export const ProjectName = 'sass';
 
 Vue.prototype.$projectName = ProjectName;

admin-update/src/config/b-env.js → admin-update/src/config/s-env.js

@@ -1,8 +1,6 @@
 import store from 'store';
 import { getUrlParam, getFirstHost } from '@/cool/utils';
 
-const env = process.env;
-
 // 路由模式
 const routerMode = 'hash';
 
@@ -10,7 +8,7 @@ const routerMode = 'hash';
 const imgHostUrl = `${window.location.protocol}//img.${getFirstHost()}.com`;
 
 // 请求地址
-const baseUrl = (() => {
+const baseUrl = (function() {
 	let proxy = getUrlParam('proxy');
 	console.log('proxy', proxy);
 
@@ -20,12 +18,12 @@ const baseUrl = (() => {
 		proxy = store.get('proxy') || 'dev';
 	}
 
-	switch (env.NODE_ENV) {
+	switch (process.env.NODE_ENV) {
 		case 'development':
 			return `/${proxy}`;
 		case 'production':
-			// return `http://api.b.huaml.com`;
-			return `${window.location.protocol}//api.b.${getFirstHost()}.com`;
+			// return `http://api.s.huaml.com`;
+			return `${window.location.protocol}//api.s.${getFirstHost()}.com`;
 		default:
 			return '';
 	}
@@ -34,4 +32,4 @@ const baseUrl = (() => {
 // 阿里字体图标库 https://at.alicdn.com/t/**.css
 const iconfontUrl = ``;
 
-export { env, routerMode, baseUrl, iconfontUrl, imgHostUrl };
+export { routerMode, baseUrl, iconfontUrl, imgHostUrl };

admin-update/src/mock/userInfo-b.js

@@ -1,835 +0,0 @@
-import Mock from 'mockjs';
-// import { getUrlParams } from './utils';
-
-let token = {
-	expire: 9999999,
-	token:
-		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlSWRzIjpbIjEiXSwidXNlcklkIjoiMSIsInBhc3N3b3JkVmVyc2lvbiI6MSwiaWF0IjoxNTczOTc4MzYyLCJleHAiOjE1NzQ1ODMxNjJ9.UOfPFd5cbWaRcaCri4TU2aFZ8_t8KVJzfBFBciDYLdQ'
-};
-
-let userList = [
-	{
-		id: '21',
-		name: '测试部门权限2',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: '权限2昵称',
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-20 15:48:31',
-		updateTime: '2019-11-20 15:48:31',
-		username: 'testdp2',
-		phone: null,
-		departmentId: '1',
-		roleName: '只有部门2小组2',
-		departmentName: 'COOL-ADMIN'
-	},
-	{
-		id: '20',
-		name: '测试部门权限',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: '测试部门权限昵称',
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-20 15:39:28',
-		updateTime: '2019-11-20 15:39:28',
-		username: 'testdep',
-		phone: null,
-		departmentId: '1',
-		roleName: '只有部门1',
-		departmentName: 'COOL-ADMIN'
-	},
-	{
-		id: '19',
-		name: '33',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: '333',
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-19 00:02:27',
-		updateTime: '2019-11-19 00:02:27',
-		username: '333',
-		phone: null,
-		departmentId: '17',
-		roleName: '只有部门1',
-		departmentName: '小组1'
-	},
-	{
-		id: '18',
-		name: '阿打算',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: '12312',
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-18 18:20:04',
-		updateTime: '2019-11-18 18:20:04',
-		username: '3123',
-		phone: null,
-		departmentId: '13',
-		roleName: 'testRole',
-		departmentName: '部门1'
-	},
-	{
-		id: '17',
-		name: '阿',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: '123',
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-18 18:07:57',
-		updateTime: '2019-11-18 18:07:57',
-		username: '123',
-		phone: null,
-		departmentId: '16',
-		roleName: '超管',
-		departmentName: '小组2'
-	},
-	{
-		id: '16',
-		name: 'test',
-		password: 'e10adc3949ba59abbe56e057f20f883e',
-		passwordV: 1,
-		nickName: null,
-		headImg: null,
-		email: null,
-		remark: null,
-		status: 1,
-		createTime: '2019-11-11 10:37:43',
-		updateTime: '2019-11-11 11:17:25',
-		username: '测试',
-		phone: null,
-		departmentId: '14',
-		roleName: '测试,testRole,超管',
-		departmentName: '小组1'
-	}
-];
-
-let userInfo = {
-	createTime: '2019-06-25 10:20:20',
-	email: '123456@qq.com',
-	headImg: 'https://pic.qqtn.com/up/2019-11/2019110209212070747.jpg',
-	id: '1',
-	name: '超级管理员',
-	nickName: '超管',
-	passwordV: 1,
-	phone: '18000000000',
-	remark: '备注',
-	roleIdList: ['1'],
-	status: 1,
-	updateTime: '2019-11-12 09:40:27',
-	username: 'admin'
-};
-
-let menu = {
-	perms: [
-		'sys:menu:add',
-		'sys:menu:delete',
-		'sys:menu:update',
-		'sys:menu:page',
-		'sys:menu:list',
-		'sys:menu:info',
-		'sys:user:add',
-		'sys:user:delete',
-		'sys:user:update',
-		'sys:user:page',
-		'sys:user:list',
-		'sys:user:info',
-		'sys:role:add',
-		'sys:role:delete',
-		'sys:role:update',
-		'sys:role:page',
-		'sys:role:list',
-		'sys:role:info',
-		'1',
-		'sys:log:page',
-		'sys:log:clear'
-	],
-	menus: [
-		// {
-		// 	id: '48',
-		// 	parentId: '47',
-		// 	name: '文档',
-		// 	type: 1,
-		// 	icon: 'icon-favorfill',
-		// 	orderNum: 0,
-		// 	router: '/tutorial/doc',
-		// 	viewPath: 'https://docs.cool-admin.com/#/',
-		// 	keepAlive: 1
-		// },
-		// 工作台
-		{
-			id: '1',
-			parentId: null,
-			name: '工作台',
-			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/',
-			viewPath: 'views/home.vue',
-			keepAlive: 1
-		},
-		// 客户管理
-		{
-			id: '2',
-			parentId: null,
-			name: '客户',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 2,
-			router: '/member/list',
-			viewPath: 'views/member/list.vue',
-			keepAlive: 1
-		},
-		// 订单管理
-		{
-			id: '3',
-			parentId: null,
-			name: '订单',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 3,
-			router: '/order/list',
-			viewPath: 'views/order/list.vue',
-			keepAlive: 1
-		},
-		// 商品管理
-		{
-			id: '4',
-			parentId: null,
-			name: '商品',
-			type: 0,
-			icon: 'iconkehuguanli',
-			orderNum: 4,
-			router: '/goods/list',
-			viewPath: 'views/goods/goods-list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '401',
-			parentId: '4',
-			name: '商品列表',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/list',
-			viewPath: 'views/goods/goods-list.vue',
-			keepAlive: 1
-		},
-		// {
-		// 	id: '402',
-		// 	parentId: '4',
-		// 	name: '图库管理',
-		// 	type: 1,
-		// 	icon: 'icon-user',
-		// 	orderNum: 1,
-		// 	router: '/goods/img-store',
-		// 	viewPath: 'views/goods/img-store.vue',
-		// 	keepAlive: 1
-		// },
-		{
-			id: '403',
-			parentId: '4',
-			name: '添加商品',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/add',
-			viewPath: 'views/goods/goods-add.vue',
-			keepAlive: 1
-		},
-		{
-			id: '404',
-			parentId: '4',
-			name: '分类管理',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/category',
-			viewPath: 'views/goods/category.vue',
-			keepAlive: 1
-		},
-		{
-			id: '405',
-			parentId: '4',
-			name: '运费设置',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/freight',
-			viewPath: 'views/goods/freight-set.vue',
-			keepAlive: 1
-		},
-		{
-			id: '406',
-			parentId: '4',
-			name: '节日自动涨价',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/auto-price',
-			viewPath: 'views/goods/auto-price.vue',
-			keepAlive: 1
-		},
-		{
-			id: '406',
-			parentId: '4',
-			name: '商品通用简介',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 4,
-			router: '/goods/summary',
-			viewPath: 'views/goods/summary.vue',
-			keepAlive: 1
-		},
-		{
-			id: '5',
-			parentId: null,
-			name: '图库',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 5,
-			router: '/goods/img-store',
-			viewPath: 'views/goods/img-store.vue',
-			keepAlive: 1
-		},
-		// 邀请有礼
-		{
-			id: '6',
-			parentId: null,
-			name: '邀请',
-			type: 0,
-			icon: 'iconkehuguanli',
-			orderNum: 6,
-			router: '/invite/list',
-			viewPath: 'views/invite/list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '601',
-			parentId: '6',
-			name: '邀请有礼',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 6,
-			router: '/invite/list',
-			viewPath: 'views/invite/list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '602',
-			parentId: '6',
-			name: '奖励设置',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 6,
-			router: '/invite/reward-set',
-			viewPath: 'views/invite/reward-set.vue',
-			keepAlive: 1
-		},
-		// 优惠券
-		{
-			id: '7',
-			parentId: null,
-			name: '优惠券',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 7,
-			router: '/coupon/list',
-			viewPath: 'views/coupon/list.vue',
-			keepAlive: 1
-		},
-		// 促销
-		// {
-		// 	id: '7',
-		// 	parentId: null,
-		// 	name: '促销',
-		// 	type: 0,
-		// 	icon: 'iconkehuguanli',
-		// 	orderNum: 2,
-		// 	router: '/goods/list',
-		// 	viewPath: 'views/goods/goods-list.vue',
-		// 	keepAlive: 1
-		// },
-		// 广告管理
-		{
-			id: '8',
-			parentId: null,
-			name: '广告',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 8,
-			router: '/ad/list',
-			viewPath: 'views/ad/list.vue',
-			keepAlive: 1
-		},
-		// 员工管理
-		{
-			id: '9',
-			parentId: null,
-			name: '员工',
-			type: 0,
-			icon: 'iconkehuguanli',
-			orderNum: 9,
-			router: '/staff/list',
-			viewPath: 'views/staff/list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '901',
-			parentId: '9',
-			name: '员工列表',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 9,
-			router: '/staff/list',
-			viewPath: 'views/staff/list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '902',
-			parentId: '9',
-			name: '角色列表',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 9,
-			router: '/role/list',
-			viewPath: 'views/staff/role-list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '903',
-			parentId: '9',
-			name: '操作记录',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 9,
-			router: '/operate/list',
-			viewPath: 'views/staff/operate.vue',
-			keepAlive: 1
-		},
-		// 设置
-		{
-			id: '10',
-			parentId: null,
-			name: '设置',
-			type: 0,
-			icon: 'iconkehuguanli',
-			orderNum: 10,
-			router: '/goods/list',
-			viewPath: 'views/goods/goods-list.vue',
-			keepAlive: 1
-		},
-		{
-			id: '101',
-			parentId: '10',
-			name: '微信菜单设置',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 10,
-			router: '/setting/wx-menu',
-			viewPath: 'views/setting/wx-menu.vue',
-			keepAlive: 1
-		},
-		{
-			id: '102',
-			parentId: '10',
-			name: '新人领券设置',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 10,
-			router: '/setting/coupon',
-			viewPath: 'views/setting/coupon.vue',
-			keepAlive: 1
-		},
-		{
-			id: '103',
-			parentId: '10',
-			name: '会员等级设置',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 10,
-			router: '/setting/level',
-			viewPath: 'views/setting/level.vue',
-			keepAlive: 1
-		},
-		{
-			id: '11',
-			parentId: null,
-			name: '代理',
-			type: 1,
-			icon: 'iconkehuguanli',
-			orderNum: 11,
-			router: '/pages/admin/my-invite',
-			viewPath: 'views/my-invite/index.vue',
-			keepAlive: 1
-		},
-		// {
-		// 	id: '12',
-		// 	parentId: null,
-		// 	name: '收入明细',
-		// 	type: 1,
-		// 	icon: 'iconkehuguanli',
-		// 	orderNum: 12,
-		// 	router: '/admin/assets/list',
-		// 	viewPath: 'views/assets/list.vue',
-		// 	keepAlive: 1
-		// },
-		// ========================================================
-		{
-			id: '13',
-			parentId: '8',
-			name: '新增',
-			type: 2,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '17',
-			parentId: '27',
-			name: '用户列表',
-			type: 1,
-			icon: 'icon-user',
-			orderNum: 1,
-			router: '/sys/user',
-			viewPath: 'views/system/user/index.vue',
-			keepAlive: 1
-		},
-		{
-			id: '18',
-			parentId: '17',
-			name: '新增',
-			type: 2,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '23',
-			parentId: '22',
-			name: '新增',
-			type: 2,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		// {
-		// 	id: '27',
-		// 	parentId: null,
-		// 	name: '权限管理',
-		// 	type: 0,
-		// 	icon: 'icon-permission',
-		// 	orderNum: 1,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		{
-			id: '29',
-			parentId: '28',
-			name: '日志列表',
-			type: 1,
-			icon: 'icon-log',
-			orderNum: 1,
-			router: '/sys/log',
-			viewPath: 'views/system/log/index.vue',
-			keepAlive: 0
-		},
-		{
-			id: '30',
-			parentId: '29',
-			name: '权限',
-			type: 2,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '38',
-			parentId: '8',
-			name: '11111',
-			type: 0,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 1
-		},
-		{
-			id: '43',
-			parentId: '45',
-			name: 'crud 示例',
-			type: 1,
-			icon: 'icon-radioboxfill',
-			orderNum: 1,
-			router: '/crud',
-			viewPath: 'views/test/crud.vue',
-			keepAlive: 1
-		},
-		// {
-		// 	id: '53',
-		// 	parentId: '1',
-		// 	name: '组件预览',
-		// 	type: 1,
-		// 	icon: 'icon-activityfill',
-		// 	orderNum: 1,
-		// 	router: '/ui-components',
-		// 	viewPath: 'views/workbench/ui-components',
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '11',
-		// 	parentId: null,
-		// 	name: '系统',
-		// 	type: 0,
-		// 	icon: 'icon-systemfill',
-		// 	orderNum: 2,
-		// 	router: '/sys',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		{
-			id: '8',
-			parentId: '27',
-			name: '菜单列表',
-			type: 1,
-			icon: 'icon-menu',
-			orderNum: 2,
-			router: '/sys/menu',
-			viewPath: 'views/system/menu/index.vue',
-			keepAlive: 1
-		},
-		{
-			id: '11',
-			parentId: '8',
-			name: '删除',
-			type: 2,
-			icon: null,
-			orderNum: 2,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '19',
-			parentId: '17',
-			name: '删除',
-			type: 2,
-			icon: null,
-			orderNum: 2,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '24',
-			parentId: '22',
-			name: '删除',
-			type: 2,
-			icon: null,
-			orderNum: 2,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		// {
-		// 	id: '28',
-		// 	parentId: '11',
-		// 	name: '系统监控',
-		// 	type: 0,
-		// 	icon: 'icon-monitor',
-		// 	orderNum: 2,
-		// 	router: null,
-		// 	viewPath: null,
-		// 	keepAlive: 0
-		// },
-		// {
-		// 	id: '45',
-		// 	parentId: '1',
-		// 	name: '组件库',
-		// 	type: 0,
-		// 	icon: 'icon-activityfill',
-		// 	orderNum: 2,
-		// 	router: '/ui-lib',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		// {
-		// 	id: '46',
-		// 	parentId: '45',
-		// 	name: 'Froala富文本',
-		// 	type: 1,
-		// 	icon: 'icon-radioboxfill',
-		// 	orderNum: 2,
-		// 	router: '/editor-froala',
-		// 	viewPath: 'views/test/editor-froala.vue',
-		// 	keepAlive: 1
-		// },
-		{
-			id: '12',
-			parentId: '8',
-			name: '修改',
-			type: 2,
-			icon: null,
-			orderNum: 3,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '20',
-			parentId: '17',
-			name: '修改',
-			type: 2,
-			icon: null,
-			orderNum: 3,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '22',
-			parentId: '27',
-			name: '角色列表',
-			type: 1,
-			icon: 'icon-role',
-			orderNum: 3,
-			router: '/sys/role',
-			viewPath: 'views/system/role/index.vue',
-			keepAlive: 1
-		},
-		{
-			id: '25',
-			parentId: '22',
-			name: '修改',
-			type: 2,
-			icon: null,
-			orderNum: 3,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		// {
-		// 	id: '47',
-		// 	parentId: null,
-		// 	name: '教程',
-		// 	type: 0,
-		// 	icon: 'icon-weibiaoti4',
-		// 	orderNum: 3,
-		// 	router: '/tutorial',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		{
-			id: '49',
-			parentId: '45',
-			name: 'Quill富文本',
-			type: 1,
-			icon: 'icon-radioboxfill',
-			orderNum: 3,
-			router: '/editor-quill',
-			viewPath: 'views/test/editor-quill.vue',
-			keepAlive: 1
-		},
-		{
-			id: '13',
-			parentId: '8',
-			name: '查询',
-			type: 2,
-			icon: null,
-			orderNum: 4,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '21',
-			parentId: '17',
-			name: '查询',
-			type: 2,
-			icon: null,
-			orderNum: 4,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		},
-		{
-			id: '26',
-			parentId: '22',
-			name: '查询',
-			type: 2,
-			icon: null,
-			orderNum: 4,
-			router: null,
-			viewPath: null,
-			keepAlive: 0
-		}
-		// {
-		// 	id: '51',
-		// 	parentId: '10',
-		// 	name: '测试404页面',
-		// 	type: 1,
-		// 	icon: 'icon-newfill',
-		// 	orderNum: 10,
-		// 	router: '/test',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// }
-	]
-};
-
-// Mock.mock(RegExp('/comm/person' + '.*'), 'get', req => {
-// 	// console.table(req);
-// 	return {
-// 		code: 1,
-// 		data: userInfo,
-// 		message: 'success'
-// 	};
-// });
-
-Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
-	// console.table(req);
-	return {
-		code: 1,
-		data: menu,
-		message: 'success'
-	};
-});
-
-Mock.mock(RegExp('/sys/user/list' + '.*'), 'get', req => {
-	// console.table(req);
-	return {
-		code: 1,
-		data: {
-			list: userList,
-			pagination: {
-				page: 1,
-				size: 20,
-				total: 6
-			}
-		},
-		message: 'success'
-	};
-});

admin-update/src/mock/userInfo-w.js

@@ -0,0 +1,381 @@
+import Mock from 'mockjs';
+// import { getUrlParams } from './utils';
+
+let token = {
+	expire: 9999999,
+	token:
+		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlSWRzIjpbIjEiXSwidXNlcklkIjoiMSIsInBhc3N3b3JkVmVyc2lvbiI6MSwiaWF0IjoxNTczOTc4MzYyLCJleHAiOjE1NzQ1ODMxNjJ9.UOfPFd5cbWaRcaCri4TU2aFZ8_t8KVJzfBFBciDYLdQ'
+};
+
+let userList = [
+	{
+		id: '21',
+		name: '测试部门权限2',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '权限2昵称',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-20 15:48:31',
+		updateTime: '2019-11-20 15:48:31',
+		username: 'testdp2',
+		phone: null,
+		departmentId: '1',
+		roleName: '只有部门2小组2',
+		departmentName: 'COOL-ADMIN'
+	},
+	{
+		id: '20',
+		name: '测试部门权限',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '测试部门权限昵称',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-20 15:39:28',
+		updateTime: '2019-11-20 15:39:28',
+		username: 'testdep',
+		phone: null,
+		departmentId: '1',
+		roleName: '只有部门1',
+		departmentName: 'COOL-ADMIN'
+	},
+	{
+		id: '19',
+		name: '33',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '333',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-19 00:02:27',
+		updateTime: '2019-11-19 00:02:27',
+		username: '333',
+		phone: null,
+		departmentId: '17',
+		roleName: '只有部门1',
+		departmentName: '小组1'
+	},
+	{
+		id: '18',
+		name: '阿打算',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '12312',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-18 18:20:04',
+		updateTime: '2019-11-18 18:20:04',
+		username: '3123',
+		phone: null,
+		departmentId: '13',
+		roleName: 'testRole',
+		departmentName: '部门1'
+	},
+	{
+		id: '17',
+		name: '阿',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: '123',
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-18 18:07:57',
+		updateTime: '2019-11-18 18:07:57',
+		username: '123',
+		phone: null,
+		departmentId: '16',
+		roleName: '超管',
+		departmentName: '小组2'
+	},
+	{
+		id: '16',
+		name: 'test',
+		password: 'e10adc3949ba59abbe56e057f20f883e',
+		passwordV: 1,
+		nickName: null,
+		headImg: null,
+		email: null,
+		remark: null,
+		status: 1,
+		createTime: '2019-11-11 10:37:43',
+		updateTime: '2019-11-11 11:17:25',
+		username: '测试',
+		phone: null,
+		departmentId: '14',
+		roleName: '测试,testRole,超管',
+		departmentName: '小组1'
+	}
+];
+
+let userInfo = {
+	createTime: '2019-06-25 10:20:20',
+	email: '123456@qq.com',
+	headImg: 'https://pic.qqtn.com/up/2019-11/2019110209212070747.jpg',
+	id: '1',
+	name: '超级管理员',
+	nickName: '超管',
+	passwordV: 1,
+	phone: '18000000000',
+	remark: '备注',
+	roleIdList: ['1'],
+	status: 1,
+	updateTime: '2019-11-12 09:40:27',
+	username: 'admin'
+};
+
+let menu = {
+	perms: [
+		'sys:menu:add',
+		'sys:menu:delete',
+		'sys:menu:update',
+		'sys:menu:page',
+		'sys:menu:list',
+		'sys:menu:info',
+		'sys:user:add',
+		'sys:user:delete',
+		'sys:user:update',
+		'sys:user:page',
+		'sys:user:list',
+		'sys:user:info',
+		'sys:role:add',
+		'sys:role:delete',
+		'sys:role:update',
+		'sys:role:page',
+		'sys:role:list',
+		'sys:role:info',
+		'1',
+		'sys:log:page',
+		'sys:log:clear'
+	],
+	menus: [
+		// {
+		// 	id: '48',
+		// 	parentId: '47',
+		// 	name: '文档',
+		// 	type: 1,
+		// 	icon: 'icon-favorfill',
+		// 	orderNum: 0,
+		// 	router: '/tutorial/doc',
+		// 	viewPath: 'https://docs.cool-admin.com/#/',
+		// 	keepAlive: 1
+		// },
+		// 工作台
+		// {
+		// 	id: '1',
+		// 	parentId: null,
+		// 	name: '工作台',
+		// 	type: 0,
+		// 	icon: 'icongongzuotai',
+		// 	orderNum: 1,
+		// 	router: '/',
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// },
+		// 商家管理
+		{
+			id: '1',
+			parentId: null,
+			name: '商家',
+			type: 0,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/sass/shop-list',
+			viewPath: null,
+			keepAlive: 1
+		},
+		{
+			id: '11',
+			parentId: '1',
+			name: '商家列表',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/',
+			viewPath: 'sass/shop/list',
+			keepAlive: 1
+		},
+		{
+			id: '12',
+			parentId: '1',
+			name: '申请记录',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/sass/merchant/apply-list',
+			viewPath: 'sass/shop/apply',
+			keepAlive: 1
+		},
+		{
+			id: '13',
+			parentId: '1',
+			name: '小程序升级',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/sass/merchant/upgrade',
+			viewPath: 'sass/shop/upgrade',
+			keepAlive: 1
+		},
+		{
+			id: '14',
+			parentId: '1',
+			name: '门店',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/sass/merchant/shop-list',
+			viewPath: 'sass/shop/shop',
+			keepAlive: 1
+		},
+		{
+			id: '14',
+			parentId: '1',
+			name: '购买记录',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 1,
+			router: '/sass/merchant/buy-list',
+			viewPath: 'sass/shop/buy',
+			keepAlive: 1
+		},
+		// 订单管理
+		{
+			id: '2',
+			parentId: null,
+			name: '订单',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 2,
+			router: '/sass/order/list',
+			viewPath: 'sass/order/list',
+			keepAlive: 1
+		},
+		// 商家客户
+		{
+			id: '3',
+			parentId: null,
+			name: '客户',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 3,
+			router: '/sass/member/list',
+			viewPath: 'sass/member/list',
+			keepAlive: 1
+		},
+		// 平台客户
+		{
+			id: '4',
+			parentId: null,
+			name: '店长',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 4,
+			router: '/sass/pt-member/list',
+			viewPath: 'sass/pt-member/list',
+			keepAlive: 1
+		},
+		// 商家商品
+		{
+			id: '5',
+			parentId: null,
+			name: '商品',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 5,
+			router: '/sass/goods/list',
+			viewPath: 'sass/goods/list',
+			keepAlive: 1
+		},
+		// 节日管理
+		{
+			id: '6',
+			parentId: null,
+			name: '节日',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 6,
+			router: '/sass/fest/list',
+			viewPath: 'sass/fest/list',
+			keepAlive: 1
+		},
+		// 套餐管理
+		{
+			id: '7',
+			parentId: null,
+			name: '套餐',
+			type: 0,
+			icon: 'icongongzuotai',
+			orderNum: 7,
+			router: '/sass/manage/list',
+			viewPath: 'sass/manage/list',
+			keepAlive: 1
+		},
+		{
+			id: '701',
+			parentId: '7',
+			name: '套餐列表',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 7,
+			router: '/sass/manage/package',
+			viewPath: 'sass/manage/package',
+			keepAlive: 1
+		},
+		{
+			id: '701',
+			parentId: '7',
+			name: '权限管理',
+			type: 1,
+			icon: 'icongongzuotai',
+			orderNum: 7,
+			router: '/sass/manage/auth',
+			viewPath: 'sass/manage/auth',
+			keepAlive: 1
+		}
+	]
+};
+
+// Mock.mock(RegExp('/auth/login' + '.*'), 'get', req => {
+// 	// console.table(req);
+// 	return {
+// 		code: 1,
+// 		data: userInfo,
+// 		message: 'success'
+// 	};
+// });
+
+Mock.mock(RegExp('/comm/permmenu' + '.*'), 'get', req => {
+	// console.table(req);
+	return {
+		code: 1,
+		data: menu,
+		message: 'success'
+	};
+});
+
+Mock.mock(RegExp('/sys/user/list' + '.*'), 'get', req => {
+	// console.table(req);
+	return {
+		code: 1,
+		data: {
+			list: userList,
+			pagination: {
+				page: 1,
+				size: 20,
+				total: 6
+			}
+		},
+		message: 'success'
+	};
+});

admin-update/src/mock/userInfo.js

@@ -171,182 +171,636 @@ let menu = {
 		// 	keepAlive: 1
 		// },
 		// 工作台
-		// {
-		// 	id: '1',
-		// 	parentId: null,
-		// 	name: '工作台',
-		// 	type: 0,
-		// 	icon: 'icongongzuotai',
-		// 	orderNum: 1,
-		// 	router: '/',
-		// 	viewPath: null,
-		// 	keepAlive: 1
-		// },
-		// 商家管理
 		{
 			id: '1',
 			parentId: null,
-			name: '商家',
-			type: 0,
+			name: '工作台',
+			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 1,
-			router: '/sass/shop-list',
-			viewPath: null,
+			router: '/',
+			viewPath: 'views/home.vue',
 			keepAlive: 1
 		},
+		// 客户管理
 		{
-			id: '11',
-			parentId: '1',
-			name: '商家列表',
+			id: '2',
+			parentId: null,
+			name: '客户',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/',
-			viewPath: 'sass/shop/list',
+			icon: 'iconkehuguanli',
+			orderNum: 2,
+			router: '/member/list',
+			viewPath: 'views/member/list.vue',
 			keepAlive: 1
 		},
+		// 订单管理
 		{
-			id: '12',
-			parentId: '1',
-			name: '申请记录',
+			id: '3',
+			parentId: null,
+			name: '订单',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/sass/merchant/apply-list',
-			viewPath: 'sass/shop/apply',
+			icon: 'iconkehuguanli',
+			orderNum: 3,
+			router: '/order/list',
+			viewPath: 'views/order/list.vue',
 			keepAlive: 1
 		},
+		// 商品管理
 		{
-			id: '13',
-			parentId: '1',
-			name: '小程序升级',
+			id: '4',
+			parentId: null,
+			name: '商品',
+			type: 0,
+			icon: 'iconkehuguanli',
+			orderNum: 4,
+			router: '/goods/list',
+			viewPath: 'views/goods/goods-list.vue',
+			keepAlive: 1
+		},
+		{
+			id: '401',
+			parentId: '4',
+			name: '商品列表',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/sass/merchant/upgrade',
-			viewPath: 'sass/shop/upgrade',
+			icon: 'icon-user',
+			orderNum: 4,
+			router: '/goods/list',
+			viewPath: 'views/goods/goods-list.vue',
 			keepAlive: 1
 		},
+		// {
+		// 	id: '402',
+		// 	parentId: '4',
+		// 	name: '图库管理',
+		// 	type: 1,
+		// 	icon: 'icon-user',
+		// 	orderNum: 1,
+		// 	router: '/goods/img-store',
+		// 	viewPath: 'views/goods/img-store.vue',
+		// 	keepAlive: 1
+		// },
 		{
-			id: '14',
-			parentId: '1',
-			name: '门店',
+			id: '403',
+			parentId: '4',
+			name: '添加商品',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/sass/merchant/shop-list',
-			viewPath: 'sass/shop/shop',
+			icon: 'icon-user',
+			orderNum: 4,
+			router: '/goods/add',
+			viewPath: 'views/goods/goods-add.vue',
 			keepAlive: 1
 		},
 		{
-			id: '14',
-			parentId: '1',
-			name: '购买记录',
+			id: '404',
+			parentId: '4',
+			name: '分类管理',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 1,
-			router: '/sass/merchant/buy-list',
-			viewPath: 'sass/shop/buy',
+			icon: 'icon-user',
+			orderNum: 4,
+			router: '/goods/category',
+			viewPath: 'views/goods/category.vue',
 			keepAlive: 1
 		},
-		// 订单管理
 		{
-			id: '2',
-			parentId: null,
-			name: '订单',
+			id: '405',
+			parentId: '4',
+			name: '运费设置',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 2,
-			router: '/sass/order/list',
-			viewPath: 'sass/order/list',
+			icon: 'icon-user',
+			orderNum: 4,
+			router: '/goods/freight',
+			viewPath: 'views/goods/freight-set.vue',
 			keepAlive: 1
 		},
-		// 商家客户
 		{
-			id: '3',
-			parentId: null,
-			name: '客户',
+			id: '406',
+			parentId: '4',
+			name: '节日自动涨价',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 3,
-			router: '/sass/member/list',
-			viewPath: 'sass/member/list',
+			icon: 'icon-user',
+			orderNum: 4,
+			router: '/goods/auto-price',
+			viewPath: 'views/goods/auto-price.vue',
 			keepAlive: 1
 		},
-		// 平台客户
 		{
-			id: '4',
-			parentId: null,
-			name: '店长',
+			id: '406',
+			parentId: '4',
+			name: '商品通用简介',
 			type: 1,
-			icon: 'icongongzuotai',
+			icon: 'icon-user',
 			orderNum: 4,
-			router: '/sass/pt-member/list',
-			viewPath: 'sass/pt-member/list',
+			router: '/goods/summary',
+			viewPath: 'views/goods/summary.vue',
 			keepAlive: 1
 		},
-		// 商家商品
 		{
 			id: '5',
 			parentId: null,
-			name: '商品',
+			name: '图库',
 			type: 1,
-			icon: 'icongongzuotai',
+			icon: 'iconkehuguanli',
 			orderNum: 5,
-			router: '/sass/goods/list',
-			viewPath: 'sass/goods/list',
+			router: '/goods/img-store',
+			viewPath: 'views/goods/img-store.vue',
 			keepAlive: 1
 		},
-		// 节日管理
+		// 邀请有礼
 		{
 			id: '6',
 			parentId: null,
-			name: '节日',
+			name: '邀请',
+			type: 0,
+			icon: 'iconkehuguanli',
+			orderNum: 6,
+			router: '/invite/list',
+			viewPath: 'views/invite/list.vue',
+			keepAlive: 1
+		},
+		{
+			id: '601',
+			parentId: '6',
+			name: '邀请有礼',
 			type: 1,
-			icon: 'icongongzuotai',
+			icon: 'iconkehuguanli',
 			orderNum: 6,
-			router: '/sass/fest/list',
-			viewPath: 'sass/fest/list',
+			router: '/invite/list',
+			viewPath: 'views/invite/list.vue',
 			keepAlive: 1
 		},
-		// 套餐管理
+		{
+			id: '602',
+			parentId: '6',
+			name: '奖励设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 6,
+			router: '/invite/reward-set',
+			viewPath: 'views/invite/reward-set.vue',
+			keepAlive: 1
+		},
+		// 优惠券
 		{
 			id: '7',
 			parentId: null,
-			name: '套餐',
-			type: 0,
-			icon: 'icongongzuotai',
+			name: '优惠券',
+			type: 1,
+			icon: 'iconkehuguanli',
 			orderNum: 7,
-			router: '/sass/manage/list',
-			viewPath: 'sass/manage/list',
+			router: '/coupon/list',
+			viewPath: 'views/coupon/list.vue',
 			keepAlive: 1
 		},
+		// 促销
+		// {
+		// 	id: '7',
+		// 	parentId: null,
+		// 	name: '促销',
+		// 	type: 0,
+		// 	icon: 'iconkehuguanli',
+		// 	orderNum: 2,
+		// 	router: '/goods/list',
+		// 	viewPath: 'views/goods/goods-list.vue',
+		// 	keepAlive: 1
+		// },
+		// 广告管理
 		{
-			id: '701',
-			parentId: '7',
-			name: '套餐列表',
+			id: '8',
+			parentId: null,
+			name: '广告',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 7,
-			router: '/sass/manage/package',
-			viewPath: 'sass/manage/package',
+			icon: 'iconkehuguanli',
+			orderNum: 8,
+			router: '/ad/list',
+			viewPath: 'views/ad/list.vue',
+			keepAlive: 1
+		},
+		// 员工管理
+		{
+			id: '9',
+			parentId: null,
+			name: '员工',
+			type: 0,
+			icon: 'iconkehuguanli',
+			orderNum: 9,
+			router: '/staff/list',
+			viewPath: 'views/staff/list.vue',
 			keepAlive: 1
 		},
 		{
-			id: '701',
-			parentId: '7',
-			name: '权限管理',
+			id: '901',
+			parentId: '9',
+			name: '员工列表',
 			type: 1,
-			icon: 'icongongzuotai',
-			orderNum: 7,
-			router: '/sass/manage/auth',
-			viewPath: 'sass/manage/auth',
+			icon: 'iconkehuguanli',
+			orderNum: 9,
+			router: '/staff/list',
+			viewPath: 'views/staff/list.vue',
+			keepAlive: 1
+		},
+		{
+			id: '902',
+			parentId: '9',
+			name: '角色列表',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 9,
+			router: '/role/list',
+			viewPath: 'views/staff/role-list.vue',
+			keepAlive: 1
+		},
+		{
+			id: '903',
+			parentId: '9',
+			name: '操作记录',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 9,
+			router: '/operate/list',
+			viewPath: 'views/staff/operate.vue',
+			keepAlive: 1
+		},
+		// 设置
+		{
+			id: '10',
+			parentId: null,
+			name: '设置',
+			type: 0,
+			icon: 'iconkehuguanli',
+			orderNum: 10,
+			router: '/goods/list',
+			viewPath: 'views/goods/goods-list.vue',
+			keepAlive: 1
+		},
+		{
+			id: '101',
+			parentId: '10',
+			name: '微信菜单设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 10,
+			router: '/setting/wx-menu',
+			viewPath: 'views/setting/wx-menu.vue',
+			keepAlive: 1
+		},
+		{
+			id: '102',
+			parentId: '10',
+			name: '新人领券设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 10,
+			router: '/setting/coupon',
+			viewPath: 'views/setting/coupon.vue',
+			keepAlive: 1
+		},
+		{
+			id: '103',
+			parentId: '10',
+			name: '会员等级设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 10,
+			router: '/setting/level',
+			viewPath: 'views/setting/level.vue',
+			keepAlive: 1
+		},
+		{
+			id: '11',
+			parentId: null,
+			name: '代理',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 11,
+			router: '/pages/admin/my-invite',
+			viewPath: 'views/my-invite/index.vue',
+			keepAlive: 1
+		},
+		// {
+		// 	id: '12',
+		// 	parentId: null,
+		// 	name: '收入明细',
+		// 	type: 1,
+		// 	icon: 'iconkehuguanli',
+		// 	orderNum: 12,
+		// 	router: '/admin/assets/list',
+		// 	viewPath: 'views/assets/list.vue',
+		// 	keepAlive: 1
+		// },
+		// ========================================================
+		{
+			id: '13',
+			parentId: '8',
+			name: '新增',
+			type: 2,
+			icon: null,
+			orderNum: 1,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '17',
+			parentId: '27',
+			name: '用户列表',
+			type: 1,
+			icon: 'icon-user',
+			orderNum: 1,
+			router: '/sys/user',
+			viewPath: 'views/system/user/index.vue',
+			keepAlive: 1
+		},
+		{
+			id: '18',
+			parentId: '17',
+			name: '新增',
+			type: 2,
+			icon: null,
+			orderNum: 1,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '23',
+			parentId: '22',
+			name: '新增',
+			type: 2,
+			icon: null,
+			orderNum: 1,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		// {
+		// 	id: '27',
+		// 	parentId: null,
+		// 	name: '权限管理',
+		// 	type: 0,
+		// 	icon: 'icon-permission',
+		// 	orderNum: 1,
+		// 	router: null,
+		// 	viewPath: null,
+		// 	keepAlive: 0
+		// },
+		{
+			id: '29',
+			parentId: '28',
+			name: '日志列表',
+			type: 1,
+			icon: 'icon-log',
+			orderNum: 1,
+			router: '/sys/log',
+			viewPath: 'views/system/log/index.vue',
+			keepAlive: 0
+		},
+		{
+			id: '30',
+			parentId: '29',
+			name: '权限',
+			type: 2,
+			icon: null,
+			orderNum: 1,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '38',
+			parentId: '8',
+			name: '11111',
+			type: 0,
+			icon: null,
+			orderNum: 1,
+			router: null,
+			viewPath: null,
+			keepAlive: 1
+		},
+		{
+			id: '43',
+			parentId: '45',
+			name: 'crud 示例',
+			type: 1,
+			icon: 'icon-radioboxfill',
+			orderNum: 1,
+			router: '/crud',
+			viewPath: 'views/test/crud.vue',
+			keepAlive: 1
+		},
+		// {
+		// 	id: '53',
+		// 	parentId: '1',
+		// 	name: '组件预览',
+		// 	type: 1,
+		// 	icon: 'icon-activityfill',
+		// 	orderNum: 1,
+		// 	router: '/ui-components',
+		// 	viewPath: 'views/workbench/ui-components',
+		// 	keepAlive: 1
+		// },
+		// {
+		// 	id: '11',
+		// 	parentId: null,
+		// 	name: '系统',
+		// 	type: 0,
+		// 	icon: 'icon-systemfill',
+		// 	orderNum: 2,
+		// 	router: '/sys',
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// },
+		{
+			id: '8',
+			parentId: '27',
+			name: '菜单列表',
+			type: 1,
+			icon: 'icon-menu',
+			orderNum: 2,
+			router: '/sys/menu',
+			viewPath: 'views/system/menu/index.vue',
+			keepAlive: 1
+		},
+		{
+			id: '11',
+			parentId: '8',
+			name: '删除',
+			type: 2,
+			icon: null,
+			orderNum: 2,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '19',
+			parentId: '17',
+			name: '删除',
+			type: 2,
+			icon: null,
+			orderNum: 2,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '24',
+			parentId: '22',
+			name: '删除',
+			type: 2,
+			icon: null,
+			orderNum: 2,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		// {
+		// 	id: '28',
+		// 	parentId: '11',
+		// 	name: '系统监控',
+		// 	type: 0,
+		// 	icon: 'icon-monitor',
+		// 	orderNum: 2,
+		// 	router: null,
+		// 	viewPath: null,
+		// 	keepAlive: 0
+		// },
+		// {
+		// 	id: '45',
+		// 	parentId: '1',
+		// 	name: '组件库',
+		// 	type: 0,
+		// 	icon: 'icon-activityfill',
+		// 	orderNum: 2,
+		// 	router: '/ui-lib',
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// },
+		// {
+		// 	id: '46',
+		// 	parentId: '45',
+		// 	name: 'Froala富文本',
+		// 	type: 1,
+		// 	icon: 'icon-radioboxfill',
+		// 	orderNum: 2,
+		// 	router: '/editor-froala',
+		// 	viewPath: 'views/test/editor-froala.vue',
+		// 	keepAlive: 1
+		// },
+		{
+			id: '12',
+			parentId: '8',
+			name: '修改',
+			type: 2,
+			icon: null,
+			orderNum: 3,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '20',
+			parentId: '17',
+			name: '修改',
+			type: 2,
+			icon: null,
+			orderNum: 3,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '22',
+			parentId: '27',
+			name: '角色列表',
+			type: 1,
+			icon: 'icon-role',
+			orderNum: 3,
+			router: '/sys/role',
+			viewPath: 'views/system/role/index.vue',
 			keepAlive: 1
+		},
+		{
+			id: '25',
+			parentId: '22',
+			name: '修改',
+			type: 2,
+			icon: null,
+			orderNum: 3,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		// {
+		// 	id: '47',
+		// 	parentId: null,
+		// 	name: '教程',
+		// 	type: 0,
+		// 	icon: 'icon-weibiaoti4',
+		// 	orderNum: 3,
+		// 	router: '/tutorial',
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// },
+		{
+			id: '49',
+			parentId: '45',
+			name: 'Quill富文本',
+			type: 1,
+			icon: 'icon-radioboxfill',
+			orderNum: 3,
+			router: '/editor-quill',
+			viewPath: 'views/test/editor-quill.vue',
+			keepAlive: 1
+		},
+		{
+			id: '13',
+			parentId: '8',
+			name: '查询',
+			type: 2,
+			icon: null,
+			orderNum: 4,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '21',
+			parentId: '17',
+			name: '查询',
+			type: 2,
+			icon: null,
+			orderNum: 4,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
+		},
+		{
+			id: '26',
+			parentId: '22',
+			name: '查询',
+			type: 2,
+			icon: null,
+			orderNum: 4,
+			router: null,
+			viewPath: null,
+			keepAlive: 0
 		}
+		// {
+		// 	id: '51',
+		// 	parentId: '10',
+		// 	name: '测试404页面',
+		// 	type: 1,
+		// 	icon: 'icon-newfill',
+		// 	orderNum: 10,
+		// 	router: '/test',
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// }
 	]
 };
 
-// Mock.mock(RegExp('/auth/login' + '.*'), 'get', req => {
+// Mock.mock(RegExp('/comm/person' + '.*'), 'get', req => {
 // 	// console.table(req);
 // 	return {
 // 		code: 1,

admin-update/src/views/order/components/card-name.vue

@@ -0,0 +1,50 @@
+<template>
+	<div class="card-name-module">
+		<div class="app-size-30 app-color-0">{{ info.receiveUserName }}</div>
+		<div>{{ info.receiveMobile }}</div>
+		<div>{{ info.receiveAddress }}</div>
+		<div class="card-tag">
+			<!-- <img :src="`${constant.imgUrl}/retail/order/tag.png`" alt="" mode="widthFix" /> -->
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'card-name-module',
+	props: {
+		info: {
+			type: Object,
+			default: () => {}
+		}
+	},
+	data() {
+		return {
+			// constant: this.$constant
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.card-name-module {
+	position: relative;
+	color: $fontColor3;
+	box-shadow: 0 0 10px #ccc;
+	border-radius: 4px;
+	padding: 24px 0 24px 20px;
+	& > div {
+		margin-top: 14px;
+		&:first-child {
+			margin-top: 0;
+		}
+	}
+	.card-tag {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 100px;
+		margin-top: 0;
+	}
+}
+</style>

admin-update/src/views/order/components/order-detail.vue

@@ -0,0 +1,31 @@
+<template>
+	<div class="order-detail">
+		<div class="order-list">
+			<div class="label">订单号</div>
+			<div class="value">201911232495</div>
+		</div>
+		<div class="order-list">
+			<div class="label">下单时间</div>
+			<div class="value">2019-10-10 20:00:00</div>
+		</div>
+		<div class="order-list">
+			<div class="label">商品名称</div>
+			<div class="value">美人尖</div>
+		</div>
+		<div class="order-list">
+			<div class="label">金额</div>
+			<div class="value">￥390</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'order-detail'
+};
+</script>
+
+<style lang="scss" scoped>
+.order-detail {
+}
+</style>

admin-update/src/views/order/components/sel-order.vue

@@ -0,0 +1,20 @@
+<template>
+	<div class="sel-order"></div>
+</template>
+
+<script>
+export default {
+	name: 'sel-order',
+	props: {
+		orderData: {
+			type: Object,
+			default: () => {}
+		}
+	},
+	deta() {
+		return {};
+	}
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,64 +1,106 @@
 <template>
-	<cl-crud class="liu-crud-wrap" @load="onLoad">
-		<!-- tabs -->
-		<template #slot-tabs="{ scope }">
-			<el-tabs class="liu-tabs" type="border-card">
-				<el-tab-pane
-					v-for="(item, index) in tabsData"
-					:key="index"
-					:label="`${item.text}(${item.val})`"
-				></el-tab-pane>
-			</el-tabs>
-		</template>
+	<div class="app-list-content">
+		<cl-crud class="liu-crud-wrap" @load="onLoad">
+			<!-- tabs -->
+			<template #slot-tabs="{ scope }">
+				<el-tabs class="liu-tabs" type="border-card">
+					<el-tab-pane
+						v-for="(item, index) in tabsData"
+						:key="index"
+						:label="`${item.text}(${item.val})`"
+					></el-tab-pane>
+				</el-tabs>
+			</template>
 
-		<!-- 订花人 -->
-		<template #table-column-bookName="{scope}">
-			<div class="book-wrap">
-				<cl-avatar
-					shape="circle"
-					:size="24"
-					:src="scope.row.avatarUrl | default_avatar"
-				></cl-avatar>
-				<div>{{ scope.row.bookName }}</div>
-				<div>{{ scope.row.bookMobile }}</div>
-			</div>
-		</template>
+			<!-- 订花人 -->
+			<template #table-column-bookName="{scope}">
+				<div class="book-wrap">
+					<cl-avatar
+						shape="circle"
+						:size="24"
+						:src="scope.row.avatarUrl | default_avatar"
+					></cl-avatar>
+					<div>{{ scope.row.bookName }}</div>
+					<div>{{ scope.row.bookMobile }}</div>
+				</div>
+			</template>
 
-		<!-- 收花人 -->
-		<template #table-column-receiveUserName="{scope}">
-			<div class="book-wrap">
-				<div>{{ scope.row.receiveUserName }}</div>
-				<div>{{ scope.row.receiveMobile }}</div>
-			</div>
-		</template>
+			<!-- 收花人 -->
+			<template #table-column-receiveUserName="{scope}">
+				<div class="book-wrap">
+					<div>{{ scope.row.receiveUserName }}</div>
+					<div>{{ scope.row.receiveMobile }}</div>
+				</div>
+			</template>
 
-		<!-- 通知送达 -->
-		<template #table-column-receiveUserName="{scope}">
-			<div class="book-wrap">
-				<div>{{ scope.row.receiveUserName }}</div>
-				<div>{{ scope.row.receiveMobile }}</div>
-			</div>
-		</template>
+			<!-- 通知送达 -->
+			<template #table-column-receiveUserName="{scope}">
+				<div class="book-wrap">
+					<div>{{ scope.row.receiveUserName }}</div>
+					<div>{{ scope.row.receiveMobile }}</div>
+				</div>
+			</template>
 
-		<!-- 状态 -->
-		<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>
+			<!-- 状态 -->
+			<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>
 
-		<!-- 操作 -->
-		<!-- 发货 -->
-		<template #table-column-option>
-			<el-button type="text" @click="delBtnFn(scope.row)">继续</el-button>
-			<el-button type="text" @click="delBtnFn(scope.row)">查看配送</el-button>
-			<el-button type="text" @click="delBtnFn(scope.row)">免发货</el-button>
-			<el-button type="text" @click="delBtnFn(scope.row)">发货</el-button>
-		</template>
-	</cl-crud>
+			<!-- 操作 -->
+			<!-- 发货 -->
+			<template #table-column-option>
+				<el-button type="text" @click="delBtnFn(scope.row)">继续</el-button>
+				<el-button type="text" @click="delBtnFn(scope.row)">查看配送</el-button>
+				<el-button type="text" @click="delBtnFn(scope.row)">免发货</el-button>
+				<el-button type="text" @click="delBtnFn(scope.row)">发货</el-button>
+			</template>
+		</cl-crud>
+		<!-- 打单信息 -->
+		<el-dialog
+			title="打单信息"
+			:visible.sync="orderDialog"
+			:close-on-click-modal="false"
+			width="600px"
+		>
+			<div class="order-modal-content">
+				<el-form
+					:model="orderForm"
+					:rules="ruleForm"
+					ref="orderForm"
+					label-width="100px"
+					class="demo-form"
+				>
+					<el-form-item label="收花人姓名" prop="adminName">
+						<el-input
+							v-model="orderForm.adminName"
+							placeholder="请输入姓名"
+							size="small"
+						></el-input>
+					</el-form-item>
+					<el-form-item label="收花人电话" prop="adminName">
+						<el-input
+							v-model="orderForm.adminName"
+							placeholder="请输入电话"
+							size="small"
+						></el-input>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
@@ -86,7 +128,11 @@ export default {
 					text: '已完结',
 					val: 0
 				}
-			]
+			],
+			// dialog
+			orderDialog: false,
+			orderForm: {},
+			ruleForm: {}
 		};
 	},
 	methods: {
@@ -183,46 +229,6 @@ export default {
 				})
 				.done();
 			app.refresh({ status: 0 });
-		},
-		// ===================================================
-		aaa() {
-			let bbb = [
-				'src/pages/User/Index.vue',
-				'src/pages/User/Auth/Default.vue',
-				'src/pages/User/Auth/Login.vue',
-				'src/pages/User/Auth/Register.vue',
-				'src/pages/User/Order/Index.vue',
-				'src/pages/User/Order/Detail.vue',
-				'src/pages/User/Comment/Detail.vue',
-				'src/pages/Trade/Checkout.vue',
-				'src/pages/Cart/Cart.vue',
-				'src/pages/Goods/Detail.vue',
-				'src/pages/Home/Home.vue',
-				'src/components/ProductList.vue',
-				'src/components/tab-down/Frontend.vue',
-				'src/store/modules/shopping.js',
-				'src/store/modules/category.js',
-				'src/store/modules/user.js',
-				'src/config/api/shopping.js',
-				'src/config/api/user.js',
-				'src/assets/css/common/base.scss',
-				'src/assets/i18n/en.js',
-				'src/assets/i18n/zh.js',
-				'src/assets/css/common/common.scss',
-				'src/assets/css/common/vant.scss',
-				'src/assets/img/bg.png',
-				'src/assets/img/gradient_bg.png',
-				'src/assets/img/close.png',
-				'vue.config.js',
-				'package.json',
-
-				'src/components/shop-signs/Frontend.vue',
-				'src/components/tab-down/Frontend.vue',
-				'src/main.js',
-				'src/mixins/common-get.js',
-				'src/pages/Goods/Detail.vue',
-				'src/pages/Home/Home.vue'
-			];
 		}
 	}
 };

admin-update/vue.config.js

@@ -64,13 +64,13 @@ module.exports = {
 
 		proxy: {
 			'/dev': {
-				target: 'http://api.s.huaml.com',
+				target: 'http://api.b.huaml.com',
 
 				changeOrigin: true,
 				pathRewrite: { '^/dev': '' }
 			},
 			'/pro': {
-				target: 'http://api.s.huaml.com',
+				target: 'http://api.b.huaml.com',
 
 				changeOrigin: true,
 				pathRewrite: { '^/pro': '/api' }
@@ -79,6 +79,10 @@ module.exports = {
 	},
 
 	chainWebpack: config => {
+		// 移除 prefetch 插件
+		config.plugins.delete('prefetch');
+		// 移除 preload 插件
+		// config.plugins.delete('preload');
 		// svg
 		config.module.rule('svg').uses.clear();