shish 4 лет назад
Родитель
Сommit
b773c53c26
2 измененных файлов с 3 добавлено и 17 удалено
  1. 1 3
      ghsApp/src/admin/staff/list.vue
  2. 2 14
      hdApp/src/admin/staff/list.vue

+ 1 - 3
ghsApp/src/admin/staff/list.vue

@@ -315,7 +315,6 @@ export default {
 		flex: 1;
 		}
 	}
-	// 列表公共
 	.list-wrap {
 		background-color: #fff;
 		margin-top:85upx;
@@ -326,9 +325,8 @@ export default {
 			border-bottom: 2upx solid $borderColor;
 		}
 	}
-	// 员工列表
 	.staff-list {
-		padding-bottom:30upx;
+		padding-bottom:100upx;
 		.list-det {
 			width: calc(100% - 110upx);
 			color: $fontColor3;

+ 2 - 14
hdApp/src/admin/staff/list.vue

@@ -1,9 +1,7 @@
 <template>
 	<div class="app-content">
 		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" />
-		<!-- 员工列表 -->
 		<block v-if="tabIndex == 0">
-			<!-- 列表 -->
 			<div class="list-wrap staff-list">
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
@@ -39,14 +37,11 @@
 					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				</block>
 			</div>
-			<!-- 按钮 -->
 			<div class="app-footer">
 				<div class="admin-button-com middle blue" @click="pageTo({url:'/admin/staff/add'})">添加员工</div>
 			</div>
 		</block>
-		<!-- 角色管理 -->
 		<block v-if="tabIndex == 1">
-			<!-- 列表 -->
 			<div class="list-wrap role-list">
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
@@ -67,16 +62,13 @@
 					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				</block>
 			</div>
-			<!-- 按钮 -->
 			<!--
 			<div class="app-footer">
 				<div class="admin-button-com middle blue" @click="addRoleFn">添加角色</div>
 			</div>
 			-->
 		</block>
-		<!-- 操作记录 -->
 		<block v-if="tabIndex == 2">
-			<!-- 列表 -->
 			<div class="axis-wrap">
 				<block v-if="!$util.isEmpty(list.data)">
 					<time-axis>
@@ -98,7 +90,6 @@
 				</block>
 			</div>
 		</block>
-		<!-- 角色操作 -->
 		<modal-module :show="roleModal" @cancel="modalCancel" @click="roleModalClick" :title="roleModalText" padding="30upx 30upx">
 			<template v-slot:content>
 				<div class="app-modal-input-wrap">
@@ -111,7 +102,6 @@
 				</div>
 			</template>
 		</modal-module>
-		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" :content="delModalText" color="#333" :size="32" padding="30upx 30upx"></modal-module>
 	</div>
 </template>
@@ -119,7 +109,6 @@
 <script>
 import AppTabs from '@/components/plugin/tabs'
 import AppAvatarModule from '@/components/module/app-avatar'
-// 时间轴
 import TimeAxis from '@/admin/home/components/plugin/time-axis'
 import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
@@ -128,7 +117,7 @@ import { list } from '@/mixins'
 import { mapGetters } from "vuex"
 import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
 export default {
-	name: 'staff-list',
+	name: 'list',
 	components: {
 		AppTabs,
 		AppAvatarModule,
@@ -271,7 +260,6 @@ export default {
 		padding-top: 100upx;
 		padding-bottom: 100upx;
 	}
-	// 列表公共
 	.list-wrap {
 		background-color: #fff;
 		.list {
@@ -281,8 +269,8 @@ export default {
 			border-bottom: 2upx solid $borderColor;
 		}
 	}
-	// 员工列表
 	.staff-list {
+		padding-bottom:100upx;
 		.list-det {
 			width: calc(100% - 110upx);
 			color: $fontColor3;