收支 be ok

shop/src/views/assets/list.vue

@@ -1,6 +1,30 @@
 <template>
 	<div class="app-list-content">
-		<x-crud class="liu-crud-wrap" @load="onLoad"></x-crud>
+		<x-crud class="liu-crud-wrap" @load="onLoad">
+			<template #table-column-addTime="{scope}">
+				<span>{{ scope.row.addTime | formatTime('MM-DD HH:mm') }}</span>
+			</template>
+			<template #table-column-amount="{scope}">
+				<span v-if="scope.row.io == 1">+</span>
+				<span v-else>-</span>
+					{{ scope.row.amount}}
+			</template>
+
+			<template #table-column-payWay="{scope}">
+				<span v-if="scope.row.payWay == 0">微信支付</span>
+				<span v-else-if="scope.row.payWay == 1">支付宝</span>
+				<span v-else-if="scope.row.payWay == 2">余额</span>
+				<span v-else>-</span>
+			</template>
+
+			<template #table-column-fromType="{scope}">
+				<span v-if="scope.row.fromType == 0">门店</span>
+				<span v-else-if="scope.row.fromType == 1">商城</span>
+				<span v-else-if="scope.row.fromType == 2">朋友圈</span>
+				<span v-else>-</span>
+			</template>
+
+		</x-crud>
 	</div>
 </template>
 
@@ -15,20 +39,19 @@ export default {
 			ctx.service(merchantCapital)
 				.set('table', {
 					columns: [
-						{
-							prop: 'id',
-							label: 'id',
-							align: 'center',
-							'min-width': 100
-						},
 						{
 							prop: 'userName',
 							label: '姓名',
 							align: 'center'
 						},
 						{
-							prop: 'event',
-							label: '收入类型',
+							prop: 'amount',
+							label: '收支',
+							align: 'center'
+						},
+						{
+							prop: 'addTime',
+							label: '时间',
 							align: 'center'
 						},
 						{
@@ -37,8 +60,8 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'amount',
-							label: '收支',
+							prop: 'fromType',
+							label: '来源',
 							align: 'center'
 						},
 						{
@@ -47,9 +70,10 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'addTime',
-							label: '时间',
-							align: 'center'
+							prop: 'id',
+							label: '编号',
+							align: 'center',
+							'min-width': 100
 						}
 					],
 					// 操作列

shop/src/views/home.vue

@@ -150,7 +150,8 @@ export default {
 				{
 					name: '收入',
 					icon: 'el-icon-s-marketing',
-					val: '￥0.00'
+					val: '￥0.00',
+					url: '/assets/list'
 				},
 				{
 					name: '订单',