后台菜单调整

admin-update/src/mock/userInfo.js

@@ -182,6 +182,17 @@ let menu = {
 			viewPath: 'views/home.vue',
 			keepAlive: 1
 		},
+        {
+            id: '101',
+            parentId: 1,
+            name: '今日概况',
+            type: 1,
+            icon: 'icongongzuotai',
+            orderNum: 1,
+            router: '/console/index',
+            viewPath: 'views/home.vue',
+            keepAlive: 1
+        },
 		// 客户管理
 		{
 			id: '2',
@@ -194,6 +205,18 @@ let menu = {
 			viewPath: 'views/member/list.vue',
 			keepAlive: 1
 		},
+        // 客户管理
+        {
+            id: '201',
+            parentId: 2,
+            name: '客户列表',
+            type: 1,
+            icon: 'iconkehuguanli',
+            orderNum: 2,
+            router: '/member/list',
+            viewPath: 'views/member/list.vue',
+            keepAlive: 1
+        },
 		// 订单管理
 		{
 			id: '3',
@@ -206,6 +229,18 @@ let menu = {
 			viewPath: 'views/order/list.vue',
 			keepAlive: 1
 		},
+        // 订单列表
+        {
+            id: '301',
+            parentId: 3,
+            name: '订单列表',
+            type: 1,
+            icon: 'icondingdanguanli',
+            orderNum: 3,
+            router: '/order/list',
+            viewPath: 'views/order/list.vue',
+            keepAlive: 1
+        },
 		// 商品管理
 		{
 			id: '4',
@@ -306,6 +341,17 @@ let menu = {
 			viewPath: 'views/goods/img-store.vue',
 			keepAlive: 1
 		},
+        {
+            id: '501',
+            parentId: 5,
+            name: '列表',
+            type: 1,
+            icon: 'iconkehuguanli',
+            orderNum: 5,
+            router: '/goods/img-store',
+            viewPath: 'views/goods/img-store.vue',
+            keepAlive: 1
+        },
 		// 邀请有礼
 		{
 			id: '6',
@@ -352,6 +398,18 @@ let menu = {
 			viewPath: 'views/coupon/list.vue',
 			keepAlive: 1
 		},
+        // 优惠券
+        {
+            id: '701',
+            parentId: 7,
+            name: '列表',
+            type: 1,
+            icon: 'iconyouhuiquan',
+            orderNum: 7,
+            router: '/coupon/list',
+            viewPath: 'views/coupon/list.vue',
+            keepAlive: 1
+        },
 		// 促销
 		// {
 		// 	id: '7',
@@ -376,6 +434,18 @@ let menu = {
 			viewPath: 'views/ad/list.vue',
 			keepAlive: 1
 		},
+
+        {
+            id: '808',
+            parentId: '8',
+            name: '广告列表',
+            type: 1,
+            icon: 'iconguanggao',
+            orderNum: 8,
+            router: '/ad/list',
+            viewPath: 'views/ad/list.vue',
+            keepAlive: 1
+        },
 		// 员工管理
 		{
 			id: '9',
@@ -433,6 +503,18 @@ let menu = {
 			viewPath: 'views/shop/list.vue',
 			keepAlive: 1
 		},
+        // 门店管理
+        {
+            id: '1001',
+            parentId: 10,
+            name: '门店列表',
+            type: 1,
+            icon: 'iconguanggao',
+            orderNum: 10,
+            router: '/shop/list',
+            viewPath: 'views/shop/list.vue',
+            keepAlive: 1
+        },
 		{
 			id: '11',
 			parentId: null,
@@ -444,9 +526,20 @@ let menu = {
 			viewPath: 'views/my-invite/index.vue',
 			keepAlive: 1
 		},
+        {
+            id: '1101',
+            parentId: 11,
+            name: '邀请列表',
+            type: 1,
+            icon: 'iconyaoqingyouli',
+            orderNum: 11,
+            router: '/pages/admin/my-invite',
+            viewPath: 'views/my-invite/index.vue',
+            keepAlive: 1
+        },
 		// 设置
 		{
-			id: '11',
+			id: '12',
 			parentId: null,
 			name: '设置',
 			type: 0,
@@ -457,8 +550,8 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '1101',
-			parentId: '11',
+			id: '1201',
+			parentId: '12',
 			name: '微信菜单',
 			type: 1,
 			icon: 'iconkehuguanli',
@@ -468,8 +561,8 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '1102',
-			parentId: '11',
+			id: '1202',
+			parentId: '12',
 			name: '新人优惠券',
 			type: 1,
 			icon: 'iconkehuguanli',
@@ -479,8 +572,8 @@ let menu = {
 			keepAlive: 1
 		},
 		{
-			id: '1103',
-			parentId: '11',
+			id: '1203',
+			parentId: '12',
 			name: '会员等级',
 			type: 1,
 			icon: 'iconkehuguanli',
@@ -578,17 +671,17 @@ let menu = {
 			viewPath: null,
 			keepAlive: 0
 		},
-		{
-			id: '38',
-			parentId: '8',
-			name: '11111',
-			type: 0,
-			icon: null,
-			orderNum: 1,
-			router: null,
-			viewPath: null,
-			keepAlive: 1
-		},
+		// {
+		// 	id: '38',
+		// 	parentId: '8',
+		// 	name: '11111',
+		// 	type: 0,
+		// 	icon: null,
+		// 	orderNum: 1,
+		// 	router: null,
+		// 	viewPath: null,
+		// 	keepAlive: 1
+		// },
 		{
 			id: '43',
 			parentId: '45',
@@ -622,50 +715,50 @@ let menu = {
 		// 	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: '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',

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

@@ -19,8 +19,8 @@
 
 			<template #table-column-avatarUrl="{scope}">
 				<cl-avatar
-					:size="25"
-					:src="scope.row.smallAvatarUrl | default_avatar"
+					:size="22"
+					:src="scope.row.smallAvatarUrl"
 					:style="{ margin: 'auto' }"
 				></cl-avatar>
 
@@ -36,11 +36,7 @@
 			</template>
 
 			<template #table-column-userName="{scope}">
-
-
-					<el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.userName}}</el-link>
-
-
+				<el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.userName}}</el-link>
 			</template>
 
 			<template #table-column-balance="{scope}">
@@ -52,14 +48,12 @@
 			</template>
 
 			<template #table-column-subscribe="{scope}">
-				<div class="store-icon">
 					<i
 						class="el-icon-success"
 						v-if="scope.row.subscribe == 1"
-						style="color:#67C23A"
+						style="color:#67C23A;font-size:19px;"
 					></i>
-					<i class="el-icon-success" v-else style="color:#C0C4CC"></i>
-				</div>
+					<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
 			</template>
 
 			<template #table-column-store="{scope}">
@@ -336,12 +330,6 @@ export default {
 							align: 'center',
 							width: 120
 						},
-						{
-							prop: 'store',
-							label: '到店',
-							align: 'center',
-							width: 100
-						},
 						{
 							prop: 'actPrice',
 							label: '会员级别',
@@ -365,6 +353,12 @@ export default {
 							sortable: false,
 							width: 150
 						},
+						{
+							prop: 'store',
+							label: '到店',
+							align: 'center',
+							width: 100
+						},
 						{
 							prop: 'visitTimeFormat',
 							label: '最近访问',

admin-update/src/views/my-invite/index.vue

@@ -5,8 +5,8 @@
 				<div class="avatar-wrap-left">
 					<cl-avatar
 						shape="circle"
-						:size="60"
-						:src="shopInfo.smallLogoUrl | default_avatar"
+						:size="45"
+						:src="shopInfo.smallLogoUrl"
 					></cl-avatar>
 				</div>
 				<div class="avatar-wrap-right">
@@ -178,14 +178,14 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'name',
-							label: '花店名称',
+							prop: 'logo',
+							label: '图片',
 							align: 'center',
 							'min-width': 100
 						},
 						{
-							prop: 'logo',
-							label: '图片',
+							prop: 'name',
+							label: '花店名称',
 							align: 'center',
 							'min-width': 100
 						},

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

@@ -107,17 +107,17 @@
 									<div class="prompt-text">送达会自动通知客户哦</div>
 								</div>
 							</template>
-							<!-- 订单归类 -->
+							<!-- 订单分类 -->
 							<template v-if="item.actionName == '完成'">
 								<div v-if="!$util.isEmpty(item.classify)">
 									<div class="label-list">
-										订单归类：{{ item.classify.category }}
+										订单分类：{{ item.classify.category }}
 									</div>
 									<div class="label-list">用途：{{ item.classify.usage }}</div>
 								</div>
 								<div v-else>
 									<el-button type="primary" @click="orderClassFn"
-										>订单归类</el-button
+										>订单分类</el-button
 									>
 								</div>
 							</template>
@@ -325,9 +325,9 @@
 				<el-button type="primary" size="small" @click="submitShipFn">确认</el-button>
 			</div>
 		</el-dialog>
-		<!-- 订单归类 -->
+		<!-- 订单分类 -->
 		<el-dialog
-			title="订单归类"
+			title="订单分类"
 			:visible.sync="categoryDialog"
 			:close-on-click-modal="false"
 			width="600px"
@@ -494,7 +494,7 @@ export default {
 					value: 1
 				}
 			],
-			// 订单归类
+			// 订单分类
 			categoryDialog: false,
 			categoryForm: {
 				categoryId: '',
@@ -656,11 +656,11 @@ export default {
 				this.getDet();
 			});
 		},
-		// 订单归类
+		// 订单分类
 		orderClassFn() {
 			this.categoryDialog = true;
 		},
-		// 确认订单归类
+		// 确认订单分类
 		orderClassConfirmFn() {
 			if (!this.categoryForm.categoryId || !this.categoryForm.usageId) {
 				this.$message.error('请先选择分类或者用途！');
@@ -669,7 +669,7 @@ export default {
 			this.$service.single
 				.orderClass({ id: this.orderData.id, ...this.categoryForm })
 				.then(res => {
-					this.$message.success('订单归类成功！');
+					this.$message.success('订单分类成功！');
 					this.getDet();
 					// this.categoryDialog = false;
 					this.resetForm();

admin-update/src/views/setting/level.vue

@@ -38,7 +38,7 @@
 		</div>
 		<!-- 提示 -->
 		<div v-if="isModify" class="prompt-text">
-			提示：点此上方的数字即可直接进行修改。提交后不能再修改, 请 谨慎操作。
+			点此上方的数字即可修改，提交后将不能再次修改，请谨慎操作。
 		</div>
 		<!-- 按钮 -->
 		<div v-if="isModify" class="btn-wrap">

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

@@ -1,15 +1,24 @@
 <template>
 	<div class="app-list-content">
 		<cl-crud class="liu-crud-wrap" @load="onLoad">
-			<template #table-column-nickName="{scope}">
-				<div class="flex-center">
+			<template #table-column-userId="{scope}">
 
+                <i
+                    class="el-icon-success"
+                    v-if="scope.row.userId != 0"
+                    style="color:#67C23A;font-size:19px;"
+                ></i>
+                <i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
 
-					<el-avatar src="scope.row.avatarUrl" size="small"></el-avatar>
-
-					<div class="app-margin-left-10">{{ scope.row.nickName }}</div>
-				</div>
 			</template>
+			<template #table-column-avatar="{scope}">
+                <cl-avatar
+                    shape="circle"
+                    :size="24"
+                    :src="scope.row.avatarUrl"
+                    :style="{ margin: 'auto' }"
+                ></cl-avatar>
+            </template>
 
 			<template #table-column-incomeNotice="{scope}">
 				<el-switch
@@ -69,6 +78,13 @@
 							size="small"
 						></el-input>
 					</el-form-item>
+					<el-form-item label="手机号" prop="mobile">
+						<el-input
+							v-model="adForm.mobile"
+							placeholder="请输入手机号"
+							size="small"
+						></el-input>
+					</el-form-item>
 					<el-form-item label="角色" prop="roleId">
 						<el-select
 							v-model="adForm.roleName"
@@ -84,12 +100,12 @@
 							>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="关联微信" prop="userId">
+					<el-form-item label="绑定微信" prop="userId">
 						<div>
 							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
 								<div class="member-img">
 									<cl-avatar
-										shape="square"
+										shape="circle"
 										:size="40"
 										:src="memberData.avatarUrl | default_avatar"
 									></cl-avatar>
@@ -105,7 +121,6 @@
 								>
 							</div>
 						</div>
-						<div>请先关注公从号，绑定后可以在移动端自动登陆。</div>
 					</el-form-item>
 					<el-form-item label="收款通知" prop="remind">
 						<el-switch
@@ -114,13 +129,6 @@
 							inactive-value="0"
 						></el-switch>
 					</el-form-item>
-					<el-form-item label="手机号" prop="mobile">
-						<el-input
-							v-model="adForm.mobile"
-							placeholder="请输入手机号"
-							size="small"
-						></el-input>
-					</el-form-item>
 					<el-form-item label="登陆密码" prop="password">
 						<el-input
 							v-model="adForm.password"
@@ -368,30 +376,36 @@ export default {
 							align: 'center',
 							width: 60
 						},
+						{
+							prop: 'avatar',
+							label: '头像',
+							align: 'center',
+							width: 90
+						},
 						{
 							prop: 'adminName',
 							label: '姓名',
 							align: 'center'
 						},
-						{
-							prop: 'nickName',
-							label: '绑定微信',
-							align: 'center',
-							'min-width': 80
-						},
 						{
 							prop: 'mobile',
 							label: '手机号',
 							align: 'center'
 						},
 						{
-							prop: 'incomeNotice',
-							label: '收款通知',
+							prop: 'roleName',
+							label: '角色',
 							align: 'center'
 						},
 						{
-							prop: 'roleName',
-							label: '角色',
+							prop: 'userId',
+							label: '绑定微信',
+							align: 'center',
+							'min-width': 80
+						},
+						{
+							prop: 'incomeNotice',
+							label: '收款通知',
 							align: 'center'
 						},
 						{
@@ -413,7 +427,7 @@ export default {
 						},
 						{
 							prop: 'status',
-							label: '是否启用',
+							label: '启用状态',
 							align: 'center'
 						}
 					],

mobile-code/src/admin/staff/add.vue

@@ -7,6 +7,10 @@
 					<div class="tui-title required">员工姓名</div>
 					<input v-model="form.adminName" placeholder-class="phcolor" class="tui-input" name="adminName" placeholder="请输入姓名" maxlength="50" type="text" />
 				</tui-list-cell>
+                <tui-list-cell class="line-cell" :hover="false">
+                    <div class="tui-title required">手机号</div>
+                    <input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="number" />
+                </tui-list-cell>
 				<tui-list-cell class="line-cell" :arrow="true">
 					<div class="tui-title required">角色</div>
 					<picker mode="selector" :value="form.roleId" :range="roleList" range-key="roleName" @change="changeRoleFn" class="tui-input">
@@ -30,7 +34,6 @@
 					<div v-else class="tui-placeholder">请选择</div>
 				</tui-list-cell>
 			</div>
-			<div class="prompt-text">注: 请先关注公众号，绑定后可以在移动端自动登录</div>
 			<!-- 收款通知 -->
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
@@ -42,10 +45,6 @@
 			</div>
 			<!-- 登录信息 -->
 			<div class="module-com input-line-wrap">
-				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">手机号</div>
-					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="number" />
-				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 					<div class="tui-title">登录密码</div>
 					<input v-model="form.password" placeholder-class="phcolor" class="tui-input" name="password" placeholder="请输入" maxlength="50" type="password" />