Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
zhh
/
front-end
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

收支

shish 5 lat temu
rodzic
2de01343e2
commit
fa5b63462c
24 zmienionych plików z 15 dodań i 39 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0 0
      ghs/dist/shop/css/chunk-6f6d6e7e.3ae82022.css
  2. 0 0
      ghs/dist/shop/css/chunk-7aee3fbf.59fac87b.css
  3. 0 0
      ghs/dist/shop/css/chunk-959b83f2.5413d732.css
  4. 1 1
      ghs/dist/shop/index.html
  5. 0 0
      ghs/dist/shop/js/app.a9c79eab.js
  6. 0 0
      ghs/dist/shop/js/chunk-52dfc438.10f6a9d8.js
  7. 0 0
      ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
  8. 0 0
      ghs/dist/shop/js/chunk-5ef69cd8.31887d20.js
  9. 0 0
      ghs/dist/shop/js/chunk-6f6d6e7e.7d7f469b.js
  10. 0 0
      ghs/dist/shop/js/chunk-7aee3fbf.6ea9eefd.js
  11. 0 0
      ghs/dist/shop/js/chunk-959b83f2.12fd1605.js
  12. 1 1
      ghs/src/mock/userInfo.js
  13. 2 8
      ghs/src/views/assets/expendList.vue
  14. 3 9
      ghs/src/views/assets/list.vue
  15. 1 1
      ghs/src/views/order/components/order-detail.vue
  16. 1 1
      hd/dist/shop/index.html
  17. 0 0
      hd/dist/shop/js/app.3ca7b6f9.js
  18. 0 0
      hd/dist/shop/js/chunk-2a4c821d.4754e5ae.js
  19. 0 0
      hd/dist/shop/js/chunk-52dfc438.03d357ee.js
  20. 0 0
      hd/dist/shop/js/chunk-52dfc438.b446c989.js
  21. 0 0
      hd/dist/shop/js/chunk-5ef69cd8.3e364d5a.js
  22. 1 1
      hd/src/mock/userInfo.js
  23. 2 8
      hd/src/views/assets/expendList.vue
  24. 3 9
      hd/src/views/assets/list.vue

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-6f6d6e7e.3ae82022.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-7aee3fbf.59fac87b.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-959b83f2.5413d732.css


+ 1 - 1
ghs/dist/shop/index.html
Wyświetl plik 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				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.6a0f1971.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.6a0f1971.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.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>

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/app.a9c79eab.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-52dfc438.10f6a9d8.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-52dfc438.212a89cb.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-5ef69cd8.31887d20.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-6f6d6e7e.7d7f469b.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-7aee3fbf.6ea9eefd.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-959b83f2.12fd1605.js


+ 1 - 1
ghs/src/mock/userInfo.js
Wyświetl plik 

@@ -170,7 +170,7 @@ let menu = {
 
         {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,name: '赚钱',type: 1,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',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: '12',parentId: null,name: '收支',type: 0,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 
+		{id: '12',parentId: null,name: '资产',type: 0,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 
 		{id: '1201',parentId: '12',name: '收入明细',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 
 		{id: '1202',parentId: '12',name: '支出明细',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/expendList',viewPath: 'views/assets/expendList.vue',keepAlive: 1},
 
 		{id: '13',parentId: null,name: '设置',type: 0,icon: 'iconshezhi',orderNum: 12,router: '/goods/list',viewPath: 'views/goods/goods-list.vue',keepAlive: 1},

+ 2 - 8
ghs/src/views/assets/expendList.vue
Wyświetl plik 

@@ -40,8 +40,8 @@ export default {
 
 				.set('table', {
 
 					columns: [
 
 						{
 
-							prop: 'userName',
 
-							label: '姓名',
 
+							prop: 'event',
 
+							label: '事项',
 
 							align: 'center'
 
 						},
 
 						{
 
@@ -68,12 +68,6 @@ export default {
 
 							prop: 'totalExpend',
 
 							label: '累计支出',
 
 							align: 'center'
 
-						},
 
-						{
 
-							prop: 'id',
 
-							label: '编号',
 
-							align: 'center',
 
-							'min-width': 100
 
 						}
 
 					],
 
 					// 操作列

+ 3 - 9
ghs/src/views/assets/list.vue
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 	<div class="app-list-content">
 
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 
 			<template #table-column-addTime="{scope}">
 
-				<span>{{ scope.row.addTime | formatTime('MM-DD HH:mm') }}</span>
 
+				<span>{{ scope.row.addTime}}</span>
 
 			</template>
 
 			<template #table-column-amount="{scope}">
 
 				<span v-if="scope.row.io == 1">+</span>
 
@@ -40,8 +40,8 @@ export default {
 
 				.set('table', {
 
 					columns: [
 
 						{
 
-							prop: 'userName',
 
-							label: '姓名',
 
+							prop: 'event',
 
+							label: '事项',
 
 							align: 'center'
 
 						},
 
 						{
 
@@ -68,12 +68,6 @@ export default {
 
 							prop: 'totalIncome',
 
 							label: '累计收入',
 
 							align: 'center'
 
-						},
 
-						{
 
-							prop: 'id',
 
-							label: '编号',
 
-							align: 'center',
 
-							'min-width': 100
 
 						}
 
 					],
 
 					// 操作列

+ 1 - 1
ghs/src/views/order/components/order-detail.vue
Wyświetl plik 

@@ -48,7 +48,7 @@
 
 							<el-table-column property="customName" label="名称"></el-table-column>
 
 							<el-table-column property="customMobile" label="手机号"></el-table-column>
 
 							<el-table-column property="fullAddress" label="地址" width="280px"></el-table-column>
 
-							<el-table-column property="showAddress" label="备用地址" width="280px"></el-table-column>
 
+							<el-table-column property="showAddress" label="完整地址" width="280px"></el-table-column>
 
 						</el-table>
 
 					</div>
 
 				</div>

+ 1 - 1
hd/dist/shop/index.html
Wyświetl plik 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				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.81d367a0.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.81d367a0.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.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>

Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/app.3ca7b6f9.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-2a4c821d.4754e5ae.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-52dfc438.03d357ee.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-52dfc438.b446c989.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-5ef69cd8.3e364d5a.js


+ 1 - 1
hd/src/mock/userInfo.js
Wyświetl plik 

@@ -470,7 +470,7 @@ let menu = {
 
 		{
 
 			id: '12',
 
 			parentId: null,
 
-			name: '收支',
 
+			name: '资产',
 
 			type: 0,
 
 			icon: 'icondingdanguanli',
 
 			orderNum: 12,

+ 2 - 8
hd/src/views/assets/expendList.vue
Wyświetl plik 

@@ -40,8 +40,8 @@ export default {
 
 				.set('table', {
 
 					columns: [
 
 						{
 
-							prop: 'userName',
 
-							label: '姓名',
 
+							prop: 'event',
 
+							label: '事项',
 
 							align: 'center'
 
 						},
 
 						{
 
@@ -68,12 +68,6 @@ export default {
 
 							prop: 'totalExpend',
 
 							label: '累计支出',
 
 							align: 'center'
 
-						},
 
-						{
 
-							prop: 'id',
 
-							label: '编号',
 
-							align: 'center',
 
-							'min-width': 100
 
 						}
 
 					],
 
 					// 操作列

+ 3 - 9
hd/src/views/assets/list.vue
Wyświetl plik 

@@ -2,7 +2,7 @@
 
 	<div class="app-list-content">
 
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 
 			<template #table-column-addTime="{scope}">
 
-				<span>{{ scope.row.addTime | formatTime('MM-DD HH:mm') }}</span>
 
+				<span>{{ scope.row.addTime}}</span>
 
 			</template>
 
 			<template #table-column-amount="{scope}">
 
 				<span v-if="scope.row.io == 1">+</span>
 
@@ -40,8 +40,8 @@ export default {
 
 				.set('table', {
 
 					columns: [
 
 						{
 
-							prop: 'userName',
 
-							label: '姓名',
 
+							prop: 'event',
 
+							label: '事项',
 
 							align: 'center'
 
 						},
 
 						{
 
@@ -68,12 +68,6 @@ export default {
 
 							prop: 'totalIncome',
 
 							label: '累计收入',
 
 							align: 'center'
 
-						},
 
-						{
 
-							prop: 'id',
 
-							label: '编号',
 
-							align: 'center',
 
-							'min-width': 100
 
 						}
 
 					],
 
 					// 操作列

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików