lalala 6 лет назад
Родитель
Сommit
ee32b09ab3

+ 1 - 0
admin-code/src/assets/css/reset.scss

@@ -8,6 +8,7 @@
     }
     .liu-tabs {
         width: 100%;
+        height: 40px;
         
         box-shadow: none !important;
         border-left: none !important;

+ 6 - 5
admin-code/src/pages/layout/index.vue

@@ -10,7 +10,7 @@
 			</div>
 
 			<div class="wrapper-right__container">
-				<process></process>
+				<!-- <process></process> -->
 
 				<div class="content-view">
 					<keep-alive>
@@ -27,14 +27,14 @@
 <script>
 import Topbar from './topbar/index';
 import Slider from './slider/index';
-import Process from './process/index';
+// import Process from './process/index';
 import { mapGetters } from 'vuex';
 
 export default {
 	components: {
 		Topbar,
-		Slider,
-		Process
+		Slider
+		// Process
 	},
 
 	computed: {
@@ -73,13 +73,14 @@ export default {
 			}
 
 			.content-view {
-				height: calc(100% - 110px);
+				height: calc(100% - 70px);
 				width: 100%;
 				box-sizing: border-box;
 				overflow-x: hidden;
 				overflow-y: auto;
 				padding: 0 10px;
 				border-radius: 3px;
+				margin-top: 10px;
 
 				& > div, & > section {
 					height: 100%;

+ 32 - 12
admin-code/src/views/member/list.vue

@@ -2,10 +2,9 @@
 	<cl-crud class="liu-crud-wrap" @load="onLoad">
 		<template #slot-tabs="{ scope }">
 			<el-tabs class="liu-tabs" type="border-card">
-				<el-tab-pane label="用户管理"></el-tab-pane>
-				<el-tab-pane label="配置管理"></el-tab-pane>
-				<el-tab-pane label="角色管理"></el-tab-pane>
-				<el-tab-pane label="定时任务补偿"></el-tab-pane>
+				<el-tab-pane label="全部 (152)"></el-tab-pane>
+				<el-tab-pane label="粉丝 (112)"></el-tab-pane>
+				<el-tab-pane label="会员(82)"></el-tab-pane>
 			</el-tabs>
 		</template>
 
@@ -25,6 +24,19 @@
 		<template #table-column-growth="{scope}">
 			<span>{{ scope.row.userAsset.growth }}</span>
 		</template>
+
+		<!-- 充值 -->
+		<template #slot-recharge="{scope}">
+			<el-button type="text">充值</el-button>
+		</template>
+		<!-- 升级 -->
+		<template #slot-upgrade="{scope}">
+			<el-button type="text">升级</el-button>
+		</template>
+		<!-- 发货 -->
+		<template #slot-ship="{scope}">
+			<el-button type="text">发货</el-button>
+		</template>
 	</cl-crud>
 </template>
 
@@ -35,11 +47,6 @@ export default {
 			ctx.service(this.$service.member)
 				.set('table', {
 					columns: [
-						{
-							type: 'selection',
-							align: 'center',
-							width: '60'
-						},
 						{
 							prop: 'id',
 							label: 'ID',
@@ -78,7 +85,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'sendNum',
+							prop: 'subscribe',
 							label: '关注公众号',
 							align: 'center',
 							sortable: true,
@@ -89,11 +96,24 @@ export default {
 							label: '最近访问',
 							align: 'center'
 						}
-					]
+					],
+					// 操作列
+					op: {
+						visible: true, // 是否显示
+						// 同 element-ui Table-column Attributes
+						props: {
+							width: 150,
+							align: 'center',
+							fixed: 'right',
+							label: '操作'
+						},
+						// 布局,请移步 `layout`
+						layout: ['slot-recharge', 'slot-upgrade', 'slot-ship']
+					}
 				})
 				.set('layout', [
 					['slot-tabs'],
-					['search-key', 'flex1', 'refresh-btn', 'add-btn', 'multi-delete-btn'],
+					['search-key', 'flex1', 'refresh-btn', 'add-btn'],
 					['data-table'],
 					['flex1', 'pagination']
 				])