há 5 anos atrás · fb94b4534a
--- a/ghs/dist/shop/css/chunk-06e77e28.baea0fbc.css
+++ b/ghs/dist/shop/css/chunk-06e77e28.baea0fbc.css
--- a/ghs/dist/shop/css/chunk-08db72f1.8278a4d4.css
+++ b/ghs/dist/shop/css/chunk-08db72f1.8278a4d4.css
--- a/ghs/dist/shop/css/chunk-311b4fae.51713195.css
+++ b/ghs/dist/shop/css/chunk-311b4fae.51713195.css
--- a/ghs/dist/shop/css/chunk-3614a4ba.4464cdc0.css
+++ b/ghs/dist/shop/css/chunk-3614a4ba.4464cdc0.css
--- a/ghs/dist/shop/css/chunk-4e3032cf.97936f88.css
+++ b/ghs/dist/shop/css/chunk-4e3032cf.97936f88.css
--- a/ghs/dist/shop/css/chunk-5b387fbb.4ab2a055.css
+++ b/ghs/dist/shop/css/chunk-5b387fbb.4ab2a055.css
--- a/ghs/dist/shop/css/chunk-6df6c9b5.30289845.css
+++ b/ghs/dist/shop/css/chunk-6df6c9b5.30289845.css
--- a/ghs/dist/shop/css/chunk-7f53f7b6.150e80dd.css
+++ b/ghs/dist/shop/css/chunk-7f53f7b6.150e80dd.css
--- a/ghs/dist/shop/css/chunk-83068a22.66dadb68.css
+++ b/ghs/dist/shop/css/chunk-83068a22.66dadb68.css
--- a/ghs/dist/shop/index.html
+++ b/ghs/dist/shop/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.bb70123a.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.bb70123a.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.67a1d637.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.67a1d637.js"></script></body></html>
			
--- a/ghs/dist/shop/js/app.67a1d637.js
+++ b/ghs/dist/shop/js/app.67a1d637.js
--- a/ghs/dist/shop/js/app.bb70123a.js
+++ b/ghs/dist/shop/js/app.bb70123a.js
--- a/ghs/dist/shop/js/chunk-06e77e28.8f71056f.js
+++ b/ghs/dist/shop/js/chunk-06e77e28.8f71056f.js
--- a/ghs/dist/shop/js/chunk-08db72f1.7616665b.js
+++ b/ghs/dist/shop/js/chunk-08db72f1.7616665b.js
--- a/ghs/dist/shop/js/chunk-311b4fae.5ce658da.js
+++ b/ghs/dist/shop/js/chunk-311b4fae.5ce658da.js
--- a/ghs/dist/shop/js/chunk-3614a4ba.4f9ccdb9.js
+++ b/ghs/dist/shop/js/chunk-3614a4ba.4f9ccdb9.js
--- a/ghs/dist/shop/js/chunk-4e3032cf.5650aaea.js
+++ b/ghs/dist/shop/js/chunk-4e3032cf.5650aaea.js
--- a/ghs/dist/shop/js/chunk-5b387fbb.21948d32.js
+++ b/ghs/dist/shop/js/chunk-5b387fbb.21948d32.js
--- a/ghs/dist/shop/js/chunk-6df6c9b5.a42d0251.js
+++ b/ghs/dist/shop/js/chunk-6df6c9b5.a42d0251.js
--- a/ghs/dist/shop/js/chunk-83068a22.64ac9d7b.js
+++ b/ghs/dist/shop/js/chunk-83068a22.64ac9d7b.js
--- a/ghs/src/mock/userInfo.js
+++ b/ghs/src/mock/userInfo.js
@@ -159,7 +159,7 @@ let menu = {
 
				 		'sys:log:clear'
			
 
				 	],
			
 
				 	menus: [
			
 
				-		//注意如果子菜单有多个，父菜单应设置成type=0 ！！！！
			
 
				+		//注意如果子菜单有多个，父菜单应设置成type=0 ！！！！！！！！！！！！ shish 2021.3.25
			
 
				 		{
			
 
				 			id: '1',
			
 
				 			parentId: null,
			
@@ -211,7 +211,7 @@ let menu = {
 
				 			id: '3',
			
 
				 			parentId: null,
			
 
				 			name: '订单',
			
 
				-			type: 1,
			
 
				+			type: 0,
			
 
				 			icon: 'icondingdanguanli',
			
 
				 			orderNum: 3,
			
 
				 			router: '/order/list',
			
@@ -228,6 +228,17 @@ let menu = {
 
				             orderNum: 3,
			
 
				             router: '/order/list',
			
 
				             viewPath: 'views/order/list.vue',
			
 
				+            keepAlive: 1
			
 
				+		},
			
 
				+        {
			
 
				+            id: '302',
			
 
				+            parentId: 3,
			
 
				+            name: '开单',
			
 
				+            type: 1,
			
 
				+            icon: 'icondingdanguanli',
			
 
				+            orderNum: 3,
			
 
				+            router: '/order/add',
			
 
				+            viewPath: 'views/order/add.vue',
			
 
				             keepAlive: 1
			
 
				 		},
			
 
				 		// 商品管理
			
--- a/ghs/src/pages/layout/index.vue
+++ b/ghs/src/pages/layout/index.vue
@@ -75,7 +75,7 @@ export default {
 
				 		background-color: #fff;
			
 
				 		overflow: hidden;
			
 
				 		height: 100%;
			
 
				-		width: 220px;
			
 
				+		width: 190px;
			
 
				 	}
			
 
				 
			
 
				 	// .wrapper-right {
			
--- a/ghs/src/pages/layout/slider/index.vue
+++ b/ghs/src/pages/layout/slider/index.vue
@@ -105,7 +105,7 @@ export default {
 
				 	@include disFlex(flex-start, flex-start);
			
 
				 	.main-list {
			
 
				 		height: 100%;
			
 
				-		width: 110px;
			
 
				+		width: 105px;
			
 
				 		background-color: #3d3f42;
			
 
				 		box-shadow: 6px 6px 20px #ccc;
			
 
				 		.list {
			
@@ -155,10 +155,12 @@ export default {
 
				 			&.active {
			
 
				 				color: $mainColor;
			
 
				 				background-color: #f0f2f6;
			
 
				+				width:100%;
			
 
				 			}
			
 
				 			&:hover {
			
 
				 				color: $mainColor;
			
 
				 				background-color: #f0f2f6;
			
 
				+				width:100%;
			
 
				 			}
			
 
				 		}
			
 
				 	}
			
--- a/ghs/src/views/home.vue
+++ b/ghs/src/views/home.vue
@@ -195,20 +195,15 @@ export default {
 
				 					icon: 'icondingdanguanli',
			
 
				 					url: '/order/list'
			
 
				 				},
			
 
				-				{
			
 
				-					name: '图库',
			
 
				-					icon: 'iconshangpinguanli',
			
 
				-					url: '/goods/img-store'
			
 
				-				},
			
 
				 				{
			
 
				 					name: '客户管理',
			
 
				 					icon: 'iconkehuguanli',
			
 
				 					url: '/member/list'
			
 
				 				},
			
 
				 				{
			
 
				-					name: '添加商品',
			
 
				+					name: '开单',
			
 
				 					icon: 'icontupiantianjia',
			
 
				-					url: '/goods/add'
			
 
				+					url: '/order/add'
			
 
				 				},
			
 
				 				{
			
 
				 					name: '商品管理',
			
@@ -224,14 +219,6 @@ export default {
 
				 					name: '广告管理',
			
 
				 					icon: 'iconguanggao',
			
 
				 					url: '/ad/list'
			
 
				-				},
			
 
				-				{
			
 
				-					name: '客服',
			
 
				-					icon: 'iconkefu'
			
 
				-				},
			
 
				-				{
			
 
				-					name: '拼团',
			
 
				-					icon: 'iconlianjie'
			
 
				 				}
			
 
				 			],
			
 
				 			// 总统计
			
--- a/ghs/src/views/order/add.vue
+++ b/ghs/src/views/order/add.vue
@@ -0,0 +1,320 @@
 
				+<template>
			
 
				+	<div class="app-list-content">
			
 
				+		<div class="content-wrap">
			
 
				+
			
 
				+		</div>
			
 
				+	</div>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import { mapGetters } from 'vuex';
			
 
				+	import operateLineModule from '@/components/module/operate-line';
			
 
				+	export default {
			
 
				+		name: 'order-add',
			
 
				+		components: {
			
 
				+			operateLineModule
			
 
				+		},
			
 
				+		data() {
			
 
				+			return {
			
 
				+				form: {
			
 
				+					name: '',
			
 
				+					menuOption: '0',
			
 
				+					replyUrl: '',
			
 
				+					targetId: 0
			
 
				+				},
			
 
				+				rule: {},
			
 
				+				isModifyParents: false,
			
 
				+				// isAdd: false,
			
 
				+				addDialog: false,
			
 
				+				activeIndex: null,
			
 
				+				subActiveIndex: null,
			
 
				+				menuData: [],
			
 
				+				// 常用链接
			
 
				+				urlIndex: null,
			
 
				+				commonUrlData: [],
			
 
				+				// 操作菜单
			
 
				+				operateShow: [],
			
 
				+				operateData: null,
			
 
				+				// 按钮列表
			
 
				+				btnData: []
			
 
				+			};
			
 
				+		},
			
 
				+		computed: {
			
 
				+			...mapGetters(['shopInfo', 'userInfo'])
			
 
				+		},
			
 
				+		created() {
			
 
				+			this.init();
			
 
				+		},
			
 
				+		methods: {
			
 
				+			init() {
			
 
				+				this._getDet();
			
 
				+				this._getUrl();
			
 
				+			},
			
 
				+			_getDet() {
			
 
				+				this.$service.setting.getMenu().then(res => {
			
 
				+					this.menuData = res.map(e => {
			
 
				+						if (!e.children) {
			
 
				+							e.children = [];
			
 
				+						}
			
 
				+
			
 
				+						return e;
			
 
				+					});
			
 
				+					res.map(() => {
			
 
				+						this.operateShow.push(false);
			
 
				+					});
			
 
				+				});
			
 
				+			},
			
 
				+			_getUrl() {
			
 
				+				this.$service.single.commonUrl().then(res => {
			
 
				+					this.commonUrlData = res;
			
 
				+				});
			
 
				+			},
			
 
				+			async submitFn() {
			
 
				+				console.log(this.menuData);
			
 
				+				// return false;
			
 
				+				await this.$service.setting.updateMenu(this.menuData).then(res => {
			
 
				+					this.$message.success(res.msg || '提交');
			
 
				+					// this.closeOperate();
			
 
				+					this.resetForm();
			
 
				+				});
			
 
				+			},
			
 
				+			// operate
			
 
				+			menuClickFn(item, index) {
			
 
				+				this.isModifyParents = true;
			
 
				+				// this.isAdd = false;
			
 
				+
			
 
				+				this.closeOperate();
			
 
				+				this.activeIndex = index;
			
 
				+				this.operateShow[index] = true;
			
 
				+				this.operateData = item.children || [];
			
 
				+				// 修改
			
 
				+				// this.dialogData = item;
			
 
				+				// this.form.name = JSON.parse(JSON.stringify(item.name));
			
 
				+				console.log('江总', item);
			
 
				+				console.log('江总11', this.commonUrlData);
			
 
				+				Object.keys(this.form).forEach(i => {
			
 
				+					this.form[i] = item[i];
			
 
				+				});
			
 
				+
			
 
				+				this.addDialog = true;
			
 
				+			},
			
 
				+			// operate
			
 
				+			operateClickFn(item) {
			
 
				+				this.isModifyParents = false;
			
 
				+				// this.isAdd = false;
			
 
				+				this.subActiveIndex = item.index;
			
 
				+				console.log('item', item);
			
 
				+				// this.dialogData = item;
			
 
				+				item.targetId = item.targetId ? parseInt(item.targetId) : 0;
			
 
				+
			
 
				+				Object.keys(this.form).forEach(i => {
			
 
				+					this.form[i] = item[i];
			
 
				+				});
			
 
				+				this.addDialog = true;
			
 
				+			},
			
 
				+			operateAddFn(index) {
			
 
				+				if (this.operateData.length > 4) {
			
 
				+					this.$message.warning('亲，最多只能设置五个子菜单！')
			
 
				+					return false
			
 
				+				}
			
 
				+				// this.isModifyParents = false;
			
 
				+
			
 
				+				let form = {
			
 
				+					name: '子菜单名',
			
 
				+					menuOption: '0',
			
 
				+					replyUrl: '',
			
 
				+					targetId: 0
			
 
				+				};
			
 
				+				
			
 
				+				this.$set(this.operateShow, this.activeIndex, false);
			
 
				+				this.operateData.push(form);
			
 
				+				this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
			
 
				+
			
 
				+				setTimeout(() => {
			
 
				+					this.$set(this.operateShow, this.activeIndex, true);
			
 
				+				});
			
 
				+				// this.isAdd = true;
			
 
				+				// this.dialogData = this.menuData[3].children[index];
			
 
				+				// this.addDialog = true;
			
 
				+				// if (this.$refs['form']) {
			
 
				+				// 	console.log('asdf');
			
 
				+				// 	this.resetForm()
			
 
				+				// }
			
 
				+			},
			
 
				+			operateDelFn(index) {
			
 
				+				console.log('我点击了删除按钮！', index)
			
 
				+				// this.closeOperate();
			
 
				+				this.$set(this.operateShow, this.activeIndex, false);
			
 
				+				this.operateData.splice(index, 1);
			
 
				+				
			
 
				+				this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
			
 
				+
			
 
				+				setTimeout(() => {
			
 
				+					this.$set(this.operateShow, this.activeIndex, true);
			
 
				+				});
			
 
				+			},
			
 
				+			closeOperate() {
			
 
				+				this.activeIndex = null;
			
 
				+				this.operateShow = this.operateShow.map(e => (e = false));
			
 
				+				this.addDialog = false;
			
 
				+				// if (this.addDialog) {
			
 
				+				// 	this.resetForm();
			
 
				+				// }
			
 
				+			},
			
 
				+			closeOptionFn() {
			
 
				+				this.closeOperate();
			
 
				+				this.resetForm();
			
 
				+			},
			
 
				+			// modal
			
 
				+			confirmForm() {
			
 
				+				let form = JSON.parse(JSON.stringify(this.form));
			
 
				+
			
 
				+				if (this.isModifyParents) {
			
 
				+					Object.keys(form).forEach(i => {
			
 
				+						this.menuData[this.activeIndex][i] = form[i];
			
 
				+					});
			
 
				+					console.log('江总22', this.menuData);
			
 
				+					// 如果是父菜单操作时
			
 
				+					// this.menuData[this.activeIndex].name = form.name;
			
 
				+				} else {
			
 
				+					// 如果是子菜单操作时
			
 
				+					// if (this.isAdd) {
			
 
				+					// } else {
			
 
				+					this.operateData[this.subActiveIndex] = form;
			
 
				+					// }
			
 
				+
			
 
				+					console.log('this.operateData', this.operateData)
			
 
				+					
			
 
				+					this.menuData[this.activeIndex].children = JSON.parse(JSON.stringify(this.operateData));
			
 
				+				}
			
 
				+				this.submitFn().then(res => {
			
 
				+					console.log('this.activeIndex', this.activeIndex);
			
 
				+					
			
 
				+					this.addDialog = false;
			
 
				+					// if (this.isAdd) {
			
 
				+					// }
			
 
				+				});
			
 
				+			},
			
 
				+			resetForm() {
			
 
				+				this.form = {
			
 
				+					name: '',
			
 
				+					menuOption: '0',
			
 
				+					replyUrl: '',
			
 
				+					targetId: 0
			
 
				+				};
			
 
				+				this.$refs['form'].resetFields();
			
 
				+				// this.addDialog = false;
			
 
				+			}
			
 
				+		}
			
 
				+	};
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+	.app-list-content {
			
 
				+		background-color: #fff;
			
 
				+	}
			
 
				+	.content-wrap {
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+	}
			
 
				+	// wx 容器
			
 
				+	.wx-wrap {
			
 
				+		width: 375px;
			
 
				+		margin: 0 15px;
			
 
				+		padding-top: 20px;
			
 
				+		flex-shrink: 0;
			
 
				+		// 头部
			
 
				+		.wx-bar {
			
 
				+			position: relative;
			
 
				+			.bar-text {
			
 
				+				position: absolute;
			
 
				+				top: 30px;
			
 
				+				font-size: 17px;
			
 
				+				font-weight: 500;
			
 
				+				color: #fff;
			
 
				+				width: 100%;
			
 
				+				text-align: center;
			
 
				+			}
			
 
				+		}
			
 
				+		.wx-content {
			
 
				+			width: 100%;
			
 
				+			height: 555px;
			
 
				+			background-color: #ededed;
			
 
				+		}
			
 
				+		// 按钮
			
 
				+		.wx-btn {
			
 
				+			@include disFlex(center, space-between);
			
 
				+			background-color: #f7f7f7;
			
 
				+			padding: 10px;
			
 
				+			height: 45px;
			
 
				+			.key-btn {
			
 
				+				width: 13%;
			
 
				+				.key-btn-img {
			
 
				+					width: 40px;
			
 
				+				}
			
 
				+			}
			
 
				+			.menu-btn {
			
 
				+				width: 29%;
			
 
				+				height: calc(100% - 30px);
			
 
				+				@include disFlex(center, center);
			
 
				+				border-left: 2px solid $borderColor;
			
 
				+				&.active {
			
 
				+					/deep/.operate-module-line {
			
 
				+						.operate-btn {
			
 
				+							color: $mainColor;
			
 
				+							.iconfont {
			
 
				+								color: #09bb07;
			
 
				+							}
			
 
				+						}
			
 
				+					}
			
 
				+				}
			
 
				+				.iconfont-blo {
			
 
				+					margin-right: 6px;
			
 
				+				}
			
 
				+				.iconfont {
			
 
				+					color: $fontColor3;
			
 
				+					font-size: 24px;
			
 
				+					transform: scale(0.6);
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+	// 编辑块
			
 
				+	.ad-modal-content {
			
 
				+		width: 640px;
			
 
				+		min-width: 640px;
			
 
				+		height: 640px;
			
 
				+		border: 20px solid #f7f7f7;
			
 
				+		// border-top: 0;
			
 
				+		margin-top: 20px;
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+		// padding: 20px;
			
 
				+		background-color: #f7f7f7;
			
 
				+
			
 
				+		.ad-modal-wrap {
			
 
				+			width: 100%;
			
 
				+			.content-j-wrap {
			
 
				+				width: 100%;
			
 
				+				height: 460px;
			
 
				+				background-color: #fff;
			
 
				+				padding-top: 10px;
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		.dialog-footer {
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			// justify-content: center;
			
 
				+			// padding-left: 100px;
			
 
				+			margin-top: 10px;
			
 
				+			.el-button {
			
 
				+				margin: 0 10px;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+	.prompt-text {
			
 
				+		padding: 30px 30px 60px 30px;
			
 
				+		color: $fontColor3;
			
 
				+	}
			
 
				+</style>
			
--- a/hd/dist/shop/css/chunk-06e77e28.baea0fbc.css
+++ b/hd/dist/shop/css/chunk-06e77e28.baea0fbc.css
--- a/hd/dist/shop/css/chunk-0ee503c2.4bac934b.css
+++ b/hd/dist/shop/css/chunk-0ee503c2.4bac934b.css
--- a/hd/dist/shop/css/chunk-25369892.2bb5f524.css
+++ b/hd/dist/shop/css/chunk-25369892.2bb5f524.css
--- a/hd/dist/shop/css/chunk-311b4fae.51713195.css
+++ b/hd/dist/shop/css/chunk-311b4fae.51713195.css
--- a/hd/dist/shop/css/chunk-5d5eb60a.1fe1c572.css
+++ b/hd/dist/shop/css/chunk-5d5eb60a.1fe1c572.css
--- a/hd/dist/shop/css/chunk-63c7baa6.2a866365.css
+++ b/hd/dist/shop/css/chunk-63c7baa6.2a866365.css
--- a/hd/dist/shop/css/chunk-7f53f7b6.150e80dd.css
+++ b/hd/dist/shop/css/chunk-7f53f7b6.150e80dd.css
--- a/hd/dist/shop/index.html
+++ b/hd/dist/shop/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.f004e692.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.f004e692.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.c78075bf.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.c78075bf.js"></script></body></html>
			
--- a/hd/dist/shop/js/app.c78075bf.js
+++ b/hd/dist/shop/js/app.c78075bf.js
--- a/hd/dist/shop/js/chunk-06e77e28.66f38861.js
+++ b/hd/dist/shop/js/chunk-06e77e28.66f38861.js
--- a/hd/dist/shop/js/chunk-0ee503c2.7363c057.js
+++ b/hd/dist/shop/js/chunk-0ee503c2.7363c057.js
--- a/hd/dist/shop/js/chunk-25369892.5b8094c9.js
+++ b/hd/dist/shop/js/chunk-25369892.5b8094c9.js
--- a/hd/dist/shop/js/chunk-311b4fae.82a55ea7.js
+++ b/hd/dist/shop/js/chunk-311b4fae.82a55ea7.js
--- a/hd/dist/shop/js/chunk-5d5eb60a.b36add10.js
+++ b/hd/dist/shop/js/chunk-5d5eb60a.b36add10.js
--- a/hd/dist/shop/js/chunk-63c7baa6.52f3df46.js
+++ b/hd/dist/shop/js/chunk-63c7baa6.52f3df46.js
--- a/hd/dist/shop/js/chunk-7f53f7b6.f8164c84.js
+++ b/hd/dist/shop/js/chunk-7f53f7b6.f8164c84.js
--- a/hd/dist/shop/js/chunk-c1c757d6.210d453d.js
+++ b/hd/dist/shop/js/chunk-c1c757d6.210d453d.js
--- a/hd/src/pages/layout/index.vue
+++ b/hd/src/pages/layout/index.vue
@@ -75,7 +75,7 @@ export default {
 
				 		background-color: #fff;
			
 
				 		overflow: hidden;
			
 
				 		height: 100%;
			
 
				-		width: 220px;
			
 
				+		width: 190px;
			
 
				 	}
			
 
				 
			
 
				 	// .wrapper-right {
			
--- a/hd/src/pages/layout/slider/index.vue
+++ b/hd/src/pages/layout/slider/index.vue
@@ -105,7 +105,7 @@ export default {
 
				 	@include disFlex(flex-start, flex-start);
			
 
				 	.main-list {
			
 
				 		height: 100%;
			
 
				-		width: 110px;
			
 
				+		width: 105px;
			
 
				 		background-color: #3d3f42;
			
 
				 		box-shadow: 6px 6px 20px #ccc;
			
 
				 		.list {
			
@@ -155,10 +155,12 @@ export default {
 
				 			&.active {
			
 
				 				color: $mainColor;
			
 
				 				background-color: #f0f2f6;
			
 
				+				width:100%;
			
 
				 			}
			
 
				 			&:hover {
			
 
				 				color: $mainColor;
			
 
				 				background-color: #f0f2f6;
			
 
				+				width:100%;
			
 
				 			}
			
 
				 		}
			
 
				 	}
			
--- a/hd/src/pages/layout/topbar/index.vue
+++ b/hd/src/pages/layout/topbar/index.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				 	<div class="scope-topbar">
			
 
				 		<div class="collapse">
			
 
				-			<img class="avatar" :src="logoUrl | default_avatar" alt="花卉宝" />
			
 
				+			<img class="avatar" :src="logoUrl | default_avatar" alt="" />
			
 
				 			<div>
			
 
				 				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span> -->
			
 
				 				<!-- <span v-else>花卉宝</span> -->