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

Merge branch 'redesign‌-260706' of http://git.huaml.com/zhh/front-end into redesign‌-260706

ouyang 11 часов назад
Родитель
Сommit
bc85785cc1
70 измененных файлов с 159 добавлено и 422 удалено
  1. 0 0
      ghs/dist/shop/css/chunk-03047a48.c5a1f61b.css
  2. 0 0
      ghs/dist/shop/css/chunk-095359c4.4dc6c0e0.css
  3. 0 1
      ghs/dist/shop/css/chunk-0e0fefce.b893443e.css
  4. 0 1
      ghs/dist/shop/css/chunk-0eab651a.a6f67597.css
  5. 1 0
      ghs/dist/shop/css/chunk-0fbb0d78.f9f36361.css
  6. 0 1
      ghs/dist/shop/css/chunk-0fea4616.8f58d5ec.css
  7. 0 1
      ghs/dist/shop/css/chunk-1b2d26ee.2956b453.css
  8. 1 0
      ghs/dist/shop/css/chunk-1c0b054a.96e01462.css
  9. 0 0
      ghs/dist/shop/css/chunk-331aefcd.a8c34017.css
  10. 0 1
      ghs/dist/shop/css/chunk-48bc33bc.d9a344b0.css
  11. 0 1
      ghs/dist/shop/css/chunk-51409826.9176646e.css
  12. 1 0
      ghs/dist/shop/css/chunk-516ca2cc.f8ecbd5b.css
  13. 0 0
      ghs/dist/shop/css/chunk-604178a0.c5f747f7.css
  14. 1 0
      ghs/dist/shop/css/chunk-684b01ee.9cccd3f7.css
  15. 0 1
      ghs/dist/shop/css/chunk-7393666a.32428090.css
  16. 0 0
      ghs/dist/shop/css/chunk-a2bde5c0.dc8d02ba.css
  17. 1 0
      ghs/dist/shop/css/chunk-acaba0d4.9db540b1.css
  18. 1 0
      ghs/dist/shop/css/chunk-b31eb348.4462e27d.css
  19. 0 1
      ghs/dist/shop/css/chunk-d4d5e79a.fd76b08f.css
  20. 1 0
      ghs/dist/shop/css/chunk-daceb846.d771b682.css
  21. 1 0
      ghs/dist/shop/css/chunk-db349422.fef2da73.css
  22. 2 2
      ghs/dist/shop/index.html
  23. 0 0
      ghs/dist/shop/js/app.a084fc64.js
  24. 0 0
      ghs/dist/shop/js/chunk-03047a48.e88ba72f.js
  25. 0 0
      ghs/dist/shop/js/chunk-07e850e4.683ab200.js
  26. 0 0
      ghs/dist/shop/js/chunk-095359c4.a0c1a5a2.js
  27. 0 0
      ghs/dist/shop/js/chunk-0e0fefce.8b80ab2c.js
  28. 0 0
      ghs/dist/shop/js/chunk-0eab651a.7c38b68e.js
  29. 0 0
      ghs/dist/shop/js/chunk-0fbb0d78.99d1e961.js
  30. 0 0
      ghs/dist/shop/js/chunk-17904d5a.7c549d11.js
  31. 0 0
      ghs/dist/shop/js/chunk-1b2d26ee.97d3d235.js
  32. 0 0
      ghs/dist/shop/js/chunk-1c0b054a.6bd2279a.js
  33. 0 0
      ghs/dist/shop/js/chunk-1de2da8a.f82595b0.js
  34. 0 0
      ghs/dist/shop/js/chunk-331aefcd.34b3d43f.js
  35. 0 0
      ghs/dist/shop/js/chunk-38b4cad2.a847d447.js
  36. 0 0
      ghs/dist/shop/js/chunk-48bc33bc.520aeb5c.js
  37. 0 0
      ghs/dist/shop/js/chunk-51409826.bd7d43c7.js
  38. 0 0
      ghs/dist/shop/js/chunk-516ca2cc.8fb14f3c.js
  39. 0 0
      ghs/dist/shop/js/chunk-604178a0.0a7b50ad.js
  40. 0 0
      ghs/dist/shop/js/chunk-684b01ee.bcbf3e03.js
  41. 0 0
      ghs/dist/shop/js/chunk-7393666a.1d16cf93.js
  42. 0 0
      ghs/dist/shop/js/chunk-a2bde5c0.d2bfbb97.js
  43. 0 0
      ghs/dist/shop/js/chunk-acaba0d4.8a8ec0c7.js
  44. 0 0
      ghs/dist/shop/js/chunk-b31eb348.17453422.js
  45. 0 0
      ghs/dist/shop/js/chunk-daceb846.f9a5f5d5.js
  46. 0 0
      ghs/dist/shop/js/chunk-db349422.38abe2fd.js
  47. 2 2
      hd/dist/shop/index.html
  48. 0 0
      hd/dist/shop/js/app.b4700f5d.js
  49. 50 153
      hdApp/src/admin/birthday/board.vue
  50. 37 68
      hdApp/src/admin/cg/item.vue
  51. 13 4
      hdApp/src/components/module/dateSelect.vue
  52. 36 174
      hdApp/src/pagesPurchase/gathering.vue
  53. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.CK36Qeja.js
  54. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DzGsaf_H.js
  55. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js
  56. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js
  57. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DTgG1l5h.js
  58. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.B1zf-g75.js
  59. 1 1
      hdh5/unpackage/dist/build/web/assets/index-BJhhWmNe.js
  60. 1 1
      hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js
  61. 1 1
      hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js
  62. 0 0
      hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.Dkko0no6.js
  63. 1 1
      hdh5/unpackage/dist/build/web/index.html
  64. 1 1
      mallh5/unpackage/dist/build/web/assets/index-BYPdUZs5.js
  65. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js
  66. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.BcI6NZxo.js
  67. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.0c7SA6vH.js
  68. 1 1
      mallh5/unpackage/dist/build/web/index.html
  69. 2 2
      pt/dist/web/index.html
  70. 0 0
      pt/dist/web/js/app.c81dca2d.js

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


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


+ 0 - 1
ghs/dist/shop/css/chunk-0e0fefce.b893443e.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-1e45d00f]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-1e45d00f]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-1e45d00f]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-1e45d00f]{font-size:18px}.el-dialog .el-dialog__body[data-v-1e45d00f]{padding:20px}.el-dialog .el-dialog__footer[data-v-1e45d00f]{padding-bottom:15px}.shop-list[data-v-1e45d00f]{height:100%}

+ 0 - 1
ghs/dist/shop/css/chunk-0eab651a.a6f67597.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-2cffbcea]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-2cffbcea]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-2cffbcea]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-2cffbcea]{font-size:18px}.el-dialog .el-dialog__body[data-v-2cffbcea]{padding:20px}.el-dialog .el-dialog__footer[data-v-2cffbcea]{padding-bottom:15px}.shop-list[data-v-2cffbcea]{height:100%}.yj-total-wrap[data-v-2cffbcea]{display:block;width:100%}.yj-total-nums[data-v-2cffbcea]{display:block;line-height:1.6}.yj-total-tip[data-v-2cffbcea]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 1 - 0
ghs/dist/shop/css/chunk-0fbb0d78.f9f36361.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-01019526]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-01019526]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-01019526]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-01019526]{font-size:18px}.el-dialog .el-dialog__body[data-v-01019526]{padding:20px}.el-dialog .el-dialog__footer[data-v-01019526]{padding-bottom:15px}.shop-list[data-v-01019526]{height:100%}

+ 0 - 1
ghs/dist/shop/css/chunk-0fea4616.8f58d5ec.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-c589bab2]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-c589bab2]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-c589bab2]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-c589bab2]{font-size:18px}.el-dialog .el-dialog__body[data-v-c589bab2]{padding:20px}.el-dialog .el-dialog__footer[data-v-c589bab2]{padding-bottom:15px}.shop-list[data-v-c589bab2]{height:100%}.yj-total-wrap[data-v-c589bab2]{display:block;width:100%}.yj-total-nums[data-v-c589bab2]{display:block;line-height:1.6}.yj-total-tip[data-v-c589bab2]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 0 - 1
ghs/dist/shop/css/chunk-1b2d26ee.2956b453.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-352d1622]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-352d1622]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-352d1622]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-352d1622]{font-size:18px}.el-dialog .el-dialog__body[data-v-352d1622]{padding:20px}.el-dialog .el-dialog__footer[data-v-352d1622]{padding-bottom:15px}.shop-list[data-v-352d1622]{height:100%}.yj-total-wrap[data-v-352d1622]{display:block;width:100%}.yj-total-nums[data-v-352d1622]{display:block;line-height:1.6}.yj-total-tip[data-v-352d1622]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 1 - 0
ghs/dist/shop/css/chunk-1c0b054a.96e01462.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-2e05e4e2]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-2e05e4e2]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-2e05e4e2]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-2e05e4e2]{font-size:18px}.el-dialog .el-dialog__body[data-v-2e05e4e2]{padding:20px}.el-dialog .el-dialog__footer[data-v-2e05e4e2]{padding-bottom:15px}.shop-list[data-v-2e05e4e2]{height:100%}

+ 0 - 0
ghs/dist/shop/css/chunk-1de2da8a.a8c34017.css → ghs/dist/shop/css/chunk-331aefcd.a8c34017.css


+ 0 - 1
ghs/dist/shop/css/chunk-48bc33bc.d9a344b0.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-579067f3]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-579067f3]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-579067f3]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-579067f3]{font-size:18px}.el-dialog .el-dialog__body[data-v-579067f3]{padding:20px}.el-dialog .el-dialog__footer[data-v-579067f3]{padding-bottom:15px}.shop-list[data-v-579067f3]{height:100%}.sale-total-wrap[data-v-579067f3]{display:block;width:100%}.sale-total-nums[data-v-579067f3]{display:block;line-height:1.6}

+ 0 - 1
ghs/dist/shop/css/chunk-51409826.9176646e.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-516bbbd2]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-516bbbd2]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-516bbbd2]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-516bbbd2]{font-size:18px}.el-dialog .el-dialog__body[data-v-516bbbd2]{padding:20px}.el-dialog .el-dialog__footer[data-v-516bbbd2]{padding-bottom:15px}.shop-list[data-v-516bbbd2]{height:100%}

+ 1 - 0
ghs/dist/shop/css/chunk-516ca2cc.f8ecbd5b.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-1744bb26]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-1744bb26]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-1744bb26]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-1744bb26]{font-size:18px}.el-dialog .el-dialog__body[data-v-1744bb26]{padding:20px}.el-dialog .el-dialog__footer[data-v-1744bb26]{padding-bottom:15px}.shop-list[data-v-1744bb26]{height:100%}.yj-total-wrap[data-v-1744bb26]{display:block;width:100%}.yj-total-nums[data-v-1744bb26]{display:block;line-height:1.6}.yj-total-tip[data-v-1744bb26]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

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


+ 1 - 0
ghs/dist/shop/css/chunk-684b01ee.9cccd3f7.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-e54155c2]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-e54155c2]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-e54155c2]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-e54155c2]{font-size:18px}.el-dialog .el-dialog__body[data-v-e54155c2]{padding:20px}.el-dialog .el-dialog__footer[data-v-e54155c2]{padding-bottom:15px}.shop-list[data-v-e54155c2]{height:100%}.sale-total-wrap[data-v-e54155c2]{display:block;width:100%}.sale-total-nums[data-v-e54155c2]{display:block;line-height:1.6}

+ 0 - 1
ghs/dist/shop/css/chunk-7393666a.32428090.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-0dc93d2e]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-0dc93d2e]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-0dc93d2e]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-0dc93d2e]{font-size:18px}.el-dialog .el-dialog__body[data-v-0dc93d2e]{padding:20px}.el-dialog .el-dialog__footer[data-v-0dc93d2e]{padding-bottom:15px}.shop-list[data-v-0dc93d2e]{height:100%}.yj-total-wrap[data-v-0dc93d2e]{display:block;width:100%}.yj-total-nums[data-v-0dc93d2e]{display:block;line-height:1.6}.yj-total-tip[data-v-0dc93d2e]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

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


+ 1 - 0
ghs/dist/shop/css/chunk-acaba0d4.9db540b1.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-41d99984]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-41d99984]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-41d99984]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-41d99984]{font-size:18px}.el-dialog .el-dialog__body[data-v-41d99984]{padding:20px}.el-dialog .el-dialog__footer[data-v-41d99984]{padding-bottom:15px}.shop-list[data-v-41d99984]{height:100%}.cg-total-wrap[data-v-41d99984]{display:block;width:100%}.cg-total-nums[data-v-41d99984]{display:block;line-height:1.6}

+ 1 - 0
ghs/dist/shop/css/chunk-b31eb348.4462e27d.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-219ddd5a]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-219ddd5a]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-219ddd5a]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-219ddd5a]{font-size:18px}.el-dialog .el-dialog__body[data-v-219ddd5a]{padding:20px}.el-dialog .el-dialog__footer[data-v-219ddd5a]{padding-bottom:15px}.shop-list[data-v-219ddd5a]{height:100%}.yj-total-wrap[data-v-219ddd5a]{display:block;width:100%}.yj-total-nums[data-v-219ddd5a]{display:block;line-height:1.6}.yj-total-tip[data-v-219ddd5a]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 0 - 1
ghs/dist/shop/css/chunk-d4d5e79a.fd76b08f.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-12308a12]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-12308a12]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-12308a12]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-12308a12]{font-size:18px}.el-dialog .el-dialog__body[data-v-12308a12]{padding:20px}.el-dialog .el-dialog__footer[data-v-12308a12]{padding-bottom:15px}.shop-list[data-v-12308a12]{height:100%}.cg-total-wrap[data-v-12308a12]{display:block;width:100%}.cg-total-nums[data-v-12308a12]{display:block;line-height:1.6}

+ 1 - 0
ghs/dist/shop/css/chunk-daceb846.d771b682.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-46ff8ed3]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-46ff8ed3]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-46ff8ed3]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-46ff8ed3]{font-size:18px}.el-dialog .el-dialog__body[data-v-46ff8ed3]{padding:20px}.el-dialog .el-dialog__footer[data-v-46ff8ed3]{padding-bottom:15px}.shop-list[data-v-46ff8ed3]{height:100%}.yj-total-wrap[data-v-46ff8ed3]{display:block;width:100%}.yj-total-nums[data-v-46ff8ed3]{display:block;line-height:1.6}.yj-total-tip[data-v-46ff8ed3]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 1 - 0
ghs/dist/shop/css/chunk-db349422.fef2da73.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-a1af4b84]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-a1af4b84]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-a1af4b84]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-a1af4b84]{font-size:18px}.el-dialog .el-dialog__body[data-v-a1af4b84]{padding:20px}.el-dialog .el-dialog__footer[data-v-a1af4b84]{padding-bottom:15px}.shop-list[data-v-a1af4b84]{height:100%}.yj-total-wrap[data-v-a1af4b84]{display:block;width:100%}.yj-total-nums[data-v-a1af4b84]{display:block;line-height:1.6}.yj-total-tip[data-v-a1af4b84]{display:block;width:100%;margin-top:10px;font-size:13px;color:#1c89e0;line-height:1.6}

+ 2 - 2
ghs/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.adeb0359.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.a3fbfa61.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.adeb0359.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.344d2dbf.js"></script><script src="/js/app.a3fbfa61.js"></script></body></html>
+			}</style><link href="/css/app.adeb0359.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.a084fc64.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.adeb0359.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.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.344d2dbf.js"></script><script src="/js/app.a084fc64.js"></script></body></html>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 2 - 2
hd/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.51b25e25.js" rel="preload" as="script"><link href="/js/chunk-libs.d15a0dfc.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.d15a0dfc.js"></script><script src="/js/app.51b25e25.js"></script></body></html>
+			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.b4700f5d.js" rel="preload" as="script"><link href="/js/chunk-libs.d15a0dfc.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.d15a0dfc.js"></script><script src="/js/app.b4700f5d.js"></script></body></html>

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


+ 50 - 153
hdApp/src/admin/birthday/board.vue

@@ -1,3 +1,7 @@
+<!--
+  生日看板:花店员工查看客户生日与赠礼状态,处理通知、领取及生日补录。
+  时间筛选与订单页左上角 DateSelect 同款,支持快捷项、月份、单日和时段。
+-->
 <template>
   <view class="birthday-board app-content">
     <view class="top-bar">
@@ -12,13 +16,16 @@
         <view class="green-btn outline" @click="goGiftStats">赠礼统计</view>
       </view>
       <view class="filter-row">
-        <view class="date-filter-trigger" @click="openDateRangeModal">
-          <view class="date-filter-icon">
-            <view class="date-filter-icon-line"></view>
-          </view>
-          <text class="date-filter-text">{{ period === 'custom' ? '已选' : '时间' }}</text>
-          <!-- <text class="date-filter-hint">{{ period === 'custom' ? '重选' : '选择日期' }}</text> -->
-          <view class="date-filter-arrow"></view>
+        <!-- 丰富时间选择:替换原来的开始/结束日期弹窗,旁边快捷项保留 -->
+        <view class="date-chip">
+          <image class="filter-icon" :src="iconSrc('order-calendar')" mode="aspectFit" />
+          <DateSelect
+            ref="dateSelectRef"
+            class="date-select"
+            top="0"
+            :defaultShowName="dateSelectName"
+            @selectDateFn="selectDateFn"
+          />
         </view>
         <view
           v-for="p in periodTabs"
@@ -141,25 +148,6 @@
         </view>
       </template>
     </modal-module>
-
-    <modal-module :show="dateRangeModal" @click="dateRangeModalClick" :maskClosable="true" title="时间区间" padding="30rpx" width="86%">
-      <template v-slot:content>
-        <view class="date-range-form">
-          <view class="date-range-row">
-            <text class="date-range-label">开始日期</text>
-            <picker mode="date" :value="draftStartDate" @change="startDateChange" class="date-range-picker">
-              <view :class="['date-range-value', draftStartDate ? '' : 'placeholder']">{{ draftStartDate || '请选择' }}</view>
-            </picker>
-          </view>
-          <view class="date-range-row">
-            <text class="date-range-label">结束日期</text>
-            <picker mode="date" :value="draftEndDate" @change="endDateChange" class="date-range-picker">
-              <view :class="['date-range-value', draftEndDate ? '' : 'placeholder']">{{ draftEndDate || '请选择' }}</view>
-            </picker>
-          </view>
-        </view>
-      </template>
-    </modal-module>
   </view>
 </template>
 
@@ -167,13 +155,14 @@
 import list from '@/mixins/list'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import ModalModule from '@/components/plugin/modal'
+import DateSelect from '@/components/module/dateSelect'
 import { getBoardList, getBoardCounts, notifyTomorrow, notifyBirthdayGift, modifyBirthday, collectBirthdayGift } from '@/api/birthday'
 import { iconSrc } from '@/utils/iconSrc'
 
 // 生日看板供花店员工查看客户生日与赠礼状态,并处理通知、领取及生日补录流程。
 export default {
   name: 'BirthdayBoard',
-  components: { AppWrapperEmpty, ModalModule },
+  components: { AppWrapperEmpty, ModalModule, DateSelect },
   mixins: [list],
   data() {
     return {
@@ -181,10 +170,7 @@ export default {
       period: 'tomorrow',
       startDate: '',
       endDate: '',
-      draftStartDate: '',
-      draftEndDate: '',
       statusFilter: -1,
-      dateRangeModal: false,
       birthdayModal: false,
       customId: null,
       lunar: 0,
@@ -192,6 +178,7 @@ export default {
       birthdayDate: '',
       monthArray: Array.from({ length: 12 }, (_, i) => i + 1),
       dateArray: Array.from({ length: 31 }, (_, i) => i + 1),
+      dateSelectName: '时间',
       periodTabs: [
         { name: '今天', value: 'today' },
         { name: '明天', value: 'tomorrow' },
@@ -231,9 +218,13 @@ export default {
     },
     getListParams() {
       const params = { period: this.period }
-      if (this.period === 'custom') {
+      if (this.startDate) {
         params.startDate = this.startDate
+        params.startTime = this.startDate
+      }
+      if (this.endDate) {
         params.endDate = this.endDate
+        params.endTime = this.endDate
       }
       return params
     },
@@ -244,41 +235,25 @@ export default {
         }
       })
     },
+    /**
+     * DateSelect 选了快捷项/月份/时段:走更丰富的时间条件,旁边 pill 仅在命中 today 等时高亮。
+     */
+    selectDateFn(val) {
+      this.period = val.searchTime || 'custom'
+      this.startDate = val.startTime || ''
+      this.endDate = val.endTime || ''
+      this.dateSelectName = val.showName || '时间'
+      this.loadCounts()
+      this.resetList()
+    },
+    /**
+     * 旁边原快捷项:今天/明天/近一周/全部,清空自定义日期。
+     */
     changePeriod(v) {
       this.period = v
       this.startDate = ''
       this.endDate = ''
-      this.loadCounts()
-      this.resetList()
-    },
-    openDateRangeModal() {
-      this.draftStartDate = this.startDate
-      this.draftEndDate = this.endDate
-      this.dateRangeModal = true
-    },
-    startDateChange(e) {
-      this.draftStartDate = e.detail.value
-    },
-    endDateChange(e) {
-      this.draftEndDate = e.detail.value
-    },
-    dateRangeModalClick(e) {
-      if (e.index === 0) {
-        this.dateRangeModal = false
-        return
-      }
-      if (!this.draftStartDate || !this.draftEndDate) {
-        this.$msg('请选择开始日期和结束日期')
-        return
-      }
-      if (this.draftStartDate > this.draftEndDate) {
-        this.$msg('开始日期不能晚于结束日期')
-        return
-      }
-      this.startDate = this.draftStartDate
-      this.endDate = this.draftEndDate
-      this.period = 'custom'
-      this.dateRangeModal = false
+      this.dateSelectName = '时间'
       this.loadCounts()
       this.resetList()
     },
@@ -549,77 +524,29 @@ export default {
 .filter-row > view:not(:first-child) {
   margin-left: 10upx;
 }
-.date-filter-trigger {
-  flex: 1;
-  min-width: 0;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
+.date-chip {
+  flex-shrink: 0;
+  min-width: 134upx;
   height: 68upx;
   padding: 0 12upx;
-  box-sizing: border-box;
-  background: #f0fbf5;
-  border: 1upx solid #08b955;
   border-radius: 34upx;
-  box-shadow: 0 4upx 12upx rgba(8, 185, 85, 0.12);
-}
-.date-filter-icon {
-  flex-shrink: 0;
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
-  width: 28upx;
-  height: 28upx;
-  margin-right: 8upx;
-  border: 2upx solid #08b955;
-  border-radius: 5upx;
   box-sizing: border-box;
-  position: relative;
-}
-.date-filter-icon::before,
-.date-filter-icon::after {
-  content: '';
-  position: absolute;
-  top: -6upx;
-  width: 4upx;
-  height: 8upx;
-  background: #08b955;
-  border-radius: 2upx;
-}
-.date-filter-icon::before {
-  left: 4upx;
-}
-.date-filter-icon::after {
-  right: 4upx;
-}
-.date-filter-icon-line {
-  width: 14upx;
-  height: 2upx;
-  margin-top: 4upx;
-  background: #08b955;
-}
-.date-filter-text {
-  flex-shrink: 0;
-  line-height: 26upx;
-  font-size: 26upx;
-  color: #08b955;
-  font-weight: 500;
+  background: #fff;
+  border: 1upx solid #e3e8e6;
 }
-.date-filter-hint {
-  margin-left: 8upx;
-  font-size: 22upx;
-  color: #6abf8e;
+.date-select {
+  display: flex;
+  align-items: center;
 }
-.date-filter-arrow {
+.filter-icon {
+  width: 32upx;
+  height: 32upx;
+  margin-right: 6upx;
   flex-shrink: 0;
-  align-self: center;
-  width: 12upx;
-  height: 12upx;
-  margin-left: 6upx;
-  border-top: 2upx solid #08b955;
-  border-right: 2upx solid #08b955;
-  transform: rotate(45deg) translateY(-1upx);
 }
 .pill {
   flex: 1;
@@ -638,36 +565,6 @@ export default {
   background: #08b955;
   color: #fff;
 }
-.date-range-form {
-  width: 100%;
-}
-.date-range-row {
-  display: flex;
-  align-items: center;
-  height: 84upx;
-  border-bottom: 1upx solid #eee;
-}
-.date-range-row:last-child {
-  border-bottom: 0;
-}
-.date-range-label {
-  flex: 0 0 150upx;
-  font-size: 28upx;
-  color: #333;
-}
-.date-range-picker {
-  flex: 1;
-}
-.date-range-value {
-  height: 84upx;
-  line-height: 84upx;
-  text-align: right;
-  font-size: 28upx;
-  color: #333;
-}
-.date-range-value.placeholder {
-  color: #999;
-}
 .status-tabs {
   display: flex;
   align-items: stretch;

+ 37 - 68
hdApp/src/admin/cg/item.vue

@@ -1,3 +1,7 @@
+<!--
+  花店采购页:花材选购小程序码。
+  给花店员工保存或长按识别进入商城花材页;不再直接跳转,统一走小程序码打开。
+-->
 <template>
   <view class="app-content">
     <view class="page-top-bar">
@@ -7,13 +11,17 @@
     </view>
 
     <view class="img_box" style="margin-top:30upx;">
-      <image :src="flowerUrl" mode="heightFix" class="img_url"></image>
+      <!-- 开启长按菜单,微信内可识别小程序码 -->
+      <image :src="flowerUrl" mode="heightFix" class="img_url" show-menu-by-longpress></image>
     </view>
-    <view class="confirm-btn" style="margin-top:60upx;">
-      <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(flowerUrl)">保存图片</button>
+    <!-- 仅小程序可长按识别太阳码;App 端没有该能力,不展示提示 -->
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="open-tip-wrap">
+      <text class="open-tip-title">长按小程序码可以直接打开</text>
     </view>
-    <view class="confirm-btn1" style="margin-top:60upx;">
-      <button class="admin-button-com big" style="width:60vw;" @click="goToMallPt('pages/item/item')">直接打开</button>
+    <!-- #endif -->
+    <view class="confirm-btn" style="margin-top:30upx;">
+      <button class="admin-button-com big blue" style="width:60vw;" @click="downloadImg(flowerUrl)">保存图片</button>
     </view>
 
     <!-- <view class="confirm-btn1" style="margin-top:60upx;">
@@ -26,8 +34,6 @@
 </template>
 <script>
 import { mainGetItemPoster } from '@/api/main'
-import { getWeixinId } from "@/api/invite";
-import { mapGetters } from "vuex";
 import { iconSrc } from '@/utils/iconSrc'
 import ShopOpenTimePopup from '@/components/shop-open-time-popup.vue'
 export default {
@@ -37,13 +43,9 @@ export default {
   data() {
     return {
       flowerUrl:'',
-      flowerLink:'',
-      getappIdList: {}
+      flowerLink:''
     }
   },
-  computed: {
-    ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" })
-  },
   methods: {
     iconSrc,
     copyLink() {
@@ -60,9 +62,6 @@ export default {
     },
     init() {
       this.getImg()
-      getWeixinId().then(res => {
-        this.getappIdList = res.data
-      });
     },
     downloadImg(url){
 				// #ifdef APP-PLUS
@@ -106,56 +105,6 @@ export default {
         this.flowerLink = res.data.flowerLink
       }).catch(err => {})
     },
-    goToMallPt (url) {
-      // #ifdef MP-WEIXIN
-      let self = this
-      uni.navigateToMiniProgram({
-        appId: this.getappIdList.mall.miniAppId,
-        path: url + '?account=' + self.loginInfo.shopId,
-        //develop 开发版 trial 体验版 release 正式版
-        envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-        extraData: {
-          'hdShopAdminId': self.loginInfo.shopAdminId
-        },
-        success (res) {}
-      })
-      // #endif
-      // #ifdef APP-PLUS
-      let that = this
-
-      if(plus.runtime.isApplicationExist({pname:'com.tencent.mm',action:'weixin://'})){
-        plus.share.getServices(function(s){
-          var sweixin
-          for (var i = 0; i < s.length; i++) {
-            var t = s[i];
-            if (t.id == 'weixin') {
-                sweixin = t;
-            }
-          }
-          if (sweixin && sweixin.nativeClient) {
-            let miniOriginalId = that.dictInfo.miniOriginalId && that.dictInfo.miniOriginalId.current && that.dictInfo.miniOriginalId.current.mall ? that.dictInfo.miniOriginalId.current.mall : ''
-            console.log(miniOriginalId)
-            sweixin.launchMiniProgram({
-              id: miniOriginalId,
-              path: '/'+url+'?account='+that.loginInfo.shopId,
-              type: 0
-            });
-          } else {
-            that.$msg("没有找到微信服务")
-            //that.$msg("获取微信失败:" + e.message)
-            console.log(JSON.stringify(e));
-          }
-        }, function(e){
-            that.$msg("没有找到微信服务哦")
-            //that.$msg("获取微信失败:" + e.message)
-            console.log(JSON.stringify(e));
-        });
-      } else {
-				this.$msg("即将跳转小程序,请安装微信")
-				return false
-      }
-			// #endif
-    },
   }
 }
 </script>
@@ -181,10 +130,10 @@ export default {
   height: 54upx;
 }
 .img_box{
-  height:400upx;
+  /* 高度跟小程序码图走,避免图高出盒子后盖住下方「长按打开」文案 */
   box-sizing: border-box;
   &>.img_url{
-    height:400upx;
+    height:500upx;
     width: auto;
     margin: 20upx auto;
   }
@@ -198,6 +147,26 @@ export default {
     width: 100%;
   }
 }
+.open-tip-wrap {
+  margin-top: 24upx;
+  padding: 0 40upx 20upx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.open-tip-title {
+  font-size: 32upx;
+  font-weight: 700;
+  color: #333333;
+  line-height: 1.4;
+}
+.open-tip-desc {
+  margin-top: 16upx;
+  font-size: 26upx;
+  color: #999999;
+  line-height: 1.5;
+  text-align: center;
+}
 // 按钮
 .confirm-btn1 {
   width: calc(100% - 60upx);
@@ -207,4 +176,4 @@ export default {
     width: 100%;
   }
 }
-</style>
+</style>

+ 13 - 4
hdApp/src/components/module/dateSelect.vue

@@ -90,6 +90,13 @@ export default {
             type: String,
             default: '今天'
         },
+        // 页面追加的快捷项,如生日看板的「明天」
+        extraOptions:{
+            type: Array,
+            default() {
+                return []
+            }
+        },
         showAllOption: {
             type: Boolean,
             default: false
@@ -118,13 +125,15 @@ export default {
     },
     computed:{
         ...mapGetters(["getDictionariesInfo"]),
-        // 快捷日期项按业务需要追加“全部”,默认保持旧页面选项不变
+        // 快捷日期项按业务需要追加「明天」等 extraOptions,以及「全部」
         dateDefaultOptions() {
             const options = this.getDictionariesInfo.dateDefaultOption || [];
-            if (!this.showAllOption) {
-                return options;
+            const extras = this.extraOptions || [];
+            let list = extras.length ? options.concat(extras) : options;
+            if (this.showAllOption) {
+                list = list.concat([{name: '全部', value: 'all' }]);
             }
-            return options.concat([{name: '全部', value: 'all' }]);
+            return list;
         }
     },
     mounted(){

+ 36 - 174
hdApp/src/pagesPurchase/gathering.vue

@@ -1,6 +1,6 @@
 <!--
   采购结清页:按供货商查看未结清挂账,支持勾选结清与自定义金额付款。
-  顶部「自定义金额」与 board 同款时间区间筛选并排,避免浮层挡住列表操作。
+  顶部时间筛选与订单页同款 DateSelect,快捷/月份/单日/时段均可,避免浮层挡住列表操作。
 -->
 <template>
 <view class="app-content">
@@ -12,15 +12,19 @@
           <text class="name">{{ ghsInfo.name}}</text>
         </view>
         <view class="top-actions">
-          <!-- 自定义金额:加高便于点按,与日历触发器并排 -->
+          <!-- 自定义金额:加高便于点按,与时间筛选并排 -->
           <button class="admin-button-com blue custom-amount-btn" @click="goCustomPay">自定义金额付款</button>
-          <!-- 时间筛选:与生日板 board 同款触发器样式 -->
-          <view class="date-filter-trigger" @click="openDateRangeModal">
-            <view class="date-filter-icon">
-              <view class="date-filter-icon-line"></view>
-            </view>
-            <text class="date-filter-text">{{ dateFilterLabel }}</text>
-            <view class="date-filter-arrow"></view>
+          <!-- 与订单页左上角同款:日历图标 + DateSelect -->
+          <view class="date-chip">
+            <image class="filter-icon" :src="iconSrc('order-calendar')" mode="aspectFit" />
+            <DateSelect
+              ref="dateSelectRef"
+              class="date-select"
+              top="0"
+              defaultShowName="全部"
+              :showAllOption="true"
+              @selectDateFn="selectDateFn"
+            />
           </view>
         </view>
       </view>
@@ -69,33 +73,6 @@
         </view>
       </view>
     </view>
-
-    <!-- 时间区间弹窗:确认后仍走原 selectDateFn 同款 searchTime=custom 参数 -->
-    <modal-module
-      :show="showDateRangeModal"
-      :maskClosable="true"
-      title="时间区间"
-      padding="30rpx"
-      width="86%"
-      @click="dateRangeModalClick"
-    >
-      <template v-slot:content>
-        <view class="date-range-form">
-          <view class="date-range-row">
-            <text class="date-range-label">开始日期</text>
-            <picker mode="date" :value="draftStartDate || todayDate" @change="onDraftStartDateChange" class="date-range-picker">
-              <view :class="['date-range-value', draftStartDate ? '' : 'placeholder']">{{ draftStartDate || '请选择' }}</view>
-            </picker>
-          </view>
-          <view class="date-range-row">
-            <text class="date-range-label">结束日期</text>
-            <picker mode="date" :value="draftEndDate || todayDate" @change="onDraftEndDateChange" class="date-range-picker">
-              <view :class="['date-range-value', draftEndDate ? '' : 'placeholder']">{{ draftEndDate || '请选择' }}</view>
-            </picker>
-          </view>
-        </view>
-      </template>
-    </modal-module>
   </view>
 </view>
 </template>
@@ -104,10 +81,11 @@ import gatheringList from './components/gatheringList'
 import DebtListPager from '@/components/module/debt-list-pager'
 import { purchaseDebtList, ghsDetail, purchaseClearCreateOrder } from "@/api/purchase/index";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import ModalModule from '@/components/plugin/modal';
+import DateSelect from "@/components/module/dateSelect";
+import { iconSrc } from '@/utils/iconSrc'
 import debtListPage from '@/mixins/debtListPage'
 export default {
-  components: { gatheringList, AppWrapperEmpty, ModalModule, DebtListPager },
+  components: { gatheringList, AppWrapperEmpty, DateSelect, DebtListPager },
   mixins: [debtListPage],
   data () {
     return {
@@ -122,16 +100,10 @@ export default {
 			endTime:'',
       ghsId:0,
       justLoaded: false,
-      salt: '',
-      // board 同款时间区间弹窗状态
-      showDateRangeModal: false,
-      draftStartDate: '',
-      draftEndDate: '',
-      todayDate: ''
+      salt: ''
     }
   },
   onLoad() {
-    this.todayDate = this.formatDate(new Date())
     this.initData()
   },
   onShow () {
@@ -153,10 +125,6 @@ export default {
     })
   },
   computed: {
-    // 触发器文案:未选显示「时间」,已选显示「已选」,与 board 一致
-    dateFilterLabel() {
-      return this.searchTime === 'custom' && this.startTime && this.endTime ? '已选' : '时间'
-    },
     selectList () {
       let list = [];
       if (this.detailsList) {
@@ -190,6 +158,7 @@ export default {
     }
   },
   methods: {
+    iconSrc,
     formatMoney (val) {
       const n = parseFloat(val)
       return isNaN(n) ? '0' : String(n)
@@ -208,6 +177,9 @@ export default {
         showPartialClear: hasPayDebt > 0
       }
     },
+		/**
+		 * 订单页同款时间筛选:searchTime 为快捷项或 custom/byMonth。
+		 */
 		selectDateFn(val){
 			this.searchTime = val.searchTime
 			this.startTime = val.startTime
@@ -217,45 +189,6 @@ export default {
 				uni.stopPullDownRefresh()
 			})
 		},
-    // 打开区间弹窗:草稿回填已生效条件
-    openDateRangeModal() {
-      this.draftStartDate = this.startTime || ''
-      this.draftEndDate = this.endTime || ''
-      this.showDateRangeModal = true
-    },
-    onDraftStartDateChange(e) {
-      this.draftStartDate = e.detail.value
-    },
-    onDraftEndDateChange(e) {
-      this.draftEndDate = e.detail.value
-    },
-    formatDate(date) {
-      const y = date.getFullYear()
-      const m = `${date.getMonth() + 1}`.padStart(2, '0')
-      const d = `${date.getDate()}`.padStart(2, '0')
-      return `${y}-${m}-${d}`
-    },
-    // 弹窗确定:与 board 一致,index 0 取消;通过原 selectDateFn 刷新列表
-    dateRangeModalClick(e) {
-      if (e.index === 0) {
-        this.showDateRangeModal = false
-        return
-      }
-      if (!this.draftStartDate || !this.draftEndDate) {
-        this.$msg('请选择开始日期和结束日期')
-        return
-      }
-      if (this.draftStartDate > this.draftEndDate) {
-        this.$msg('开始日期不能晚于结束日期')
-        return
-      }
-      this.showDateRangeModal = false
-      this.selectDateFn({
-        searchTime: 'custom',
-        startTime: this.draftStartDate,
-        endTime: this.draftEndDate
-      })
-    },
     reloadDebtListPage() {
       return this.initData()
     },
@@ -429,78 +362,37 @@ export default {
       /* 自定义金额:长方形按钮,与头像高度更协调 */
       .custom-amount-btn {
         margin: 0;
-        margin-right: 28upx;
+        margin-right: 16upx;
         height: 64upx;
         line-height: 64upx;
         padding: 0 20upx;
         font-size: 26upx;
         border-radius: 8upx;
       }
-      /* 时间筛选触发器:长方形,对齐自定义金额按钮 */
-      .date-filter-trigger {
+      /* 与订单页左上角同款时间筛选 */
+      .date-chip {
+        min-width: 134upx;
+        height: 64upx;
+        padding: 0 12upx;
+        border-radius: 8upx;
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: center;
-        height: 64upx;
-        padding: 0 14upx;
+        flex-shrink: 0;
         box-sizing: border-box;
-        background: #f0fbf5;
-        border: 1upx solid #08b955;
-        border-radius: 8upx;
-        box-shadow: 0 4upx 12upx rgba(8, 185, 85, 0.12);
+        background: #fff;
+        border: 1upx solid #e3e8e6;
       }
-      .date-filter-icon {
-        flex-shrink: 0;
+      .date-select {
         display: flex;
         align-items: center;
-        justify-content: center;
-        width: 28upx;
-        height: 28upx;
-        margin-right: 8upx;
-        border: 2upx solid #08b955;
-        border-radius: 5upx;
-        box-sizing: border-box;
-        position: relative;
-      }
-      .date-filter-icon::before,
-      .date-filter-icon::after {
-        content: '';
-        position: absolute;
-        top: -6upx;
-        width: 4upx;
-        height: 8upx;
-        background: #08b955;
-        border-radius: 2upx;
-      }
-      .date-filter-icon::before {
-        left: 4upx;
-      }
-      .date-filter-icon::after {
-        right: 4upx;
-      }
-      .date-filter-icon-line {
-        width: 14upx;
-        height: 2upx;
-        margin-top: 4upx;
-        background: #08b955;
-      }
-      .date-filter-text {
-        flex-shrink: 0;
-        line-height: 26upx;
-        font-size: 26upx;
-        color: #08b955;
-        font-weight: 500;
       }
-      .date-filter-arrow {
+      .filter-icon {
+        width: 32upx;
+        height: 32upx;
+        margin-right: 6upx;
         flex-shrink: 0;
-        align-self: center;
-        width: 12upx;
-        height: 12upx;
-        margin-left: 6upx;
-        border-top: 2upx solid #08b955;
-        border-right: 2upx solid #08b955;
-        transform: rotate(45deg) translateY(-1upx);
       }
     }
   }
@@ -586,34 +478,4 @@ export default {
     color: $mainColor !important;
   }
 }
-.date-range-form {
-  width: 100%;
-}
-.date-range-row {
-  display: flex;
-  align-items: center;
-  height: 84upx;
-  border-bottom: 1upx solid #eee;
-}
-.date-range-row:last-child {
-  border-bottom: 0;
-}
-.date-range-label {
-  flex: 0 0 150upx;
-  font-size: 28upx;
-  color: #333;
-}
-.date-range-picker {
-  flex: 1;
-}
-.date-range-value {
-  height: 84upx;
-  line-height: 84upx;
-  text-align: right;
-  font-size: 28upx;
-  color: #333;
-}
-.date-range-value.placeholder {
-  color: #999;
-}
 </style>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.CK36Qeja.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DzGsaf_H.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.CFuwMSY6.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.D830B9uw.js

@@ -1 +1 @@
-import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-DXniIKmk.js";import{c as l}from"./index.CrFZeb0S.js";import{_ as c}from"./_plugin-vue_export-helper.CK36Qeja.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};
+import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-BJhhWmNe.js";import{c as l}from"./index.kWdIQQAF.js";import{_ as c}from"./_plugin-vue_export-helper.DzGsaf_H.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.B2sjUtXn.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.SlYCvlhX.js

@@ -1 +1 @@
-import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-DXniIKmk.js";import{b as l}from"./index.CrFZeb0S.js";import{_ as c}from"./_plugin-vue_export-helper.CK36Qeja.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};
+import{s as a,j as e,u as t,c as n,w as s,f as o,q as i,i as r,o as d,e as p}from"./index-BJhhWmNe.js";import{b as l}from"./index.kWdIQQAF.js";import{_ as c}from"./_plugin-vue_export-helper.DzGsaf_H.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-balanceChange.DTgG1l5h.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.B1zf-g75.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-BJhhWmNe.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.C4eSwroU.js → hdh5/unpackage/dist/build/web/assets/index.DZHAujCr.js

@@ -1 +1 @@
-import{h as e}from"./_plugin-vue_export-helper.CK36Qeja.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};
+import{h as e}from"./_plugin-vue_export-helper.DzGsaf_H.js";const g=g=>e.get("/ghs/get-ghs-data",g),s=g=>e.get("/ghs-balance-change/list",g);export{s as b,g};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.CrFZeb0S.js → hdh5/unpackage/dist/build/web/assets/index.kWdIQQAF.js

@@ -1 +1 @@
-import{h as a}from"./_plugin-vue_export-helper.CK36Qeja.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};
+import{h as a}from"./_plugin-vue_export-helper.DzGsaf_H.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.Dkko0no6.js


+ 1 - 1
hdh5/unpackage/dist/build/web/index.html

@@ -16,7 +16,7 @@
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-DXniIKmk.js"></script>
+    <script type="module" crossorigin src="/assets/index-BJhhWmNe.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BvquTqJD.css">
   </head>
   <body>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-BYPdUZs5.js


+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.IWDEe3_7.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.mR5zWgw3.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-7eWCbUXd.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
+import{c as e,w as a,i as o,o as t,a as n}from"./index-BYPdUZs5.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.BcI6NZxo.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.0c7SA6vH.js


+ 1 - 1
mallh5/unpackage/dist/build/web/index.html

@@ -16,7 +16,7 @@
 	<script src="/static/web/quill-1.3.7.min.js"></script>
     <!--preload-links-->
     <!--app-context-->
-    <script type="module" crossorigin src="/assets/index-7eWCbUXd.js"></script>
+    <script type="module" crossorigin src="/assets/index-BYPdUZs5.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

+ 2 - 2
pt/dist/web/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.810b6963.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.7289eda9.js"></script><script src="/js/app.810b6963.js"></script></body></html>
+			}</style><link href="/css/app.809da915.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.c81dca2d.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.809da915.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.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.7289eda9.js"></script><script src="/js/app.c81dca2d.js"></script></body></html>

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


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