shish 5 лет назад
Родитель
Сommit
70ff042724

+ 1 - 1
pt/dist/web/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.85d6ccbc.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.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.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.afac7b8c.js"></script><script src="/js/app.85d6ccbc.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.7710cbaa.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.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.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.afac7b8c.js"></script><script src="/js/app.7710cbaa.js"></script></body></html>

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


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2d2385e5.d01b9e28.js


+ 0 - 1
pt/dist/web/js/chunk-2d2385e5.e3f8c6be.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2385e5"],{fea1:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,a.row)}}},[e._v("查看")])]}}])})],1)},l=[],o=n("8bc2"),i={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,a=e.app;this.app=a;var l=function(){return t.$service.saasShop.shopList()};n.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",width:"80",align:"center"},{prop:"shopName",label:"门店名称",width:"160",align:"center"},{prop:"merchantName",label:"商家",width:"150",align:"center"},{prop:"balance",label:"余额",width:"120",align:"center"},{prop:"totalIncome",label:"累计收入",width:"130",align:"center"},{prop:"mobile",label:"手机号",width:"130",align:"center"},{prop:"province",label:"省",width:"100",align:"center"},{prop:"city",label:"市",align:"center",width:"100",emptyText:"无"},{prop:"dist",label:"区",align:"center",width:"100",emptyText:"无"},{prop:"fullAddress",label:"地址",align:"center",emptyText:"无",width:"300"},{prop:"gatheringCode",label:"收款二维码",align:"center",width:"130"}],op:{visible:!0,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),a.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.pt.".concat(Object(o["getFirstHost"])()),a=null;switch(e){case 1:a="/user/gathering-code?id=".concat(t.id);break;case 2:a="/user/apply-code?id=".concat(t.id);break}window.open(n+a)}}},r=i,c=n("5d22"),p=Object(c["a"])(r,a,l,!1,null,null,null);t["default"]=p.exports}}]);

+ 15 - 9
pt/src/saas/shop/shop.vue

@@ -33,43 +33,49 @@
                             {
                             {
                                 prop: 'id',
                                 prop: 'id',
                                 label: 'ID',
                                 label: 'ID',
-                                width: '80',
+                                width: '70',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'shopName',
                                 prop: 'shopName',
-                                label: '门店名称',
-                                width: '160',
+                                label: '门店',
+                                width: '120',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'merchantName',
                                 prop: 'merchantName',
                                 label: '商家',
                                 label: '商家',
-                                width: '150',
+                                width: '120',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'balance',
                                 prop: 'balance',
                                 label: '余额',
                                 label: '余额',
-                                width: '120',
+                                width: '100',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'totalIncome',
                                 prop: 'totalIncome',
-                                label: '累计收入',
-                                width: '130',
+                                label: '收入',
+                                width: '100',
+                                align: 'center'
+                            },
+                           {
+                                prop: 'totalExpend',
+                                label: '支出',
+                                width: '100',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'mobile',
                                 prop: 'mobile',
                                 label: '手机号',
                                 label: '手机号',
-                                width: '130',
+                                width: '120',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {
                                 prop: 'province',
                                 prop: 'province',
                                 label: '省',
                                 label: '省',
-                                width: '100',
+                                width: '90',
                                 align: 'center'
                                 align: 'center'
                             },
                             },
                             {
                             {

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