shish 5 anni fa
parent
commit
e13a64a9a9

File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/css/chunk-160548f2.b3cf7613.css


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/css/chunk-f5f4d39a.9f392ac7.css


+ 1 - 1
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.a4878ddf.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.a4878ddf.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.bb2739e8.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.bb2739e8.js"></script></body></html>

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


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-160548f2.1ca36173.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-681a982c.1e4d0507.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-7723cd10.4e8e6358.js


File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/chunk-f5f4d39a.579b53c2.js


+ 8 - 22
hd/src/views/order/list.vue

@@ -139,7 +139,6 @@ export default {
 	},
 	data() {
 		return {
-			// x-crud
 			app: null,
 			tabIndex: '0',
 			tabsData: [
@@ -169,11 +168,7 @@ export default {
 					val: 0
 				}
 			],
-			// dialog
 			optionData: {}
-			// drawer
-			// 详情drawer
-			// shipData: []
 		};
 	},
 	created() {
@@ -188,7 +183,6 @@ export default {
 		selfGetCancel(id) {
 			this.$refs[`popover-` + id].doClose();
 		},
-		// drawer
 		noSendShipFn(item) {
 			this.$refs[`popover-` + item.id].doClose();
 
@@ -212,8 +206,6 @@ export default {
 				this.$refs.orderDetail.init();
 			});
 		},
-		// dialog
-		// crud
 		handleClick(tab, e) {
 			console.log(tab, e);
 			this.app.refresh({ status: this.tabIndex });
@@ -229,11 +221,6 @@ export default {
 			ctx.service(this.$service.order)
 				.set('table', {
 					columns: [
-						// {
-						// 	type: 'selection',
-						// 	align: 'center',
-						// 	width: '60'
-						// },
 						{
 							prop: 'orderSn',
 							label: '单号',
@@ -275,8 +262,13 @@ export default {
 							label: '总价',
 							align: 'center'
 						},
+,						{
+							prop: 'sendCost',
+							label: '运费',
+							align: 'center'
+						},
 						{
-							prop: 'actPrice',
+							prop: 'realPrice',
 							label: '实付款',
 							align: 'center',
 							emptyText: '无',
@@ -298,15 +290,9 @@ export default {
 							prop: 'status',
 							label: '状态',
 							align: 'center'
-						},
-						{
-							prop: 'inform',
-							label: '通知送到',
-							align: 'center'
 						}
 					],
-
-          on: {
+        			on: {
 						'row-click': (row, column) => {
 							this.detailShowFn(row)
 						}
@@ -419,4 +405,4 @@ export default {
 		top: 9px;
 	}
 }
-</style>
+</style>

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