5 лет назад · 7a7bb89403
--- a/ghs/dist/shop/css/chunk-6f6d6e7e.3ae82022.css
+++ b/ghs/dist/shop/css/chunk-6f6d6e7e.3ae82022.css
--- a/ghs/dist/shop/css/chunk-7aee3fbf.59fac87b.css
+++ b/ghs/dist/shop/css/chunk-7aee3fbf.59fac87b.css
--- a/ghs/dist/shop/css/chunk-959b83f2.5413d732.css
+++ b/ghs/dist/shop/css/chunk-959b83f2.5413d732.css
--- a/ghs/dist/shop/index.html
+++ b/ghs/dist/shop/index.html
@@ -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.e511f763.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.e511f763.js"></script></body></html>
			
--- a/ghs/dist/shop/js/app.e511f763.js
+++ b/ghs/dist/shop/js/app.e511f763.js
--- a/ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
+++ b/ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
--- a/ghs/dist/shop/js/chunk-52dfc438.ec4ea642.js
+++ b/ghs/dist/shop/js/chunk-52dfc438.ec4ea642.js
--- a/ghs/dist/shop/js/chunk-5ef69cd8.25d82e88.js
+++ b/ghs/dist/shop/js/chunk-5ef69cd8.25d82e88.js
--- a/ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js
+++ b/ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js
--- a/ghs/dist/shop/js/chunk-6f6d6e7e.7d7f469b.js
+++ b/ghs/dist/shop/js/chunk-6f6d6e7e.7d7f469b.js
--- a/ghs/dist/shop/js/chunk-7aee3fbf.fe3d1d9c.js
+++ b/ghs/dist/shop/js/chunk-7aee3fbf.fe3d1d9c.js
--- a/ghs/dist/shop/js/chunk-959b83f2.12fd1605.js
+++ b/ghs/dist/shop/js/chunk-959b83f2.12fd1605.js
--- a/ghs/src/mock/userInfo.js
+++ b/ghs/src/mock/userInfo.js
@@ -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},
			
--- a/ghs/src/views/assets/expendList.vue
+++ b/ghs/src/views/assets/expendList.vue
@@ -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>
			
@@ -39,41 +39,25 @@ export default {
 
				 			ctx.service(merchantCapital)
			
 
				 				.set('table', {
			
 
				 					columns: [
			
 
				-						{
			
 
				-							prop: 'userName',
			
 
				-							label: '姓名',
			
 
				-							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'amount',
			
 
				-							label: '支出',
			
 
				-							align: 'center'
			
 
				-						},
			
 
				 						{
			
 
				 							prop: 'addTime',
			
 
				 							label: '时间',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'payWay',
			
 
				-							label: '支付方式',
			
 
				+							prop: 'event',
			
 
				+							label: '事项',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'fromType',
			
 
				-							label: '来源',
			
 
				+							prop: 'amount',
			
 
				+							label: '支出',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				 							prop: 'totalExpend',
			
 
				 							label: '累计支出',
			
 
				 							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'id',
			
 
				-							label: '编号',
			
 
				-							align: 'center',
			
 
				-							'min-width': 100
			
 
				 						}
			
 
				 					],
			
 
				 					// 操作列
			
--- a/ghs/src/views/assets/list.vue
+++ b/ghs/src/views/assets/list.vue
@@ -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,18 +40,18 @@ export default {
 
				 				.set('table', {
			
 
				 					columns: [
			
 
				 						{
			
 
				-							prop: 'userName',
			
 
				-							label: '姓名',
			
 
				+							prop: 'addTime',
			
 
				+							label: '时间',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'amount',
			
 
				-							label: '收入',
			
 
				+							prop: 'event',
			
 
				+							label: '事项',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'addTime',
			
 
				-							label: '时间',
			
 
				+							prop: 'amount',
			
 
				+							label: '收入',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
@@ -68,12 +68,6 @@ export default {
 
				 							prop: 'totalIncome',
			
 
				 							label: '累计收入',
			
 
				 							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'id',
			
 
				-							label: '编号',
			
 
				-							align: 'center',
			
 
				-							'min-width': 100
			
 
				 						}
			
 
				 					],
			
 
				 					// 操作列
			
--- a/ghs/src/views/order/components/order-detail.vue
+++ b/ghs/src/views/order/components/order-detail.vue
@@ -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>
			
--- a/ghsApp/dist/build/mp-weixin/admin/billing/affirm.js
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/affirm.js
--- a/ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss
--- a/ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-img.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-img.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-result.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-result.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-uploader.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-uploader.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-close.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-close.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-search.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-search.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/app-vip.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-vip.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/alert.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/alert.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
+++ b/ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
+++ b/ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/src/admin/billing/affirm.vue
+++ b/ghsApp/src/admin/billing/affirm.vue
@@ -93,7 +93,6 @@
 
				             >
			
 
				               自取
			
 
				             </button>
			
 
				-            <!-- <button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button> -->
			
 
				             <button
			
 
				               @click="courier(1)"
			
 
				               class="admin-button-com mini-btn"
			
@@ -125,7 +124,6 @@
 
				           >
			
 
				             <view class="tui-title">付款方式</view>
			
 
				             <button
			
 
				-              v-if="form.customId"
			
 
				               @tap="form.debt = 1"
			
 
				               class="admin-button-com mini-btn"
			
 
				               :class="form.debt == 1 ? 'blue' : 'default'"
			
@@ -190,9 +188,7 @@ import appSendTime from "@/components/app-send-time";
 
				 import appFormSend from "@/components/app-form-send";
			
 
				 const formUtil = require("@/utils/formValidation.js");
			
 
				 import { createOrder, freight } from "@/api/order/index";
			
 
				-// import { freight } from "@/api/order";
			
 
				 import { mapActions, mapGetters } from "vuex";
			
 
				-
			
 
				 export default {
			
 
				   name: "BillingAffirm", // 开单确认
			
 
				   components: {
			
@@ -211,7 +207,7 @@ export default {
 
				     return {
			
 
				       autoLoad: false,
			
 
				       form: {
			
 
				-        debt: 0, //付款方式 1欠款订单 0正常订单
			
 
				+        debt: 1, //付款方式 1欠款订单 0正常订单
			
 
				         shopId: "",
			
 
				         shopName: "",
			
 
				         receiveProvince: "",
			
@@ -229,9 +225,6 @@ export default {
 
				         product: "",
			
 
				       },
			
 
				       money: "",
			
 
				-
			
 
				-      // 详细地址
			
 
				-      // showRegion: false,
			
 
				       showCustomer: false,
			
 
				     };
			
 
				   },
			
@@ -272,19 +265,14 @@ export default {
 
				         this.money = this.form.sendCost;
			
 
				       }
			
 
				     },
			
 
				-    // api
			
 
				     _getDet () {
			
 
				       let data = uni.getStorageSync("modifyShopB");
			
 
				       if (this.$util.isEmpty(data)) return;
			
 
				       Object.keys(this.form).forEach((i, index) => {
			
 
				-        // if (i != 'password') {
			
 
				         this.form[i] = data[i];
			
 
				-        // }
			
 
				       });
			
 
				     },
			
 
				-
			
 
				     changeCustomerFn (info) {
			
 
				-      console.log(info, "this.form");
			
 
				       const product = this.selectList.map((ele) => {
			
 
				         return {
			
 
				           productId: ele.id,
			
@@ -317,7 +305,6 @@ export default {
 
				         options.sendCost = "";
			
 
				       }
			
 
				       createOrder(options).then((res) => {
			
 
				-        // this.$msg("下单成功");
			
 
				         this.resetSelectInfoByType(this.pageType);
			
 
				         const {
			
 
				           data: { id, orderSn },
			
@@ -377,10 +364,6 @@ export default {
 
				           await this.initMerchantInfo();
			
 
				         }
			
 
				         formData.shopId = this.getMerchantInfo.id;
			
 
				-
			
 
				-        console.log(9999, formData);
			
 
				-        // this.confirmFn(formData);
			
 
				-        // let rules = rules.concat(temp);
			
 
				         let checkRes = formUtil.validation(formData, []);
			
 
				         // 验证通过!
			
 
				         if (!checkRes) {
			
--- a/hd/dist/shop/index.html
+++ b/hd/dist/shop/index.html
@@ -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.8db95870.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.8db95870.js"></script></body></html>
			
--- a/hd/dist/shop/js/app.8db95870.js
+++ b/hd/dist/shop/js/app.8db95870.js
--- a/hd/dist/shop/js/chunk-2a4c821d.098066f4.js
+++ b/hd/dist/shop/js/chunk-2a4c821d.098066f4.js
--- a/hd/dist/shop/js/chunk-52dfc438.03d357ee.js
+++ b/hd/dist/shop/js/chunk-52dfc438.03d357ee.js
--- a/hd/dist/shop/js/chunk-52dfc438.f4586675.js
+++ b/hd/dist/shop/js/chunk-52dfc438.f4586675.js
--- a/hd/dist/shop/js/chunk-5ef69cd8.355c758a.js
+++ b/hd/dist/shop/js/chunk-5ef69cd8.355c758a.js
--- a/hd/dist/shop/js/chunk-5ef69cd8.a9963f56.js
+++ b/hd/dist/shop/js/chunk-5ef69cd8.a9963f56.js
--- a/hd/src/mock/userInfo.js
+++ b/hd/src/mock/userInfo.js
@@ -470,7 +470,7 @@ let menu = {
 
				 		{
			
 
				 			id: '12',
			
 
				 			parentId: null,
			
 
				-			name: '收支',
			
 
				+			name: '资产',
			
 
				 			type: 0,
			
 
				 			icon: 'icondingdanguanli',
			
 
				 			orderNum: 12,
			
--- a/hd/src/views/assets/expendList.vue
+++ b/hd/src/views/assets/expendList.vue
@@ -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>
			
@@ -39,41 +39,25 @@ export default {
 
				 			ctx.service(merchantCapital)
			
 
				 				.set('table', {
			
 
				 					columns: [
			
 
				-						{
			
 
				-							prop: 'userName',
			
 
				-							label: '姓名',
			
 
				-							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'amount',
			
 
				-							label: '支出',
			
 
				-							align: 'center'
			
 
				-						},
			
 
				 						{
			
 
				 							prop: 'addTime',
			
 
				 							label: '时间',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'payWay',
			
 
				-							label: '支付方式',
			
 
				+							prop: 'event',
			
 
				+							label: '事项',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'fromType',
			
 
				-							label: '来源',
			
 
				+							prop: 'amount',
			
 
				+							label: '支出',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				 							prop: 'totalExpend',
			
 
				 							label: '累计支出',
			
 
				 							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'id',
			
 
				-							label: '编号',
			
 
				-							align: 'center',
			
 
				-							'min-width': 100
			
 
				 						}
			
 
				 					],
			
 
				 					// 操作列
			
--- a/hd/src/views/assets/list.vue
+++ b/hd/src/views/assets/list.vue
@@ -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,18 +40,18 @@ export default {
 
				 				.set('table', {
			
 
				 					columns: [
			
 
				 						{
			
 
				-							prop: 'userName',
			
 
				-							label: '姓名',
			
 
				+							prop: 'addTime',
			
 
				+							label: '时间',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'amount',
			
 
				-							label: '收入',
			
 
				+							prop: 'event',
			
 
				+							label: '事项',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
 
				-							prop: 'addTime',
			
 
				-							label: '时间',
			
 
				+							prop: 'amount',
			
 
				+							label: '收入',
			
 
				 							align: 'center'
			
 
				 						},
			
 
				 						{
			
@@ -68,12 +68,6 @@ export default {
 
				 							prop: 'totalIncome',
			
 
				 							label: '累计收入',
			
 
				 							align: 'center'
			
 
				-						},
			
 
				-						{
			
 
				-							prop: 'id',
			
 
				-							label: '编号',
			
 
				-							align: 'center',
			
 
				-							'min-width': 100
			
 
				 						}
			
 
				 					],
			
 
				 					// 操作列