5 år sedan · 3fae3b8d19
--- a/ghs/dist/shop/css/chunk-0bcc8fcc.fd772955.css
+++ b/ghs/dist/shop/css/chunk-0bcc8fcc.fd772955.css
--- a/ghs/dist/shop/css/chunk-0f92f22d.36eab36b.css
+++ b/ghs/dist/shop/css/chunk-0f92f22d.36eab36b.css
--- a/ghs/dist/shop/css/chunk-278e6848.53ab2b7c.css
+++ b/ghs/dist/shop/css/chunk-278e6848.53ab2b7c.css
--- a/ghs/dist/shop/css/chunk-366a7d97.b1b0d473.css
+++ b/ghs/dist/shop/css/chunk-366a7d97.b1b0d473.css
--- a/ghs/dist/shop/css/chunk-d2c1b810.63f359dd.css
+++ b/ghs/dist/shop/css/chunk-d2c1b810.63f359dd.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.f2dd60f3.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.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.1c1e0cb4.js"></script><script src="/js/app.f2dd60f3.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.232ca120.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.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.1c1e0cb4.js"></script><script src="/js/app.232ca120.js"></script></body></html>
			
--- a/ghs/dist/shop/js/app.232ca120.js
+++ b/ghs/dist/shop/js/app.232ca120.js
--- a/ghs/dist/shop/js/chunk-0bcc8fcc.567ce9e1.js
+++ b/ghs/dist/shop/js/chunk-0bcc8fcc.567ce9e1.js
--- a/ghs/dist/shop/js/chunk-0f92f22d.0b847e98.js
+++ b/ghs/dist/shop/js/chunk-0f92f22d.0b847e98.js
--- a/ghs/dist/shop/js/chunk-278e6848.03179fcc.js
+++ b/ghs/dist/shop/js/chunk-278e6848.03179fcc.js
--- a/ghs/dist/shop/js/chunk-366a7d97.15b2bcb6.js
+++ b/ghs/dist/shop/js/chunk-366a7d97.15b2bcb6.js
--- a/ghs/dist/shop/js/chunk-485dc8a0.32a3370c.js
+++ b/ghs/dist/shop/js/chunk-485dc8a0.32a3370c.js
--- a/ghs/dist/shop/js/chunk-4f91691c.44d81c27.js
+++ b/ghs/dist/shop/js/chunk-4f91691c.44d81c27.js
--- a/ghs/dist/shop/js/chunk-d2c1b810.92919765.js
+++ b/ghs/dist/shop/js/chunk-d2c1b810.92919765.js
--- a/ghs/dist/shop/js/chunk-d4dcec66.31e0e447.js
+++ b/ghs/dist/shop/js/chunk-d4dcec66.31e0e447.js
--- a/ghs/src/views/order/components/sel-order.vue
+++ b/ghs/src/views/order/components/sel-order.vue
@@ -597,8 +597,8 @@ export default {
 
				 			this.$service.custom.clientInfo({ id: this.orderData.customId}).then(res => {
			
 
				 				this.orderForm.receiveCity = `${res.province}-${res.city}`
			
 
				 				this.orderForm.receiveAddress = `${res.address}`
			
 
				-				this.orderForm.customName = `${res.name}`
			
 
				-				this.orderForm.customMobile = `${res.mobile}`
			
 
				+				this.freightInfo.customName = `${res.name}`
			
 
				+				this.freightInfo.customMobile = `${res.mobile}`
			
 
				 				this.freightInfo.province = res.province;
			
 
				 				this.freightInfo.city = res.city;
			
 
				 				this.freightInfo.address = res.address;
			
--- 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/admin/home/components/module/operate.json
+++ b/ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
+++ b/ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/admin/home/workbench.js
+++ b/ghsApp/dist/build/mp-weixin/admin/home/workbench.js
--- a/ghsApp/dist/build/mp-weixin/admin/home/workbench.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/home/workbench.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/home/workbench.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/home/workbench.wxss
--- a/ghsApp/dist/build/mp-weixin/admin/shop/add.js
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/add.js
--- a/ghsApp/dist/build/mp-weixin/admin/shop/add.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/add.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/shop/add.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/add.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-09f3a04e{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-09f3a04e{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-09f3a04e{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-09f3a04e{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-09f3a04e{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-09f3a04e{height:240rpx}.confirm-btn.data-v-09f3a04e{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-09f3a04e{width:100%}
			
 
				+.app-content.data-v-cc10b728{min-height:calc(100vh - 20rpx);padding-top:20rpx}.prompt-text.data-v-cc10b728{color:#999;padding-left:30rpx;margin-bottom:30rpx}.module-com.data-v-cc10b728{margin-bottom:20rpx}.module-com .member-wrap .member-det.data-v-cc10b728{font-size:24rpx;margin-left:20rpx}.module-com .remark-wrap.data-v-cc10b728{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.module-com .remark-wrap .remark.data-v-cc10b728{height:240rpx}.confirm-btn.data-v-cc10b728{width:calc(100% - 60rpx);margin:60rpx 30rpx 20rpx}.confirm-btn .admin-button-com.data-v-cc10b728{width:100%}
			
--- a/ghsApp/dist/build/mp-weixin/admin/shop/list.js
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/list.js
--- a/ghsApp/dist/build/mp-weixin/admin/shop/list.wxml
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/list.wxml
--- a/ghsApp/dist/build/mp-weixin/admin/shop/list.wxss
+++ b/ghsApp/dist/build/mp-weixin/admin/shop/list.wxss
@@ -1 +1 @@
 
				-.app-content.data-v-3436d24c{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-3436d24c{background-color:#fff}.list-wrap .list.data-v-3436d24c{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-3436d24c{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-3436d24c{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-3436d24c{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-3436d24c{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-3436d24c:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-3436d24c{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-3436d24c{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}.staff-list .list-det .list-det-right > ._div.data-v-3436d24c{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-3436d24c:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-3436d24c{font-size:36rpx;color:#999}.app-footer.data-v-3436d24c{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-3436d24c{width:160rpx;margin-right:30rpx}
			
 
				+.app-content.data-v-10ba2229{min-height:calc(100vh - 100rpx);padding-bottom:100rpx}.list-wrap.data-v-10ba2229{background-color:#fff}.list-wrap .list.data-v-10ba2229{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;margin:0 30rpx;padding:30rpx 0;border-bottom:2rpx solid #eee}.staff-list .list-det.data-v-10ba2229{width:calc(100% - 110rpx);color:#999;margin-left:20rpx;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.staff-list .list-det .list-det-left .staff-name.data-v-10ba2229{color:#333;font-size:30rpx;font-weight:600;margin-right:20rpx}.staff-list .list-det .list-det-left .flex-center.data-v-10ba2229{margin-top:18rpx}.staff-list .list-det .list-det-left .status-list.data-v-10ba2229{margin-left:60rpx;color:#3385ff}.staff-list .list-det .list-det-left .status-list.data-v-10ba2229:first-child{margin-left:0}.staff-list .list-det .list-det-left .status-list .iconfont.data-v-10ba2229{font-size:24rpx;margin-right:10rpx}.staff-list .list-det .list-det-right.data-v-10ba2229{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}.staff-list .list-det .list-det-right > ._div.data-v-10ba2229{margin-left:50rpx}.staff-list .list-det .list-det-right > ._div.data-v-10ba2229:first-child{margin-left:0}.staff-list .list-det .list-det-right .iconfont.data-v-10ba2229{font-size:36rpx;color:#999}.app-footer.data-v-10ba2229{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.app-footer .admin-button-com.data-v-10ba2229{width:160rpx;margin-right:30rpx}
			
--- a/ghsApp/dist/build/mp-weixin/common/main.js
+++ b/ghsApp/dist/build/mp-weixin/common/main.js
--- a/ghsApp/dist/build/mp-weixin/common/vendor.js
+++ b/ghsApp/dist/build/mp-weixin/common/vendor.js
--- a/ghsApp/dist/build/mp-weixin/components/app-address-group.js
+++ b/ghsApp/dist/build/mp-weixin/components/app-address-group.js
--- a/ghsApp/dist/build/mp-weixin/components/app-address-group.wxml
+++ b/ghsApp/dist/build/mp-weixin/components/app-address-group.wxml
--- a/ghsApp/dist/build/mp-weixin/components/app-date-picker.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-date-picker.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/app-form-send1.js
+++ b/ghsApp/dist/build/mp-weixin/components/app-form-send1.js
--- 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-wrapper-empty.json
+++ b/ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- 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-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-share-mask.json
+++ b/ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- 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 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/modal.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/modal.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
@@ -1,4 +1,4 @@
 
				 {
			
 
				-  "component": true,
			
 
				-  "usingComponents": {}
			
 
				+  "usingComponents": {},
			
 
				+  "component": true
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
+++ b/ghsApp/dist/build/mp-weixin/components/plugin/tabs.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 @@
 
				 {
			
 
				-  "usingComponents": {},
			
 
				-  "component": true
			
 
				+  "component": true,
			
 
				+  "usingComponents": {}
			
 
				 }
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.js
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.js
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxml
@@ -1 +1 @@
 
				-<view class="affirm-page data-v-1f62971a"><view class="affirm-view overscroll data-v-1f62971a"><form class="data-v-1f62971a"><view class="module-com input-line-wrap data-v-1f62971a"><app-form-send vue-id="5f335135-1" form="{{form}}" customId="{{customId}}" orderid="{{orderId}}" data-event-opts="{{[['^updateForm',[['__set_sync',['$0','form','$event'],['']]]]]}}" bind:updateForm="__e" class="data-v-1f62971a" bind:__l="__l"></app-form-send></view></form><view class="admin-button-com-box data-v-1f62971a"><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com blue big data-v-1f62971a" bindtap="__e">确定</button></view></view><kd-entrance vue-id="5f335135-2" class="data-v-1f62971a" bind:__l="__l"></kd-entrance></view>
			
 
				+<view class="affirm-page data-v-722a3405"><view class="affirm-view overscroll data-v-722a3405"><form class="data-v-722a3405"><view class="module-com input-line-wrap data-v-722a3405"><app-form-send vue-id="5f335135-1" form="{{form}}" customId="{{customId}}" orderid="{{orderId}}" data-event-opts="{{[['^updateForm',[['__set_sync',['$0','form','$event'],['']]]]]}}" bind:updateForm="__e" class="data-v-722a3405" bind:__l="__l"></app-form-send></view></form><view class="admin-button-com-box data-v-722a3405"><button data-event-opts="{{[['tap',[['formSubmit',['$event']]]]]}}" class="admin-button-com blue big data-v-722a3405" bindtap="__e">确定</button></view></view><kd-entrance vue-id="5f335135-2" class="data-v-722a3405" bind:__l="__l"></kd-entrance></view>
			
--- a/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesOrder/shipInfo.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/add.js
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/add.js
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/details.js
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/details.js
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesStatistics/business.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStatistics/business.js
--- a/ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStatistics/business.wxss
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.js
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.js
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxml
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxml
--- a/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxss
+++ b/ghsApp/dist/build/mp-weixin/pagesStorehouse/inventory/update.wxss
--- a/ghsApp/src/App.vue
+++ b/ghsApp/src/App.vue
@@ -42,33 +42,7 @@ export default {
 
				 		const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
			
 
				 		uni.setStorageSync('account', extConfig.account)
			
 
				 		// #endif
			
 
				-		wxLoginFn(true)
			
 
				-			.then(res => {
			
 
				-				//客户可以访问的页面
			
 
				-				var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official','pagesClient/member/bind','pagesShare/pay'];
			
 
				-				var redirectPage = res.redirectPage;
			
 
				-				var needRedirect = true;
			
 
				-				urlArr.forEach((item, index, array) => {
			
 
				-					if (redirectPage.indexOf(item) != -1) {
			
 
				-						needRedirect = false;
			
 
				-					}
			
 
				-				})
			
 
				-				if (needRedirect === true) {
			
 
				-					//客户访问不能查看的页面跳转去官网
			
 
				-					if (res.data.shopAdminId == '0') {
			
 
				-						this.$util.pageTo({
			
 
				-							url: "/pagesClient/official/index",
			
 
				-							type: 2,
			
 
				-							query: {
			
 
				-								...this.option
			
 
				-							}
			
 
				-						});
			
 
				-					}
			
 
				-				}
			
 
				-				getUser(true)
			
 
				-				//获取门店信息
			
 
				-				this.setUserShopAll()
			
 
				-			})
			
 
				+
			
 
				 	},
			
 
				 	onLoad(){
			
 
				 		// const pages = getCurrentPages();
			
--- a/ghsApp/src/admin/billing/affirm.vue
+++ b/ghsApp/src/admin/billing/affirm.vue
@@ -220,6 +220,19 @@ export default {
 
				 			});
			
 
				 		},
			
 
				 		affirmFormSubmit(){
			
 
				+
			
 
				+			let rules = [
			
 
				+			{
			
 
				+				name: "customId",
			
 
				+				rule: ["required"],
			
 
				+				msg: ["请选择客户"]
			
 
				+			}];
			
 
				+			let checkRes = formUtil.validation(this.form, rules)
			
 
				+			if (checkRes) {
			
 
				+				this.$msg(checkRes)
			
 
				+				return false
			
 
				+			}
			
 
				+
			
 
				 			let self = this;
			
 
				 			uni.showModal({
			
 
				 				title: '提示',
			
@@ -239,7 +252,7 @@ export default {
 
				 				let formData = this.form;
			
 
				 
			
 
				 				const product = this.selectList.map(ele => {
			
 
				-					return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount };
			
 
				+					return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
			
 
				 				});
			
 
				 				formData.product = JSON.stringify(product);
			
 
				 				if (!this.getMerchantInfo) {
			
--- a/ghsApp/src/admin/home/workbench.vue
+++ b/ghsApp/src/admin/home/workbench.vue
@@ -302,47 +302,36 @@ export default {
 
				 	},
			
 
				 	methods: {
			
 
				 		init() {
			
 
				-			/*延迟监听token*/
			
 
				-			if(!uni.getStorageSync('token')){
			
 
				-				setTimeout(()=>{
			
 
				-					this.init();
			
 
				-				},100);
			
 
				-			}else{
			
 
				-				// 获取小程序的APPID
			
 
				-				getWeixinId().then(res => {
			
 
				-					this.getappIdList = res.data
			
 
				-				});
			
 
				-				getUser().then(res => {
			
 
				-					uni.setNavigationBarTitle({
			
 
				-						title: res.name
			
 
				-					});
			
 
				-
			
 
				-					let nowTime = getDataTimestamp(new Date(), true);
			
 
				-					if (nowTime > res.setDeadline) {
			
 
				-						this.renewMask = true;
			
 
				-					}
			
 
				-				});
			
 
				-				consoleIndex().then(res => {
			
 
				-					this.data = res.data;
			
 
				-					const { asset, todayData } = res.data;
			
 
				-					if (!this.$util.isEmpty(asset)) {
			
 
				-						// 订单总览
			
 
				-						this.orderData[0].value = asset.unPayOrder;
			
 
				-						this.orderData[1].value = asset.unSendOrder;
			
 
				-						this.orderData[2].value = asset.sendingOrder;
			
 
				-						// 总览数据
			
 
				-						this.totalData[0].value = asset.totalUser;
			
 
				-						this.totalData[1].value = asset.totalView;
			
 
				-						this.totalData[2].value = asset.finishOrder;
			
 
				-						this.totalData[3].value = asset.totalIncome;
			
 
				-						this.totalData[4].value = asset.totalExpend;
			
 
				-						this.totalData[5].value = asset.totalPurchase;
			
 
				-					}
			
 
				+			getWeixinId().then(res => {
			
 
				+				this.getappIdList = res.data
			
 
				+			});
			
 
				+			getUser().then(res => {
			
 
				+				uni.setNavigationBarTitle({
			
 
				+					title: res.name
			
 
				 				});
			
 
				-			}
			
 
				-
			
 
				-
			
 
				 
			
 
				+				let nowTime = getDataTimestamp(new Date(), true);
			
 
				+				if (nowTime > res.setDeadline) {
			
 
				+					this.renewMask = true;
			
 
				+				}
			
 
				+			});
			
 
				+			consoleIndex().then(res => {
			
 
				+				this.data = res.data;
			
 
				+				const { asset, todayData } = res.data;
			
 
				+				if (!this.$util.isEmpty(asset)) {
			
 
				+					// 订单总览
			
 
				+					this.orderData[0].value = asset.unPayOrder;
			
 
				+					this.orderData[1].value = asset.unSendOrder;
			
 
				+					this.orderData[2].value = asset.sendingOrder;
			
 
				+					// 总览数据
			
 
				+					this.totalData[0].value = asset.totalUser;
			
 
				+					this.totalData[1].value = asset.totalView;
			
 
				+					this.totalData[2].value = asset.finishOrder;
			
 
				+					this.totalData[3].value = asset.totalIncome;
			
 
				+					this.totalData[4].value = asset.totalExpend;
			
 
				+					this.totalData[5].value = asset.totalPurchase;
			
 
				+				}
			
 
				+			});
			
 
				 		},
			
 
				 		goPage (item) {
			
 
				 			if (item.url === '/admin/my-mall') {
			
--- a/ghsApp/src/components/app-address-group.vue
+++ b/ghsApp/src/components/app-address-group.vue
@@ -1,11 +1,6 @@
 
				 <template>
			
 
				 	<view>
			
 
				-		<tui-list-cell
			
 
				-			class="line-cell"
			
 
				-			:hover="false"
			
 
				-			:arrow="false"
			
 
				-			@click="openAddres"
			
 
				-		>
			
 
				+		<tui-list-cell class="line-cell" :hover="false" :arrow="false" @click="openAddres">
			
 
				 			<view class="tui-title ">{{ cityTitle }}</view>
			
 
				 			<view class="tui-input" v-if="form.province || form.city">
			
 
				 				{{ form.province + "-" + form.city }}
			
@@ -13,12 +8,15 @@
 
				 			<view class="tui-input" v-else>请选择</view>
			
 
				 			<input v-model="form.province" name="province" hidden />
			
 
				 		</tui-list-cell>
			
 
				-		<tui-list-cell
			
 
				-			class="line-cell"
			
 
				-			:hover="false"
			
 
				-			:arrow="true"
			
 
				-			@click="selRegionFn"
			
 
				-		>
			
 
				+		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
			
 
				+			<view class="tui-title ">客户名称</view>
			
 
				+			<input v-model="form.customName" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="客户名称"/>
			
 
				+		</tui-list-cell>
			
 
				+		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
			
 
				+			<view class="tui-title ">客户手机</view>
			
 
				+			<input v-model="form.customMobile" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="客户手机"/>
			
 
				+		</tui-list-cell>
			
 
				+		<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
			
 
				 			<view class="tui-title ">{{ detailTitle }}</view>
			
 
				 			<view class="tui-input" v-if="form.address">{{ form.address }}</view>
			
 
				 			<view class="tui-placeholder" v-else>请填写详细地址</view>
			
@@ -26,21 +24,10 @@
 
				 		</tui-list-cell>
			
 
				 		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
			
 
				 			<view class="tui-title ">门牌号</view>
			
 
				-			<input
			
 
				-				v-model="form.floor"
			
 
				-				placeholder-class="phcolor"
			
 
				-				class="tui-input"
			
 
				-				name="floor"
			
 
				-				@input="changeFloor"
			
 
				-				placeholder="楼号门牌号（选填）"
			
 
				-			/>
			
 
				+			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号（选填）"/>
			
 
				 		</tui-list-cell>
			
 
				 		<!-- 选择地区 -->
			
 
				-		<app-area-sel
			
 
				-			:show.sync="showRegion"
			
 
				-			@change="changeAreaFn"
			
 
				-			:city="form.city"
			
 
				-		/>
			
 
				+		<app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city"/>
			
 
				 		<!-- 省市联动 -->
			
 
				 		<!-- <simple-address
			
 
				 			ref="simpleAddress"
			
@@ -89,6 +76,8 @@ export default {
 
				 			cityPickerValueDefault: [0, 0],
			
 
				 			form: {
			
 
				 				province: "",
			
 
				+				customMobile: "",
			
 
				+				customName: "",
			
 
				 				city: "",
			
 
				 				address: "",
			
 
				 				floor: "",
			
@@ -114,13 +103,15 @@ export default {
 
				           this.form.address = res.data.address;
			
 
				           this.form.latitude = res.data.lat;
			
 
				           this.form.longitude = res.data.long;
			
 
				+          this.form.customMobile = res.data.name;
			
 
				+          this.form.customName = res.data.mobile;
			
 
				           this.$emit("selectAdress", this.form);
			
 
				         })
			
 
				       } else {
			
 
				         this.form.province = this.getMyShopInfo.province;
			
 
				         this.form.city = this.getMyShopInfo.city;
			
 
				       }
			
 
				-			
			
 
				+
			
 
				 		},
			
 
				 		formatForm() {
			
 
				 			Object.keys(this.form).forEach(i => {
			
@@ -151,9 +142,9 @@ export default {
 
				 			this.form.longitude = e.location.lng;
			
 
				 			this.$emit("selectAdress", this.form);
			
 
				 		},
			
 
				-		changeFloor(e) {
			
 
				-			this.$emit("selectAdress", this.form);
			
 
				-		}
			
 
				+		// changeFloor(e) {
			
 
				+		// 	this.$emit("selectAdress", this.form);
			
 
				+		// }
			
 
				 	},
			
 
				 	watch: {
			
 
				 		getFormObj() {
			
--- a/ghsApp/src/components/app-form-send1.vue
+++ b/ghsApp/src/components/app-form-send1.vue
@@ -12,8 +12,8 @@
 
				 		</tui-list-cell>
			
 
				 		<!-- 门店送或快递送需要设置地址 -->
			
 
				 		<appAddressGroup :customId="customId" cityTitle="配送城市" @selectAdress="selectAdress" ></appAddressGroup>
			
 
				-		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->  
			
 
				-    	<appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
			
 
				+		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->
			
 
				+		<appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
			
 
				 		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
			
 
				 			<view class="tui-title">运费</view>
			
 
				 			<view v-if="formData.sendCost" class="tui-input">
			
@@ -52,6 +52,8 @@ export default {
 
				 		return {
			
 
				 			formData: {
			
 
				 				sendCost: "",
			
 
				+				customName: "",
			
 
				+				customMobile: "",
			
 
				 				receiveProvince: "",
			
 
				 				receiveCity: "",
			
 
				 				receiveFloor: "",
			
@@ -112,12 +114,16 @@ export default {
 
				 				this.formData.receiveAddress = info.address;
			
 
				 				this.formData.receiveLong = info.longitude;
			
 
				 				this.formData.receiveLat = info.latitude;
			
 
				+				this.formData.customName = info.customName;
			
 
				+				this.formData.customMobile = info.customMobile;
			
 
				 			}
			
 
				 
			
 
				 			console.log('this.formData',this.formData)
			
 
				 			this.$nextTick(() => {
			
 
				 				let params = {
			
 
				 					id: this.orderid,
			
 
				+					customName: this.formData.customName,
			
 
				+					customMobile: this.formData.customMobile,
			
 
				 					province: this.formData.receiveProvince,
			
 
				 					city:this.formData.receiveCity,
			
 
				 					address:this.formData.receiveAddress,
			
--- a/ghsApp/src/mixins/globalMixins.js
+++ b/ghsApp/src/mixins/globalMixins.js
@@ -1,4 +1,4 @@
 
				-import { mapGetters } from 'vuex'
			
 
				+import { mapGetters,mapActions } from 'vuex'
			
 
				 import { pageTo, getCheckLogin, isLogin } from '@/utils/util.js'
			
 
				 import { getUser, wxLoginFn } from '@/utils/auth'
			
 
				 import constant from '@/constant'
			
@@ -28,9 +28,46 @@ export default {
 
				 			uni.setStorageSync('account', option.account)
			
 
				 		}
			
 
				 		uni.setStorageSync('currentQuery', JSON.stringify(option))
			
 
				-		if (this.init) {
			
 
				-			this.init()
			
 
				-		}
			
 
				+		// if (isLogin()) {
			
 
				+		// 	if (this.init) {
			
 
				+		// 		this.init()
			
 
				+		// 	}
			
 
				+		// }else{}
			
 
				+			wxLoginFn(true)
			
 
				+				.then(res => {
			
 
				+					//客户可以访问的页面
			
 
				+					var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official','pagesClient/member/bind','pagesShare/pay'];
			
 
				+					var redirectPage = res.redirectPage;
			
 
				+					var needRedirect = true;
			
 
				+					urlArr.forEach((item, index, array) => {
			
 
				+						if (redirectPage.indexOf(item) != -1) {
			
 
				+							needRedirect = false;
			
 
				+						}
			
 
				+					})
			
 
				+					if (needRedirect === true) {
			
 
				+						//客户访问不能查看的页面跳转去官网
			
 
				+						if (res.data.shopAdminId == '0') {
			
 
				+							this.$util.pageTo({
			
 
				+								url: "/pagesClient/official/index",
			
 
				+								type: 2,
			
 
				+								query: {
			
 
				+									...this.option
			
 
				+								}
			
 
				+							});
			
 
				+						}
			
 
				+					}
			
 
				+					getUser(true)
			
 
				+					//获取门店信息
			
 
				+					this.setUserShopAll()
			
 
				+					if (this.init) {
			
 
				+						this.init()
			
 
				+					}
			
 
				+				})
			
 
				+
			
 
				+
			
 
				+	},
			
 
				+	methods: {
			
 
				+		...mapActions(['setUserShopAll'])
			
 
				 	},
			
 
				 	mounted() {
			
 
				 		if (this.mInit) {
			
--- a/ghsApp/src/pagesOrder/detail.vue
+++ b/ghsApp/src/pagesOrder/detail.vue
@@ -43,12 +43,18 @@
 
				 					</view>
			
 
				 				</view>
			
 
				 				<view class="order-info_box">
			
 
				-					<view>开单：</view>
			
 
				+					<view>开单员：</view>
			
 
				 					<view>{{ detailInfo.shopAdminName }}</view>
			
 
				 				</view>
			
 
				 				<view class="order-info_box">
			
 
				 					<view>出货日期：</view>
			
 
				-					<view>{{ detailInfo.outTime }}</view>
			
 
				+					<view v-if="detailInfo.outTime == '0000-00-00 00:00:00'">-</view>
			
 
				+					<view v-else>{{ detailInfo.outTime }}</view>
			
 
				+				</view>
			
 
				+				<view class="order-info_box">
			
 
				+					<view>客户下单：</view>
			
 
				+					<view v-if="detailInfo.customShopAdminId == 0">-</view>
			
 
				+					<view v-else>✔</view>
			
 
				 				</view>
			
 
				 				<view class="order-info_box">
			
 
				 					<view>欠款：</view>
			
@@ -164,7 +170,6 @@
 
				 			:size="32"
			
 
				 			padding="30rpx 30rpx"
			
 
				 		></modal-module>
			
 
				-    <kd-entrance></kd-entrance>
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
--- a/ghsApp/src/pagesOrder/shipInfo.vue
+++ b/ghsApp/src/pagesOrder/shipInfo.vue
@@ -82,14 +82,12 @@ export default {
 
				 		this.orderId = e.orderId;
			
 
				 		if (!this.getMerchantInfo && this.customId != '0') {
			
 
				 			this.initMerchantInfo().then(data => {
			
 
				-				uni.setNavigationBarTitle({
			
 
				-					title: data.name
			
 
				-				});
			
 
				+				// uni.setNavigationBarTitle({title: data.name});
			
 
				+				uni.setNavigationBarTitle({title: '确认客户地址'});
			
 
				 			});
			
 
				 		} else {
			
 
				-			uni.setNavigationBarTitle({
			
 
				-				title: this.getMerchantInfo.name
			
 
				-			});
			
 
				+			// uni.setNavigationBarTitle({title: this.getMerchantInfo.name});
			
 
				+			uni.setNavigationBarTitle({title: '确认客户地址'});
			
 
				 		}
			
 
				 	},
			
 
				 	computed: {
			
--- a/ghsApp/src/pagesPurchase/add.vue
+++ b/ghsApp/src/pagesPurchase/add.vue
@@ -142,11 +142,7 @@
 
				 			padding="30rpx 30rpx"
			
 
				 		>
			
 
				 		</modal-module> -->
			
 
				-		<FooterCart
			
 
				-			:price="allPrice"
			
 
				-			:count="allCount"
			
 
				-			@confirm="confirmSelectEvent"
			
 
				-		></FooterCart>
			
 
				+		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
			
 
				     <kd-entrance></kd-entrance>
			
 
				 	</view>
			
 
				 </template>
			
--- a/ghsApp/src/pagesPurchase/details.vue
+++ b/ghsApp/src/pagesPurchase/details.vue
@@ -305,6 +305,7 @@ export default {
 
				 						productId: ele.id,
			
 
				 						bigNum: ele.bigCount,
			
 
				 						smallNum: ele.smallCount,
			
 
				+						itemId:ele.itemId,
			
 
				 						itemPrice: ele.itemPrice || this.getSelectItemPrice(ele)
			
 
				 					};
			
 
				 				});
			
--- a/ghsApp/src/pagesStatistics/business.vue
+++ b/ghsApp/src/pagesStatistics/business.vue
@@ -52,8 +52,8 @@
 
				 			<view class="space-view space-remark">
			
 
				 				<view class="space-left">
			
 
				 					<view class="show-item">
			
 
				-						<view class="show-name">库存总数</view>
			
 
				-						<view class="show-value">{{baseInfo.stockNum}}</view>
			
 
				+						<view class="show-name">库存总数（大约）</view>
			
 
				+						<view class="show-value">{{baseInfo.stockNum}}/2</view>
			
 
				 					</view>
			
 
				 				</view>
			
 
				 				<view class="space-right">
			
@@ -76,29 +76,12 @@
 
				 						</text>
			
 
				 					</view>
			
 
				 				</view>
			
 
				-				<view class="space-right">
			
 
				-					<view :class="['show-tag',baseInfo.todayCompareYesterday>0?'up':'down']">
			
 
				-						<view class="tag">
			
 
				-							同期
			
 
				-							<image class="arrow" :src="baseInfo.todayCompareYesterday>0? 'http://img.huaml.com/common/icon_down.png' : 'http://img.huaml.com/common/icon_up.png'" />
			
 
				-						</view>
			
 
				-						<text>{{baseInfo.todayCompareYesterday}}</text>
			
 
				-					</view>
			
 
				-				</view>
			
 
				 			</view>
			
 
				 			<view class="space-view space-remark">
			
 
				 				<view class="space-left">
			
 
				 					<view class="show-item">
			
 
				 						<view class="show-name">近7天销售</view>
			
 
				 						<view class="show-value"><text class="unit">￥</text>{{baseInfo.latestSeven}}</view>
			
 
				-
			
 
				-						<view :class="['show-tag',baseInfo.latestSevenSameTerm>0?'up':'down']">
			
 
				-							<view class="tag">
			
 
				-								同期
			
 
				-								<image class="arrow" :src="baseInfo.todayCompareYesterday>0? 'http://img.huaml.com/common/icon_down.png' : 'http://img.huaml.com/common/icon_up.png'" />
			
 
				-							</view>
			
 
				-							<text>{{baseInfo.latestSevenSameTerm}}</text>
			
 
				-						</view>
			
 
				 					</view>
			
 
				 				</view>
			
 
				 				<view class="space-right">
			
@@ -107,13 +90,6 @@
 
				 							近30天销售
			
 
				 						</view>
			
 
				 						<view class="show-value red"><text class="unit">￥</text>{{baseInfo.latestThirty}}</view>
			
 
				-						<view :class="['show-tag',baseInfo.latestThirtySameTerm>0?'up':'down']">
			
 
				-							<view class="tag ">
			
 
				-								同期
			
 
				-								<image class="arrow" :src="baseInfo.todayCompareYesterday>0? 'http://img.huaml.com/common/icon_down.png' : 'http://img.huaml.com/common/icon_up.png'" />
			
 
				-							</view>
			
 
				-							<text>{{baseInfo.latestThirtySameTerm}}</text>
			
 
				-						</view>
			
 
				 					</view>
			
 
				 				</view>
			
 
				 			</view>
			
@@ -213,7 +189,6 @@ export default {
 
				 	},
			
 
				 	methods:{
			
 
				 		async init(id){
			
 
				-				// this.shopId = this.userInfo.id
			
 
				 				this.shopId = id?id:this.getMyShopInfo.id
			
 
				 				uni.showLoading({
			
 
				 					title: '加载中'
			
--- a/ghsApp/src/pagesStorehouse/inventory/update.vue
+++ b/ghsApp/src/pagesStorehouse/inventory/update.vue
@@ -286,7 +286,7 @@ export default {
 
				 					return {
			
 
				 						bigNum: ele.bigCount,
			
 
				 						smallNum: ele.smallCount,
			
 
				-						productId: ele.id
			
 
				+						productId: ele.id,classId:ele.classId,itemId:ele.itemId
			
 
				 					};
			
 
				 				});
			
 
				 				params.itemInfo = JSON.stringify(formatList);
			
--- a/hd/dist/shop/css/chunk-090ebb38.2bee2186.css
+++ b/hd/dist/shop/css/chunk-090ebb38.2bee2186.css
--- a/hd/dist/shop/css/chunk-0a97db1a.408d898b.css
+++ b/hd/dist/shop/css/chunk-0a97db1a.408d898b.css
--- a/hd/dist/shop/css/chunk-1f5e4716.c8920469.css
+++ b/hd/dist/shop/css/chunk-1f5e4716.c8920469.css
--- a/hd/dist/shop/css/chunk-29e9dc5e.8892b558.css
+++ b/hd/dist/shop/css/chunk-29e9dc5e.8892b558.css
--- a/hd/dist/shop/css/chunk-31e0df46.7a32ffd7.css
+++ b/hd/dist/shop/css/chunk-31e0df46.7a32ffd7.css
--- a/hd/dist/shop/css/chunk-83953658.984dbcec.css
+++ b/hd/dist/shop/css/chunk-83953658.984dbcec.css
--- a/hd/dist/shop/css/chunk-9f0fc064.2629bd86.css
+++ b/hd/dist/shop/css/chunk-9f0fc064.2629bd86.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.094b6ae4.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.094b6ae4.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.d3d78f44.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.d3d78f44.js"></script></body></html>
			
--- a/hd/dist/shop/js/app.d3d78f44.js
+++ b/hd/dist/shop/js/app.d3d78f44.js
--- a/hd/dist/shop/js/chunk-090ebb38.06962948.js
+++ b/hd/dist/shop/js/chunk-090ebb38.06962948.js
--- a/hd/dist/shop/js/chunk-0a97db1a.d21bc4b4.js
+++ b/hd/dist/shop/js/chunk-0a97db1a.d21bc4b4.js
--- a/hd/dist/shop/js/chunk-1f5e4716.8937ea5c.js
+++ b/hd/dist/shop/js/chunk-1f5e4716.8937ea5c.js
--- a/hd/dist/shop/js/chunk-29e9dc5e.79baa67d.js
+++ b/hd/dist/shop/js/chunk-29e9dc5e.79baa67d.js
--- a/hd/dist/shop/js/chunk-2d2077f4.7ca61725.js
+++ b/hd/dist/shop/js/chunk-2d2077f4.7ca61725.js
--- a/hd/dist/shop/js/chunk-2d2077f4.857c2160.js
+++ b/hd/dist/shop/js/chunk-2d2077f4.857c2160.js
--- a/hd/dist/shop/js/chunk-31e0df46.1f08d2f3.js
+++ b/hd/dist/shop/js/chunk-31e0df46.1f08d2f3.js
--- a/hd/dist/shop/js/chunk-333a3ec1.7dedf942.js
+++ b/hd/dist/shop/js/chunk-333a3ec1.7dedf942.js
--- a/hd/dist/shop/js/chunk-83953658.562078b6.js
+++ b/hd/dist/shop/js/chunk-83953658.562078b6.js
--- a/hd/dist/shop/js/chunk-9f0fc064.7dffcf68.js
+++ b/hd/dist/shop/js/chunk-9f0fc064.7dffcf68.js