5 years ago · 736ebf7d98
--- a/hd/dist/shop/css/chunk-01c56408.50ade1e3.css
+++ b/hd/dist/shop/css/chunk-01c56408.50ade1e3.css
--- a/hd/dist/shop/css/chunk-76714998.b5d0dcb7.css
+++ b/hd/dist/shop/css/chunk-76714998.b5d0dcb7.css
--- 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.a64a8ac4.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="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.a64a8ac4.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.e02269df.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="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.e02269df.js"></script></body></html>
														
--- a/hd/dist/shop/js/app.e02269df.js
+++ b/hd/dist/shop/js/app.e02269df.js
--- a/hd/dist/shop/js/chunk-01c56408.651dc216.js
+++ b/hd/dist/shop/js/chunk-01c56408.651dc216.js
--- a/hd/dist/shop/js/chunk-03fe24b3.08869c6d.js
+++ b/hd/dist/shop/js/chunk-03fe24b3.08869c6d.js
--- a/hd/dist/shop/js/chunk-76714998.0440f6b3.js
+++ b/hd/dist/shop/js/chunk-76714998.0440f6b3.js
--- a/hd/src/views/order/list.vue
+++ b/hd/src/views/order/list.vue
@@ -336,12 +336,12 @@ export default {
 
															 				])
														
 
															 				.on('refresh', async (params, { next }) => {
														
 
															 					// 继续执行刷新
														
 
															-					let { asset } = await next(params);
														
 
															-					this.tabsData[0].val = asset.totalOrder;
														
 
															-					this.tabsData[1].val = asset.unPayOrder;
														
 
															-					this.tabsData[2].val = asset.unSendOrder;
														
 
															-					this.tabsData[3].val = asset.sendingOrder;
														
 
															-					this.tabsData[4].val = asset.finishOrder;
														
 
															+					let { shop } = await next(params);
														
 
															+					this.tabsData[0].val = shop.totalOrder;
														
 
															+					this.tabsData[1].val = shop.unPayOrder;
														
 
															+					this.tabsData[2].val = shop.unSendOrder;
														
 
															+					this.tabsData[3].val = shop.sendingOrder;
														
 
															+					this.tabsData[4].val = shop.finishOrder;
														
 
															 				})
														
 
															 				.done();
														
 
															 			app.refresh({ status: this.tabIndex });
														
--- a/hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
+++ b/hdApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
+++ b/hdApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
+++ b/hdApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/admin/home/me.js
+++ b/hdApp/dist/build/mp-weixin/admin/home/me.js
--- a/hdApp/dist/build/mp-weixin/admin/home/me.wxml
+++ b/hdApp/dist/build/mp-weixin/admin/home/me.wxml
--- a/hdApp/dist/build/mp-weixin/admin/home/me.wxss
+++ b/hdApp/dist/build/mp-weixin/admin/home/me.wxss
--- a/hdApp/dist/build/mp-weixin/admin/home/order.js
+++ b/hdApp/dist/build/mp-weixin/admin/home/order.js
--- a/hdApp/dist/build/mp-weixin/admin/home/order.wxml
+++ b/hdApp/dist/build/mp-weixin/admin/home/order.wxml
--- a/hdApp/dist/build/mp-weixin/admin/home/order.wxss
+++ b/hdApp/dist/build/mp-weixin/admin/home/order.wxss
@@ -1,5 +1,5 @@
 
															-.app-content.data-v-fb77350e{padding-top:120rpx;padding-bottom:1rpx}.app-content .list-wrap .list.data-v-fb77350e{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list .list-top.data-v-fb77350e,
														
 
															-.app-content .list-wrap .list .list-bottom.data-v-fb77350e{padding:26rpx 0;border-bottom:1rpx solid #eee;color:#999}.app-content .list-wrap .list .list-top .app-bold.data-v-fb77350e,
														
 
															-.app-content .list-wrap .list .list-bottom .app-bold.data-v-fb77350e{color:#333}.app-content .list-wrap .list .list-top .freight-text.data-v-fb77350e,
														
 
															-.app-content .list-wrap .list .list-bottom .freight-text.data-v-fb77350e{margin-right:60rpx}.app-content .list-wrap .list .list-top .app-green.data-v-fb77350e,
														
 
															-.app-content .list-wrap .list .list-bottom .app-green.data-v-fb77350e{color:green}.app-content .list-wrap .list .list-bottom > ._div.data-v-fb77350e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-content .list-wrap .list .list-bottom .list-button.data-v-fb77350e{margin-top:26rpx}.app-content .list-wrap .list .list-bottom .list-button .admin-button-com.data-v-fb77350e{margin-left:20rpx}.upload-confirm-wrap.data-v-fb77350e{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-fb77350e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-fb77350e{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-fb77350e{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-fb77350e{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-fb77350e{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-fb77350e{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}
														
 
															+.app-content.data-v-fd902af4{padding-top:120rpx;padding-bottom:1rpx}.app-content .list-wrap .list.data-v-fd902af4{padding:0 30rpx;background-color:#fff;margin-bottom:20rpx}.app-content .list-wrap .list .list-top.data-v-fd902af4,
														
 
															+.app-content .list-wrap .list .list-bottom.data-v-fd902af4{padding:26rpx 0;border-bottom:1rpx solid #eee;color:#999}.app-content .list-wrap .list .list-top .app-bold.data-v-fd902af4,
														
 
															+.app-content .list-wrap .list .list-bottom .app-bold.data-v-fd902af4{color:#333}.app-content .list-wrap .list .list-top .freight-text.data-v-fd902af4,
														
 
															+.app-content .list-wrap .list .list-bottom .freight-text.data-v-fd902af4{margin-right:60rpx}.app-content .list-wrap .list .list-top .app-green.data-v-fd902af4,
														
 
															+.app-content .list-wrap .list .list-bottom .app-green.data-v-fd902af4{color:green}.app-content .list-wrap .list .list-bottom > ._div.data-v-fd902af4{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-content .list-wrap .list .list-bottom .list-button.data-v-fd902af4{margin-top:26rpx}.app-content .list-wrap .list .list-bottom .list-button .admin-button-com.data-v-fd902af4{margin-left:20rpx}.upload-confirm-wrap.data-v-fd902af4{max-height:600rpx;overflow-y:auto}.upload-confirm-wrap .modal-tit.data-v-fd902af4{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;font-size:40rpx;margin-top:30rpx;margin-bottom:50rpx}.upload-confirm-wrap .modal-tit .iconfont.data-v-fd902af4{color:#09bb07;margin-right:20rpx;font-size:50rpx}.upload-confirm-wrap .sel-wrap.data-v-fd902af4{color:#666;font-size:32rpx}.upload-confirm-wrap .sel-wrap .sel-tit.data-v-fd902af4{text-align:left}.upload-confirm-wrap .sel-wrap .sel-btn.data-v-fd902af4{display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-wrap:wrap;padding:10rpx 0 40rpx}.upload-confirm-wrap .sel-wrap .sel-btn .admin-button-com.data-v-fd902af4{margin-right:20rpx;margin-top:20rpx;padding-top:16rpx;padding-bottom:16rpx;border-radius:4rpx}
														
--- a/hdApp/dist/build/mp-weixin/admin/order/components/card-name.json
+++ b/hdApp/dist/build/mp-weixin/admin/order/components/card-name.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/app-coupon-sel.json
+++ b/hdApp/dist/build/mp-weixin/components/app-coupon-sel.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
+++ b/hdApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json
+++ b/hdApp/dist/build/mp-weixin/components/module/app-footer-cart.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json
+++ b/hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/app-search.json
+++ b/hdApp/dist/build/mp-weixin/components/module/app-search.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
+++ b/hdApp/dist/build/mp-weixin/components/module/app-share-mask.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/module/app-vip.json
+++ b/hdApp/dist/build/mp-weixin/components/module/app-vip.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/none-hd.json
+++ b/hdApp/dist/build/mp-weixin/components/none-hd.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/alert.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/alert.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/badge.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/badge.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/rate.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/rate.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/selectList.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/selectList.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "component": true,
														
 
															-  "usingComponents": {}
														
 
															+  "usingComponents": {},
														
 
															+  "component": true
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/components/plugin/tabs.json
+++ b/hdApp/dist/build/mp-weixin/components/plugin/tabs.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
+++ b/hdApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
@@ -1,4 +1,4 @@
 
															 {
														
 
															-  "usingComponents": {},
														
 
															-  "component": true
														
 
															+  "component": true,
														
 
															+  "usingComponents": {}
														
 
															 }
														
--- a/hdApp/src/admin/home/order.vue
+++ b/hdApp/src/admin/home/order.vue
@@ -258,12 +258,14 @@ export default {
 
															         page: this.list.page
														
 
															       }).then(res => {
														
 
															         this.completes(res);
														
 
															-        if (this.$util.isEmpty(res.data)) return false;
														
 
															-        // this.tabs[0].value = res.data.asset.totalOrder;
														
 
															-        // this.tabs[1].value = res.data.asset.unPayOrder;
														
 
															-        // this.tabs[2].value = res.data.asset.unSendOrder;
														
 
															-        // this.tabs[3].value = res.data.asset.sendingOrder;
														
 
															-        // this.tabs[4].value = res.data.asset.finishOrder;
														
 
															+        if (this.$util.isEmpty(res.data)){
														
 
															+          return false
														
 
															+        } 
														
 
															+        this.tabs[0].value = res.data.shop.totalOrder;
														
 
															+        this.tabs[1].value = res.data.shop.unPayOrder;
														
 
															+        this.tabs[2].value = res.data.shop.unSendOrder;
														
 
															+        this.tabs[3].value = res.data.shop.sendingOrder;
														
 
															+        this.tabs[4].value = res.data.shop.finishOrder;
														
 
															       });
														
 
															     },
														
 
															     change (e) {