shish 2 лет назад
Родитель
Сommit
33f744fc17
34 измененных файлов с 153 добавлено и 81 удалено
  1. 0 0
      ghs/dist/shop/css/chunk-0673ae3e.809d74b5.css
  2. 0 1
      ghs/dist/shop/css/chunk-0968e5f3.3dbf7554.css
  3. 0 1
      ghs/dist/shop/css/chunk-144da81d.e319bb71.css
  4. 0 0
      ghs/dist/shop/css/chunk-31072374.f4758a67.css
  5. 1 0
      ghs/dist/shop/css/chunk-31c03faa.e096230c.css
  6. 1 0
      ghs/dist/shop/css/chunk-3c23c40b.68f9a03b.css
  7. 1 0
      ghs/dist/shop/css/chunk-6816b5ce.f722d3ae.css
  8. 1 0
      ghs/dist/shop/css/chunk-69b5742a.467752e6.css
  9. 0 1
      ghs/dist/shop/css/chunk-6c964ace.eb104f1a.css
  10. 0 1
      ghs/dist/shop/css/chunk-7a9718f7.1a42a6b2.css
  11. 1 0
      ghs/dist/shop/css/chunk-d1ee2580.313756b3.css
  12. 2 2
      ghs/dist/shop/index.html
  13. 0 0
      ghs/dist/shop/js/app.8c597727.js
  14. 0 0
      ghs/dist/shop/js/app.fc714ec3.js
  15. 0 0
      ghs/dist/shop/js/chunk-0673ae3e.9baa60f6.js
  16. 0 0
      ghs/dist/shop/js/chunk-31072374.12e24332.js
  17. 0 0
      ghs/dist/shop/js/chunk-31c03faa.b17f40f4.js
  18. 0 0
      ghs/dist/shop/js/chunk-3c23c40b.2372886f.js
  19. 0 1
      ghs/dist/shop/js/chunk-52dfc438.7881cdda.js
  20. 0 0
      ghs/dist/shop/js/chunk-6816b5ce.66d14ac0.js
  21. 0 0
      ghs/dist/shop/js/chunk-69b5742a.18baca71.js
  22. 0 0
      ghs/dist/shop/js/chunk-6c964ace.8631f249.js
  23. 0 0
      ghs/dist/shop/js/chunk-7a9718f7.f23e74f9.js
  24. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.1ccb9083.js
  25. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.b579a41b.js
  26. 0 0
      ghs/dist/shop/js/chunk-d1ee2580.0b40f119.js
  27. 2 0
      ghs/src/cool/request/index.js
  28. 1 1
      ghs/src/mock/userInfo.js
  29. 6 0
      ghs/src/service/shop-ye-change/index.js
  30. 2 3
      ghs/src/views/assets/cgItem.vue
  31. 2 3
      ghs/src/views/assets/incomeClass.vue
  32. 2 3
      ghs/src/views/assets/incomeOutItem.vue
  33. 3 2
      ghs/src/views/assets/itemSale.vue
  34. 128 62
      ghs/src/views/assets/list.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-0673ae3e.809d74b5.css


+ 0 - 1
ghs/dist/shop/css/chunk-0968e5f3.3dbf7554.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-100eebea]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-100eebea]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-100eebea]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-100eebea]{font-size:18px}.el-dialog .el-dialog__body[data-v-100eebea]{padding:20px}.el-dialog .el-dialog__footer[data-v-100eebea]{padding-bottom:15px}.shop-list[data-v-100eebea]{height:100%}

+ 0 - 1
ghs/dist/shop/css/chunk-144da81d.e319bb71.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-a9b621fe]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-a9b621fe]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-a9b621fe]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-a9b621fe]{font-size:18px}.el-dialog .el-dialog__body[data-v-a9b621fe]{padding:20px}.el-dialog .el-dialog__footer[data-v-a9b621fe]{padding-bottom:15px}.shop-list[data-v-a9b621fe]{height:100%}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-31072374.f4758a67.css


+ 1 - 0
ghs/dist/shop/css/chunk-31c03faa.e096230c.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-5fbfc943]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5fbfc943]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5fbfc943]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5fbfc943]{font-size:18px}.el-dialog .el-dialog__body[data-v-5fbfc943]{padding:20px}.el-dialog .el-dialog__footer[data-v-5fbfc943]{padding-bottom:15px}.shop-list[data-v-5fbfc943]{height:100%}

+ 1 - 0
ghs/dist/shop/css/chunk-3c23c40b.68f9a03b.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-03175fda]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-03175fda]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-03175fda]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-03175fda]{font-size:18px}.el-dialog .el-dialog__body[data-v-03175fda]{padding:20px}.el-dialog .el-dialog__footer[data-v-03175fda]{padding-bottom:15px}.shop-list[data-v-03175fda]{height:100%}

+ 1 - 0
ghs/dist/shop/css/chunk-6816b5ce.f722d3ae.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-5ab4a258]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-5ab4a258]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-5ab4a258]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-5ab4a258]{font-size:18px}.el-dialog .el-dialog__body[data-v-5ab4a258]{padding:20px}.el-dialog .el-dialog__footer[data-v-5ab4a258]{padding-bottom:15px}.shop-list[data-v-5ab4a258]{height:100%}

+ 1 - 0
ghs/dist/shop/css/chunk-69b5742a.467752e6.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-6df04a36]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6df04a36]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6df04a36]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6df04a36]{font-size:18px}.el-dialog .el-dialog__body[data-v-6df04a36]{padding:20px}.el-dialog .el-dialog__footer[data-v-6df04a36]{padding-bottom:15px}.shop-list[data-v-6df04a36]{height:100%}

+ 0 - 1
ghs/dist/shop/css/chunk-6c964ace.eb104f1a.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-a087edc6]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-a087edc6]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-a087edc6]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-a087edc6]{font-size:18px}.el-dialog .el-dialog__body[data-v-a087edc6]{padding:20px}.el-dialog .el-dialog__footer[data-v-a087edc6]{padding-bottom:15px}.shop-list[data-v-a087edc6]{height:100%}

+ 0 - 1
ghs/dist/shop/css/chunk-7a9718f7.1a42a6b2.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-7e89d6dc]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-7e89d6dc]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-7e89d6dc]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-7e89d6dc]{font-size:18px}.el-dialog .el-dialog__body[data-v-7e89d6dc]{padding:20px}.el-dialog .el-dialog__footer[data-v-7e89d6dc]{padding-bottom:15px}.shop-list[data-v-7e89d6dc]{height:100%}

+ 1 - 0
ghs/dist/shop/css/chunk-d1ee2580.313756b3.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-6ca64a5f]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-6ca64a5f]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-6ca64a5f]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-6ca64a5f]{font-size:18px}.el-dialog .el-dialog__body[data-v-6ca64a5f]{padding:20px}.el-dialog .el-dialog__footer[data-v-6ca64a5f]{padding-bottom:15px}.shop-list[data-v-6ca64a5f]{height:100%}

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

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.8c597727.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.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.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.8c597727.js"></script></body></html>
+			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.fc714ec3.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.fc714ec3.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.8c597727.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.fc714ec3.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-0673ae3e.9baa60f6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-31072374.12e24332.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-31c03faa.b17f40f4.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-3c23c40b.2372886f.js


+ 0 - 1
ghs/dist/shop/js/chunk-52dfc438.7881cdda.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-52dfc438","chunk-2d0d70b6"],{"74ad":function(e,a,n){"use strict";n.r(a),n.d(a,"MerchantCapitalService",(function(){return l}));var t,o,r=n("c081");let l=(t=Object(r["Service"])("shop-capital"),t(o=class extends r["BaseService"]{})||o);a["default"]=new l},cea0:function(e,a,n){"use strict";n.r(a);var t=function(){var e=this,a=e._self._c;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-addTime",fn:function({scope:n}){return[a("span",[e._v(e._s(n.row.addTime))])]}},{key:"table-column-amount",fn:function({scope:n}){return[1==n.row.io?a("span",[e._v("+")]):a("span",[e._v("-")]),e._v(" "+e._s(n.row.amount)+" ")]}},{key:"table-column-payWay",fn:function({scope:n}){return[0==n.row.payWay?a("span",[e._v("微信支付")]):1==n.row.payWay?a("span",[e._v("支付宝")]):2==n.row.payWay?a("span",[e._v("余额")]):a("span",[e._v("-")])]}},{key:"table-column-fromType",fn:function({scope:n}){return[0==n.row.fromType?a("span",[e._v("门店")]):1==n.row.fromType?a("span",[e._v("商城")]):2==n.row.fromType?a("span",[e._v("朋友圈")]):a("span",[e._v("-")])]}}])})],1)},o=[],r=n("74ad"),l={name:"assets-list",methods:{onLoad({ctx:e,app:a}){this.app=a,e.service(r["default"]).set("table",{columns:[{prop:"addTime",label:"时间",align:"center"},{prop:"event",label:"事项",align:"center"},{prop:"amount",label:"收入",align:"center"},{prop:"payWay",label:"支付方式",align:"center"},{prop:"fromType",label:"来源",align:"center"},{prop:"totalIncome",label:"累计收入",align:"center"}],op:{visible:!1,props:{width:100,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","slot-add-ad-btn","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),a.refresh({io:"1"})}}},p=l,s=n("1805"),c=Object(s["a"])(p,t,o,!1,null,"5820387e",null);a["default"]=c.exports}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-6816b5ce.66d14ac0.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-69b5742a.18baca71.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-6c964ace.8631f249.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-7a9718f7.f23e74f9.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.1ccb9083.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.b579a41b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-d1ee2580.0b40f119.js


+ 2 - 0
ghs/src/cool/request/index.js

@@ -48,12 +48,14 @@ import customDebtChange from '@/service/custom-debt-change/index';
 import checkOrder from '@/service/check-order/index';
 import ghsDebtRecord from '@/service/ghs-debt-record/index';
 import statCgGhs from '@/service/stat-cg-ghs/index';
+import shopYeChange from '@/service/shop-ye-change/index';
 
 export function SET_SERVICE({ store }) {
 	// const files = require.context('@/service/', true, /\.js$/);
 	// const ignore = ['./request.js'];
 
 	let modules = {
+		shopYeChange,
 		statCgGhs,
 		ghsDebtRecord,
 		checkOrder,

+ 1 - 1
ghs/src/mock/userInfo.js

@@ -190,7 +190,7 @@ let menu = {
         {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: '1201',parentId: '12',name: '收入明细',type: 1,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: '1203',parentId: '12',name: '收支分类',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/incomeClass',viewPath: 'views/assets/incomeClass.vue',keepAlive: 1},
 		{id: '1203',parentId: '12',name: '收支花材',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/incomeOutItem',viewPath: 'views/assets/incomeOutItem.vue',keepAlive: 1},

+ 6 - 0
ghs/src/service/shop-ye-change/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool';
+@Service('shop-ye-change')
+export class ShopYeChangeService extends BaseService {
+
+}
+export default new ShopYeChangeService();

+ 2 - 3
ghs/src/views/assets/cgItem.vue

@@ -124,9 +124,8 @@ export default {
 				.set('layout', [
 					[   'slot-date-select',
                         'slot-order-debt',
-						'flex1',
-                        'slot-export-due',
-						'refresh-btn',
+						'slot-export-due',
+						'flex1'
 					],
 					[ 'data-table' ],
                     ['slot-total-amount','flex1']

+ 2 - 3
ghs/src/views/assets/incomeClass.vue

@@ -129,9 +129,8 @@ export default {
 				.set('layout', [
 					[   'slot-date-select',
                         'slot-order-debt',
-						'flex1',
-                        'slot-export-due',
-						'refresh-btn',
+						'slot-export-due',
+						'flex1'
 					],
 					[ 'data-table' ],
                     ['flex1']

+ 2 - 3
ghs/src/views/assets/incomeOutItem.vue

@@ -129,9 +129,8 @@ export default {
 				.set('layout', [
 					[   'slot-date-select',
                         'slot-order-debt',
-						'flex1',
-                        'slot-export-due',
-						'refresh-btn',
+						'slot-export-due',
+						'flex1'
 					],
 					[ 'data-table' ],
                     ['flex1']

+ 3 - 2
ghs/src/views/assets/itemSale.vue

@@ -1,10 +1,12 @@
 <template>
 	<div class="shop-list">
 		<x-crud @load="onLoad">
+
 			<template #slot-date-select>
                 <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getDate" value-format="yyyy-MM-dd"
                 end-placeholder="结束日期" :picker-options="pickerOptions" size="mini"> </el-date-picker>
 			</template>
+
 			<template #slot-export-due>
 				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
 			</template>
@@ -134,9 +136,8 @@ export default {
 				.set('layout', [
 					[   'slot-date-select',
                         'slot-order-debt',
-						'flex1',
                         'slot-export-due',
-						'refresh-btn',
+						'flex1'
 					],
 					[ 'data-table' ],
                     ['slot-total-amount','flex1']

+ 128 - 62
ghs/src/views/assets/list.vue

@@ -1,15 +1,31 @@
 <template>
-	<div class="app-list-content">
-		<x-crud class="liu-crud-wrap" @load="onLoad">
+	<div class="shop-list">
+		<x-crud @load="onLoad">
+
+			<template #slot-date-select>
+                <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getDate" value-format="yyyy-MM-dd"
+                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini"> </el-date-picker>
+			</template>
+
+			<template #slot-export-due>
+				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
+			</template>
+
 			<template #table-column-addTime="{scope}">
 				<span>{{ scope.row.addTime}}</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-ioStyle="{scope}">
+				<span v-if="scope.row.io == 1">收入</span>
+				<span v-else>支出</span>
+			</template>
+
 			<template #table-column-payWay="{scope}">
 				<span v-if="scope.row.payWay == 0">微信支付</span>
 				<span v-else-if="scope.row.payWay == 1">支付宝</span>
@@ -29,72 +45,122 @@
 </template>
 
 <script>
-import merchantCapital from '@/service/merchant-capital/index';
 export default {
-	name: 'assets-list',
+	name: 'list',
+	data() {
+		return {
+            pickerOptions: {
+				shortcuts: [{
+					text: '最近一周',
+					onClick(picker) {
+					const end = new Date();
+					const start = new Date();
+					start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+					picker.$emit('pick', [start, end]);
+					}
+				}, {
+					text: '最近一个月',
+					onClick(picker) {
+					const end = new Date();
+					const start = new Date();
+					start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+					picker.$emit('pick', [start, end]);
+					}
+				}, {
+					text: '最近三个月',
+					onClick(picker) {
+					const end = new Date();
+					const start = new Date();
+					start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+					picker.$emit('pick', [start, end]);
+					}
+				}]
+            },
+            currentDateList:'',
+            startTime:'',
+            endTime:'',
+            searchTime:''
+		}
+	},
 	methods: {
-		// x-crud 组件ad
+		exportData(){
+			this.$service.shopYeChange.getList({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,pageSize:9999999,export:1}).then(res => {
+				if(res.file){
+					window.location.href = res.file
+				}
+			})
+		},
+        getDate(){
+			if(this.currentDateList){		
+				this.searchTime = 'custom'
+				this.startTime = this.currentDateList[0]
+				this.endTime = this.currentDateList[1]
+			}else{
+				this.searchTime = ''
+				this.startTime = ''
+				this.endTime = ''
+			}
+			this.app.refresh({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime});
+        },
 		onLoad({ ctx, app }) {
 			this.app = app;
-			ctx.service(merchantCapital)
-				.set('table', {
-					columns: [
-						{
-							prop: 'addTime',
-							label: '时间',
-							align: 'center'
-						},
-						{
-							prop: 'event',
-							label: '事项',
-							align: 'center'
-						},
-						{
-							prop: 'amount',
-							label: '收入',
-							align: 'center'
-						},
-						{
-							prop: 'payWay',
-							label: '支付方式',
-							align: 'center'
-						},
-						{
-							prop: 'fromType',
-							label: '来源',
-							align: 'center'
-						},
-						{
-							prop: 'totalIncome',
-							label: '累计收入',
-							align: 'center'
-						}
-					],
-					// 操作列
-					op: {
-						visible: false, // 是否显示
-						// 同 element-ui Table-column Attributes
-						props: {
-							width: 100,
-							align: 'center',
-							fixed: 'right',
-							label: '操作'
-						},
-						// 布局,请移步 `layout`
-						layout: []
+			ctx.service(this.$service.shopYeChange).set('table', {
+				columns: [
+					{
+						prop: 'addTime',
+						label: '时间',
+						align: 'center'
+					},
+					{
+						prop: 'event',
+						label: '事项',
+						align: 'center'
+					},
+					{
+						prop: 'ioStyle',
+						label: '类型',
+						align: 'center'
+					},
+					{
+						prop: 'amount',
+						label: '金额',
+						align: 'center'
+					},
+					{
+						prop: 'balance',
+						label: '余额',
+						align: 'center'
+					},
+					{
+						prop: 'txBalance',
+						label: '可提现',
+						align: 'center'
 					}
-				})
-				.set('layout', [
-					['slot-tabs'],
-					['flex1', 'slot-add-ad-btn', 'refresh-btn'],
-					['data-table'],
-					['flex1', 'pagination']
-				])
-				.done();
-			app.refresh({ io: '1' });
+				],
+				op: {
+					visible: true,
+					props: {
+						width: 100,
+						align: 'center',
+						fixed: 'right',
+						label: '操作'
+					},
+					layout: []
+				}
+			})
+			.set('layout', [
+				['slot-date-select','slot-export-due','flex1'],
+				['data-table'],
+				['flex1', 'pagination']
+			])
+			.done();
+			app.refresh({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime})
 		}
 	}
 };
 </script>
-
-<style lang="stylus" scoped></style>
+<style lang="stylus" scoped>
+.shop-list {
+	height: 100%;
+ }
+</style>

Некоторые файлы не были показаны из-за большого количества измененных файлов