Просмотр исходного кода

Merge branch 'master' of http://git.huaml.com/zhh/front-end

jiangfeng 5 лет назад
Родитель
Сommit
44650cc450
40 измененных файлов с 59 добавлено и 59 удалено
  1. 0 0
      ghs/dist/shop/css/chunk-40678a12.3597bef0.css
  2. 1 1
      ghs/dist/shop/index.html
  3. 0 0
      ghs/dist/shop/js/app.3ee72dcd.js
  4. 0 0
      ghs/dist/shop/js/chunk-366a7d97.a80f1275.js
  5. 0 0
      ghs/dist/shop/js/chunk-40678a12.b16bfe6b.js
  6. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/app-date-picker.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/app-result.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  15. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.js
  16. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml
  17. 0 0
      ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss
  18. 2 2
      ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json
  19. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.js
  20. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.wxml
  21. 0 0
      ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.wxss
  22. 2 2
      hdApp/dist/build/mp-weixin/components/app-coupon-sel.json
  23. 2 2
      hdApp/dist/build/mp-weixin/components/app-result.json
  24. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-close.json
  25. 2 2
      hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json
  26. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/rate.json
  27. 2 2
      hdApp/dist/build/mp-weixin/components/plugin/selectList.json
  28. 2 2
      hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  29. 2 2
      mallApp/dist/build/mp-weixin/components/app-img.json
  30. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-order-list.json
  31. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-share-mask.json
  32. 2 2
      mallApp/dist/build/mp-weixin/components/module/app-trademark.json
  33. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/alert.json
  34. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/list-cell.json
  35. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/list-view.json
  36. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/modal.json
  37. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/rate.json
  38. 2 2
      mallApp/dist/build/mp-weixin/components/plugin/tabs.json
  39. 2 2
      mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json
  40. 2 2
      mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-40678a12.3597bef0.css


+ 1 - 1
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.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>
+			}</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.3ee72dcd.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.3ee72dcd.js"></script></body></html>

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


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-366a7d97.a80f1275.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-40678a12.b16bfe6b.js


+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/detail.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesOrder/detail.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesPurchase/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesStorehouse/flower/category.wxss


+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/module/app-goods-commodity-style.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
hdApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-order-list.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/module/app-trademark.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/list-view.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/rate.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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