shish 5 years ago
parent
commit
583c15d7d2

+ 1 - 1
ghs/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 			.once .sub-title {
 				color: #ababab;
 				color: #ababab;
 				font-size: 12px;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.a9c79eab.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.a9c79eab.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.f9d69e5b.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.f9d69e5b.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.f9d69e5b.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-5ef69cd8.25d82e88.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-5ef69cd8.31887d20.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-7aee3fbf.1976eb7e.js


+ 5 - 15
ghs/src/views/assets/expendList.vue

@@ -2,7 +2,7 @@
 	<div class="app-list-content">
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 			<template #table-column-addTime="{scope}">
 			<template #table-column-addTime="{scope}">
-				<span>{{ scope.row.addTime | formatTime('MM-DD HH:mm') }}</span>
+				<span>{{ scope.row.addTime}}</span>
 			</template>
 			</template>
 			<template #table-column-amount="{scope}">
 			<template #table-column-amount="{scope}">
 				<span v-if="scope.row.io == 1">+</span>
 				<span v-if="scope.row.io == 1">+</span>
@@ -39,29 +39,19 @@ export default {
 			ctx.service(merchantCapital)
 			ctx.service(merchantCapital)
 				.set('table', {
 				.set('table', {
 					columns: [
 					columns: [
-						{
-							prop: 'event',
-							label: '事项',
-							align: 'center'
-						},
-						{
-							prop: 'amount',
-							label: '支出',
-							align: 'center'
-						},
 						{
 						{
 							prop: 'addTime',
 							prop: 'addTime',
 							label: '时间',
 							label: '时间',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{
-							prop: 'payWay',
-							label: '支付方式',
+							prop: 'event',
+							label: '事项',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{
-							prop: 'fromType',
-							label: '来源',
+							prop: 'amount',
+							label: '支出',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{

+ 1 - 1
hd/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 			.once .sub-title {
 				color: #ababab;
 				color: #ababab;
 				font-size: 12px;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.3ca7b6f9.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.3ca7b6f9.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.8d18e965.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.8d18e965.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/app.8d18e965.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-2a4c821d.6c65df08.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-5ef69cd8.3e364d5a.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-5ef69cd8.a9963f56.js


+ 5 - 15
hd/src/views/assets/expendList.vue

@@ -2,7 +2,7 @@
 	<div class="app-list-content">
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 			<template #table-column-addTime="{scope}">
 			<template #table-column-addTime="{scope}">
-				<span>{{ scope.row.addTime | formatTime('MM-DD HH:mm') }}</span>
+				<span>{{ scope.row.addTime}}</span>
 			</template>
 			</template>
 			<template #table-column-amount="{scope}">
 			<template #table-column-amount="{scope}">
 				<span v-if="scope.row.io == 1">+</span>
 				<span v-if="scope.row.io == 1">+</span>
@@ -39,29 +39,19 @@ export default {
 			ctx.service(merchantCapital)
 			ctx.service(merchantCapital)
 				.set('table', {
 				.set('table', {
 					columns: [
 					columns: [
-						{
-							prop: 'event',
-							label: '事项',
-							align: 'center'
-						},
-						{
-							prop: 'amount',
-							label: '支出',
-							align: 'center'
-						},
 						{
 						{
 							prop: 'addTime',
 							prop: 'addTime',
 							label: '时间',
 							label: '时间',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{
-							prop: 'payWay',
-							label: '支付方式',
+							prop: 'event',
+							label: '事项',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{
-							prop: 'fromType',
-							label: '来源',
+							prop: 'amount',
+							label: '支出',
 							align: 'center'
 							align: 'center'
 						},
 						},
 						{
 						{

Some files were not shown because too many files changed in this diff