lalala hace 6 años
padre
commit
48706d1f0a

+ 46 - 34
admin-update/src/mock/userInfo.js

@@ -389,7 +389,7 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '901',
+			id: '902',
 			parentId: '9',
 			name: '员工列表',
 			type: 1,
@@ -400,7 +400,7 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '902',
+			id: '903',
 			parentId: '9',
 			name: '角色列表',
 			type: 1,
@@ -411,7 +411,7 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '903',
+			id: '904',
 			parentId: '9',
 			name: '操作记录',
 			type: 1,
@@ -421,37 +421,16 @@ let menu = {
 			viewPath: 'views/staff/operate.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: '会员等级设置',
+			id: '10',
+			parentId: null,
+			name: '门店管理',
 			type: 1,
-			icon: 'iconkehuguanli',
+			icon: 'iconguanggao',
 			orderNum: 10,
-			router: '/setting/level',
-			viewPath: 'views/setting/level.vue',
+			router: '/shop/list',
+			viewPath: 'views/shop/list.vue',
 			keepAlive: 1
 		},
 		{
@@ -460,23 +439,56 @@ let menu = {
 			name: '开店邀请',
 			type: 1,
 			icon: 'iconyaoqingyouli',
-			orderNum: 10,
+			orderNum: 11,
 			router: '/pages/admin/my-invite',
 			viewPath: 'views/my-invite/index.vue',
 			keepAlive: 1
 		},
 		// 设置
 		{
-			id: '10',
+			id: '11',
 			parentId: null,
 			name: '设置',
 			type: 0,
 			icon: 'iconshezhi',
-			orderNum: 11,
+			orderNum: 12,
 			router: '/goods/list',
 			viewPath: 'views/goods/goods-list.vue',
 			keepAlive: 1
 		},
+		{
+			id: '1101',
+			parentId: '11',
+			name: '微信菜单设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 12,
+			router: '/setting/wx-menu',
+			viewPath: 'views/setting/wx-menu.vue',
+			keepAlive: 1
+		},
+		{
+			id: '1102',
+			parentId: '11',
+			name: '新人领券设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 12,
+			router: '/setting/coupon',
+			viewPath: 'views/setting/coupon.vue',
+			keepAlive: 1
+		},
+		{
+			id: '1103',
+			parentId: '11',
+			name: '会员等级设置',
+			type: 1,
+			icon: 'iconkehuguanli',
+			orderNum: 12,
+			router: '/setting/level',
+			viewPath: 'views/setting/level.vue',
+			keepAlive: 1
+		},
 		// {
 		// 	id: '12',
 		// 	parentId: null,

+ 0 - 0
admin-update/src/views/shop/list.vue


+ 3 - 3
admin-update/src/views/staff/list.vue

@@ -31,9 +31,9 @@
 			</template>
 
 			<!-- 权限设置 -->
-			<template #slot-auth="{scope}">
+			<!-- <template #slot-auth="{scope}">
 				<el-button type="text" @click="authBtnFn(scope.row)">权限设置</el-button>
-			</template>
+			</template> -->
 			<!-- 编辑 -->
 			<template #slot-modify="{scope}">
 				<el-button type="text" @click="modifyBtnFn(scope.row)">编辑</el-button>
@@ -382,7 +382,7 @@ export default {
 						visible: true, // 是否显示
 						// 同 element-ui Table-column Attributes
 						props: {
-							width: 160,
+							width: 120,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'