ts-glitter 21.8.2 → 21.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/backend-manager/bg-dialog.js +342 -100
  4. package/lowcode/backend-manager/bg-dialog.ts +432 -145
  5. package/lowcode/backend-manager/bg-widget.js +4 -4
  6. package/lowcode/backend-manager/bg-widget.ts +5 -5
  7. package/lowcode/cms-plugin/shopping-discount-setting.js +148 -92
  8. package/lowcode/cms-plugin/shopping-discount-setting.ts +162 -111
  9. package/lowcode/cms-plugin/shopping-product-stock.js +58 -45
  10. package/lowcode/cms-plugin/shopping-product-stock.ts +66 -49
  11. package/lowcode/css/editor.css +8 -9
  12. package/lowcode/editor/basic-component.js +0 -5
  13. package/lowcode/editor/basic-component.ts +1 -6
  14. package/lowcode/glitter-base/route/article.js +50 -51
  15. package/lowcode/glitter-base/route/article.ts +102 -103
  16. package/lowcode/glitter-base/route/recommend.js +1 -0
  17. package/lowcode/glitter-base/route/recommend.ts +141 -123
  18. package/lowcode/modules/image-library-clone.ts +2 -0
  19. package/lowcode/modules/image-library.js +118 -155
  20. package/lowcode/modules/image-library.ts +134 -197
  21. package/lowcode/public-components/layout-plugin/social-links-01.js +23 -44
  22. package/lowcode/public-components/layout-plugin/social-links-01.ts +23 -48
  23. package/package.json +1 -1
  24. package/src/api-public/controllers/article.js +11 -0
  25. package/src/api-public/controllers/article.js.map +1 -1
  26. package/src/api-public/controllers/article.ts +13 -0
  27. package/src/api-public/controllers/recommend.js +1 -0
  28. package/src/api-public/controllers/recommend.js.map +1 -1
  29. package/src/api-public/controllers/recommend.ts +99 -89
  30. package/src/api-public/services/checkout-event.js +4 -3
  31. package/src/api-public/services/checkout-event.js.map +1 -1
  32. package/src/api-public/services/checkout-event.ts +11 -7
  33. package/src/api-public/services/post.js +7 -17
  34. package/src/api-public/services/post.js.map +1 -1
  35. package/src/api-public/services/recommend.d.ts +1 -0
  36. package/src/api-public/services/recommend.js +12 -2
  37. package/src/api-public/services/recommend.js.map +1 -1
  38. package/src/api-public/services/recommend.ts +375 -354
  39. package/src/api-public/services/shopping.d.ts +1 -0
  40. package/src/api-public/services/shopping.js +4 -2
  41. package/src/api-public/services/shopping.js.map +1 -1
  42. package/src/api-public/services/shopping.ts +7 -2
package/src/api-public/services/shopping.ts CHANGED
@@ -109,6 +109,7 @@ export interface VoucherData {
109
109
  type: SelectShipmentType;
110
110
  list: string[];
111
111
  };
112
+ distribution_shop: string[];
112
113
 
113
114
  // backend-value
114
115
  bind: BindItem[];
@@ -2830,12 +2831,16 @@ export class Shopping {
2830
2831
 
2831
2832
  // 計算優惠券的訂單折扣
2832
2833
  function compare(voucher: VoucherData) {
2833
- return voucher.bind
2834
+ const reduce_sum = voucher.bind
2834
2835
  .map(item => {
2835
2836
  const val = parseFloat(voucher.value);
2836
2837
  return voucher.method === 'percent' ? (item.sale_price * val) / 100 : val;
2837
2838
  })
2838
- .reduce((accumulator, currentValue) => accumulator + currentValue, 0);
2839
+ .reduce((sum, value) => sum + value, 0);
2840
+
2841
+ const use_rebate_count = voucher.includeDiscount === 'after' ? cart.use_rebate : 0;
2842
+
2843
+ return reduce_sum - use_rebate_count;
2839
2844
  }
2840
2845
 
2841
2846
  // 商家設定手動排序