@pisell/private-materials 6.3.49 → 6.3.51

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 (201) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/meta.js +1 -1
  5. package/build/lowcode/render/default/view.css +1 -1
  6. package/build/lowcode/render/default/view.js +1 -1
  7. package/build/lowcode/view.css +1 -1
  8. package/build/lowcode/view.js +1 -1
  9. package/es/components/Sales/Summary/utils.d.ts +1 -1
  10. package/es/components/appointmentBooking/components/Footer/index.d.ts +0 -1
  11. package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
  12. package/es/components/appointmentBooking/components/Voucher/index.js +1 -1
  13. package/es/components/booking/addons/index.js +20 -17
  14. package/es/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  15. package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  16. package/es/components/booking/components/collapsibleList/utils.d.ts +1 -0
  17. package/es/components/booking/components/emptyBooking/index.d.ts +1 -0
  18. package/es/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  19. package/es/components/booking/components/footer/utils.d.ts +5 -0
  20. package/es/components/booking/components/footer/utils.js +85 -40
  21. package/es/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  22. package/es/components/booking/components/voucher/index.js +18 -5
  23. package/es/components/booking/forms/single/index.d.ts +1 -0
  24. package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  25. package/es/components/booking/info/date/index.d.ts +1 -0
  26. package/es/components/booking/info/notes/index.d.ts +1 -0
  27. package/es/components/booking/info/service/actions/index.d.ts +1 -0
  28. package/es/components/booking/info/service2/utils.js +1 -0
  29. package/es/components/booking/info2/service/actions/index.d.ts +1 -0
  30. package/es/components/booking/info2/service/addService/index.js +2 -3
  31. package/es/components/booking/info2/service/contactInfoMode/index.d.ts +1 -0
  32. package/es/components/booking/materiels/contacts/index.d.ts +1 -0
  33. package/es/components/booking/materiels/duration/index.d.ts +1 -0
  34. package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  35. package/es/components/booking/notes/NoteBlock/index.d.ts +1 -0
  36. package/es/components/booking/utils.d.ts +1 -0
  37. package/es/components/booking/utils.js +16 -2
  38. package/es/components/eftpos/index.d.ts +1 -0
  39. package/es/components/eftpos/pos.d.ts +1 -0
  40. package/es/components/eftposPay/amount.d.ts +1 -0
  41. package/es/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  42. package/es/components/eftposPay/component/fail/network.d.ts +1 -0
  43. package/es/components/eftposPay/component/fail/unknow.d.ts +1 -0
  44. package/es/components/eftposPay/component/manual/index.d.ts +1 -0
  45. package/es/components/eftposPay/component/signature/index.d.ts +1 -0
  46. package/es/components/eftposPay/pay.d.ts +1 -0
  47. package/es/components/eftposPay/payo/config.d.ts +1 -0
  48. package/es/components/eftposPay/tip.d.ts +1 -0
  49. package/es/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  50. package/es/components/eftposPay/windcave/windcave.d.ts +1 -0
  51. package/es/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
  52. package/es/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  53. package/es/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  54. package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
  55. package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  56. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
  57. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
  58. package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  59. package/es/components/login/index.d.ts +1 -0
  60. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
  61. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +0 -1
  62. package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
  63. package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  64. package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  65. package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  66. package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  67. package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  68. package/es/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  69. package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  70. package/es/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  71. package/es/components/schedules/calendar/index.d.ts +1 -0
  72. package/es/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  73. package/es/components/schedules/components/ScheduleList/index.d.ts +1 -0
  74. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  75. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  76. package/es/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  77. package/es/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  78. package/es/components/schedules/products/list/index.d.ts +1 -0
  79. package/es/components/schedules/resources/index.d.ts +1 -0
  80. package/es/components/schedules/resources/list/index.d.ts +1 -0
  81. package/es/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  82. package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  83. package/es/components/schedules/schedules/index.d.ts +1 -0
  84. package/es/components/shoppingCart/index.d.ts +1 -0
  85. package/es/components/ticketBooking/components/addServiceVariant/addService.js +3 -3
  86. package/es/components/ticketBooking/utils/index.js +23 -8
  87. package/es/components/wallet/hooks/useWalletCard.d.ts +1 -0
  88. package/es/components/workSpaceList/components/Modal/index.d.ts +0 -1
  89. package/es/hooks/usePaymentLogger.d.ts +1 -0
  90. package/es/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  91. package/es/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  92. package/es/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  93. package/es/plus/saasRegister/components/GoLogin.d.ts +1 -0
  94. package/es/plus/saasRegister/components/Header.d.ts +1 -0
  95. package/es/plus/saasRegister/components/VerifyError.d.ts +1 -0
  96. package/es/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  97. package/es/plus/walletEditor/components/relationProduct/index.d.ts +1 -0
  98. package/es/plus/walletPassGallery/components/footerButton/index.js +2 -4
  99. package/es/plus/walletPassGallery/components/footerButton/index.less +14 -59
  100. package/es/plus/walletPassGallery/components/passDetail/index.js +5 -1
  101. package/es/plus/walletPassGallery/components/passDetail/index.less +4 -0
  102. package/es/plus/walletPassGallery/components/recharge/index.js +19 -8
  103. package/es/plus/walletPassGallery/index.js +3 -1
  104. package/es/pro/Login2.0/index.less +15 -8
  105. package/lib/components/Sales/Summary/utils.d.ts +1 -1
  106. package/lib/components/appointmentBooking/components/Footer/index.d.ts +0 -1
  107. package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
  108. package/lib/components/appointmentBooking/components/Voucher/index.js +1 -1
  109. package/lib/components/booking/addons/index.js +10 -7
  110. package/lib/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  111. package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  112. package/lib/components/booking/components/collapsibleList/utils.d.ts +1 -0
  113. package/lib/components/booking/components/emptyBooking/index.d.ts +1 -0
  114. package/lib/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  115. package/lib/components/booking/components/footer/utils.d.ts +5 -0
  116. package/lib/components/booking/components/footer/utils.js +56 -23
  117. package/lib/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  118. package/lib/components/booking/components/voucher/index.js +19 -6
  119. package/lib/components/booking/forms/single/index.d.ts +1 -0
  120. package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  121. package/lib/components/booking/info/date/index.d.ts +1 -0
  122. package/lib/components/booking/info/notes/index.d.ts +1 -0
  123. package/lib/components/booking/info/service/actions/index.d.ts +1 -0
  124. package/lib/components/booking/info/service2/utils.js +1 -0
  125. package/lib/components/booking/info2/service/actions/index.d.ts +1 -0
  126. package/lib/components/booking/info2/service/addService/index.js +1 -2
  127. package/lib/components/booking/info2/service/contactInfoMode/index.d.ts +1 -0
  128. package/lib/components/booking/materiels/contacts/index.d.ts +1 -0
  129. package/lib/components/booking/materiels/duration/index.d.ts +1 -0
  130. package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  131. package/lib/components/booking/notes/NoteBlock/index.d.ts +1 -0
  132. package/lib/components/booking/utils.d.ts +1 -0
  133. package/lib/components/booking/utils.js +12 -0
  134. package/lib/components/eftpos/index.d.ts +1 -0
  135. package/lib/components/eftpos/pos.d.ts +1 -0
  136. package/lib/components/eftposPay/amount.d.ts +1 -0
  137. package/lib/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  138. package/lib/components/eftposPay/component/fail/network.d.ts +1 -0
  139. package/lib/components/eftposPay/component/fail/unknow.d.ts +1 -0
  140. package/lib/components/eftposPay/component/manual/index.d.ts +1 -0
  141. package/lib/components/eftposPay/component/signature/index.d.ts +1 -0
  142. package/lib/components/eftposPay/pay.d.ts +1 -0
  143. package/lib/components/eftposPay/payo/config.d.ts +1 -0
  144. package/lib/components/eftposPay/tip.d.ts +1 -0
  145. package/lib/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  146. package/lib/components/eftposPay/windcave/windcave.d.ts +1 -0
  147. package/lib/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
  148. package/lib/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  149. package/lib/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  150. package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
  151. package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  152. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
  153. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
  154. package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  155. package/lib/components/login/index.d.ts +1 -0
  156. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
  157. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +0 -1
  158. package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
  159. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  160. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  161. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  162. package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  163. package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  164. package/lib/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  165. package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  166. package/lib/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  167. package/lib/components/schedules/calendar/index.d.ts +1 -0
  168. package/lib/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  169. package/lib/components/schedules/components/ScheduleList/index.d.ts +1 -0
  170. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  171. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  172. package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  173. package/lib/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  174. package/lib/components/schedules/products/list/index.d.ts +1 -0
  175. package/lib/components/schedules/resources/index.d.ts +1 -0
  176. package/lib/components/schedules/resources/list/index.d.ts +1 -0
  177. package/lib/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  178. package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  179. package/lib/components/schedules/schedules/index.d.ts +1 -0
  180. package/lib/components/shoppingCart/index.d.ts +1 -0
  181. package/lib/components/ticketBooking/components/addServiceVariant/addService.js +1 -1
  182. package/lib/components/ticketBooking/utils/index.js +9 -4
  183. package/lib/components/wallet/hooks/useWalletCard.d.ts +1 -0
  184. package/lib/components/workSpaceList/components/Modal/index.d.ts +0 -1
  185. package/lib/hooks/usePaymentLogger.d.ts +1 -0
  186. package/lib/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  187. package/lib/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  188. package/lib/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  189. package/lib/plus/saasRegister/components/GoLogin.d.ts +1 -0
  190. package/lib/plus/saasRegister/components/Header.d.ts +1 -0
  191. package/lib/plus/saasRegister/components/VerifyError.d.ts +1 -0
  192. package/lib/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  193. package/lib/plus/walletEditor/components/relationProduct/index.d.ts +1 -0
  194. package/lib/plus/walletPassGallery/components/footerButton/index.js +2 -2
  195. package/lib/plus/walletPassGallery/components/footerButton/index.less +14 -59
  196. package/lib/plus/walletPassGallery/components/passDetail/index.js +4 -1
  197. package/lib/plus/walletPassGallery/components/passDetail/index.less +4 -0
  198. package/lib/plus/walletPassGallery/components/recharge/index.js +7 -1
  199. package/lib/plus/walletPassGallery/index.js +3 -1
  200. package/lib/pro/Login2.0/index.less +15 -8
  201. package/package.json +4 -4
@@ -153,6 +153,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
153
153
  * @Date: 2024-01-26 14:09
154
154
  */
155
155
  export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
156
+ export declare const getMainPrice: (item: any, price?: number) => number;
156
157
  export declare const getProductTotalPrice: (item: any) => number;
157
158
  /**
158
159
  * @title: 判断 duration
@@ -18,6 +18,7 @@ import { locales } from '@pisell/utils';
18
18
  import { isDayBooking, formatDayDate } from "./info/service2/utils";
19
19
  import { intersectionBy } from 'lodash';
20
20
  import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
21
+ import Decimal from "decimal.js";
21
22
  var Request = /*#__PURE__*/function () {
22
23
  function Request() {
23
24
  _classCallCheck(this, Request);
@@ -754,11 +755,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
754
755
  return _extend;
755
756
  };
756
757
 
758
+ // 获取主商品价格 包含组合规格
759
+ export var getMainPrice = function getMainPrice(item, price) {
760
+ var _item$_extend;
761
+ var newPrice = new Decimal(price || item._extend.price || 0);
762
+ var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
763
+
764
+ // 多规格
765
+ if (other !== null && other !== void 0 && other.product_variant_id) {
766
+ newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
767
+ }
768
+ return newPrice.toNumber();
769
+ };
770
+
757
771
  // 商品价格: (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量) * 商品数量
758
772
  export var getProductTotalPrice = function getProductTotalPrice(item) {
759
- var _item$_extend;
773
+ var _item$_extend2;
760
774
  var price = Number(item._extend.price);
761
- var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
775
+ var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
762
776
 
763
777
  // 多规格
764
778
  if (other !== null && other !== void 0 && other.product_variant_id) {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { Eftpos, DeviceStatus } from './const';
2
3
  import './index.less';
3
4
  interface PosProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { DeviceProp } from "./const";
2
3
  interface PosProps {
3
4
  eftposName: string;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { PosProps } from './const';
2
3
  /**
3
4
  * @title: 支付金额信息配置页
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
3
4
  export default _default;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 断网(客户端)提示页
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 支付状态未知页面
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  import './index.less';
3
4
  /**
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 取消签名确认页
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { PayProps } from './const';
2
3
  import './index.less';
3
4
  /**
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { StatusEnum } from '../const';
2
3
  export declare const POS: ({ api, onChange, }: {
3
4
  api: {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './tip.less';
2
3
  /**
3
4
  * @title: 支付状态未知页面
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  /**
2
3
  * @title: 按钮操作区
3
4
  * @description: 仅包含签名
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: ({ api, onChange, formatAmount, }: {
2
3
  api: any;
3
4
  onChange: any;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.less';
3
2
  declare const ErrorTip: ({ text }: any) => JSX.Element;
4
3
  export default ErrorTip;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Layout: () => JSX.Element;
3
4
  export default Layout;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Header: () => JSX.Element;
3
4
  export default Header;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.less';
3
2
  declare const InformationOptionsModal: (props: any) => JSX.Element;
4
3
  export default InformationOptionsModal;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const SelectHolderModal: (props: any) => JSX.Element;
2
3
  export default SelectHolderModal;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.less';
3
2
  declare const WeekItem: (props: any) => JSX.Element;
4
3
  export default WeekItem;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.less';
3
2
  declare type CalenDateWeekProps = {
4
3
  currentDate: string;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare type Item = any;
3
4
  interface ProductItemProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  export interface LoginProps {
3
4
  title: string;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.less';
3
2
  declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
4
3
  export default SetupForm;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import './index.module.less';
3
2
  declare const StripePayment: () => JSX.Element;
4
3
  export default StripePayment;
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
3
2
  import './index.less';
4
3
  interface WalletUseListProps {
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
2
3
  export default DateSectionCom;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const GenderField: (props: any) => JSX.Element;
2
3
  export default GenderField;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  interface AddClientProps {
3
4
  onChange: (value: any) => void;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
3
4
  export default ProductItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
3
4
  export default ProductItemPreview;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  interface valueType {
3
4
  }
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const SelectResourcesTable: ({ value, onChange }: any) => JSX.Element;
3
4
  export default SelectResourcesTable;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  interface RuleSettingProps {
3
4
  value: any;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare const Calendar: () => JSX.Element;
3
4
  export default Calendar;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ScheduleItem } from "../../type";
2
3
  import "./index.less";
3
4
  declare type ScheduleDetailListPropsType = {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ButtonProps } from 'antd';
2
3
  import { ScheduleItem } from '../../type';
3
4
  import './index.less';
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
3
4
  form: any;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const ResourcesModule: ({ product }: {
2
3
  product: any;
3
4
  }) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare const ProductDetailDrawer: () => JSX.Element;
3
4
  export default ProductDetailDrawer;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare type Item = any;
3
4
  interface ProductItemProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  interface ProductListProps {
3
4
  loading: boolean;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Resources: () => JSX.Element;
3
4
  export default Resources;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  declare type ResourcesListProps = {
3
4
  list: any;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ScheduleItem } from '../../type';
2
3
  import './index.less';
3
4
  declare type AllSchedulesPropsType = {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import type { DrawerProps } from "antd";
2
3
  import { ScheduleItem } from "../../type";
3
4
  import "./index.less";
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const SchedulesConnect: () => JSX.Element;
2
3
  export default SchedulesConnect;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { shoppingCartProps } from './type';
2
3
  declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
3
4
  export default shoppingCart;
@@ -21,7 +21,7 @@ import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
21
21
  import React, { useEffect, useMemo, useRef, useState } from 'react';
22
22
  import { useMemoizedFn } from 'ahooks';
23
23
  import useEngineContext from "../../../../hooks/useEngineContext";
24
- import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
24
+ import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, getMainPrice } from "../../../booking/utils";
25
25
  import { getProductExtend } from "../../../booking/info2/service/addService/utils";
26
26
  import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
27
27
  import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
@@ -390,12 +390,12 @@ var AddSerivce = function AddSerivce(props) {
390
390
  _extend: {
391
391
  start_date: state.date.value,
392
392
  quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
393
- price: _detail.price,
394
393
  product_name: item.title,
395
394
  other: other
396
395
  },
397
396
  new: 1
398
397
  });
398
+ cacheItem._extend.price = getMainPrice(_detail, _detail.price);
399
399
  _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
400
400
  cacheItem._extend.total = _total;
401
401
  // 用于储存原价
@@ -487,7 +487,7 @@ var AddSerivce = function AddSerivce(props) {
487
487
  });
488
488
  onEdit === null || onEdit === void 0 || onEdit(cacheItem);
489
489
  }
490
- case 24:
490
+ case 25:
491
491
  case "end":
492
492
  return _context3.stop();
493
493
  }
@@ -1,5 +1,11 @@
1
1
  var _excluded = ["detail"];
2
2
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
3
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
4
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
5
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
6
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
7
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
8
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
3
9
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
4
10
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
5
11
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -126,20 +132,29 @@ export var addService = function addService(list, addItem, state) {
126
132
  // 是否设置过 只追加到第一个中
127
133
  var isSetCount = false;
128
134
  value = list.map(function (item) {
135
+ var _item$_extend;
129
136
  // 是否商品券折扣的商品
130
137
  var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
131
138
  return item.type === 'good_pass';
132
139
  });
133
- if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
134
- var _item$_extend, _addItem$_extend, _item$_extend2;
140
+ // 子商品是否有商品券折扣的商品
141
+ var bundleDiscountList = [];
142
+ ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
143
+ bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
144
+ });
145
+ var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
146
+ return item.type === 'good_pass';
147
+ });
148
+ if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isGoodPassBundleProduct) {
149
+ var _item$_extend2, _addItem$_extend, _item$_extend3;
135
150
  isNotSame = false;
136
- var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
151
+ var quantity = ((item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
137
152
  count = quantity;
138
153
  isSetCount = true;
139
154
  return _objectSpread(_objectSpread({}, item), {}, {
140
155
  _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
141
156
  quantity: quantity,
142
- other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
157
+ other: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), {}, {
143
158
  quantity: quantity
144
159
  })
145
160
  })
@@ -206,11 +221,11 @@ export var getIsShowNumber = function getIsShowNumber(item, state) {
206
221
 
207
222
  // 生成服务key
208
223
  export var genServiceKey = function genServiceKey(item) {
209
- var _item$_extend3, _item$_extend4, _item$_extend5;
224
+ var _item$_extend4, _item$_extend5, _item$_extend6;
210
225
  var product_id = item.product_id;
211
- var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
212
- var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
213
- var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
226
+ var durationKey = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration;
227
+ var start_time = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.start_time;
228
+ var total = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.total;
214
229
  var resourceKey = '';
215
230
  Object.values(item._extend.resource).forEach(function (resources) {
216
231
  resources.forEach(function (resource) {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { IWalletListItemProps } from '../serve';
2
3
  /**
3
4
  * 钱包卡片Hook的参数
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
3
2
  import './index.less';
4
3
  interface ModalProps extends AntModalProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  interface LogData {
2
3
  key: string;
3
4
  value: any;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { SCOProps } from '../types';
2
3
  import '../index.less';
3
4
  export declare const Header: (props: SCOProps) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { FormInstance } from 'antd';
2
3
  import { SRProps } from '../types';
3
4
  import '../index.less';
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { FormInstance } from 'antd';
2
3
  import { SRProps } from '../types';
3
4
  import '../index.less';
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { SRProps } from '../types';
2
3
  import '../index.less';
3
4
  declare const GoLogin: (props: SRProps) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { SRProps } from '../types';
2
3
  import '../index.less';
3
4
  export declare const Header: (props: SRProps) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { SRStepStatus } from '../types';
2
3
  import '../index.less';
3
4
  declare const VerifyError: (props: {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import '../index.less';
2
3
  declare const VerifyingEmailLink: (props: {
3
4
  onVerifyLink: () => Promise<void>;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const RelationProduct: ({ value, onChange, }: {
3
4
  value?: string[] | undefined;
@@ -212,10 +212,7 @@ var FooterButtons = function FooterButtons(_ref) {
212
212
  className: "pisell-wallet-pass-gallery_footer-buttons-item pisell-wallet-pass-gallery_footer-buttons-item-primary"
213
213
  }, locales.getText('wallet-pass-gallery.recharge')));
214
214
  }
215
-
216
- // 根据按钮数量设置不同的类名
217
- var buttonCount = buttons.length;
218
- var className = "pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-".concat(buttonCount);
215
+ var className = "pisell-wallet-pass-gallery_footer-buttons";
219
216
  return buttons.length > 0 ? /*#__PURE__*/React.createElement("div", {
220
217
  className: className
221
218
  }, buttons) : null;
@@ -223,6 +220,7 @@ var FooterButtons = function FooterButtons(_ref) {
223
220
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
224
221
  className: "pisell-wallet-pass-gallery_footer"
225
222
  }, renderButtons()), /*#__PURE__*/React.createElement(PisellModal, {
223
+ destroyOnClose: true,
226
224
  platform: platform,
227
225
  mobileModalHeight: "auto",
228
226
  headerDivider: false,
@@ -1,83 +1,38 @@
1
1
  .pisell-wallet-pass-gallery_footer {
2
2
  position: relative;
3
- left: 0;
4
- right: 0;
5
- bottom: 0;
6
3
  background-color: #fff;
7
4
  padding: 24px;
8
5
  z-index: 100;
9
6
  border-top: 1px solid #d0d5de;
10
- margin-left: -20px;
11
- margin-right: -20px;
7
+ margin-left: -24px;
8
+ margin-right: -24px;
12
9
  &-buttons {
13
10
  display: flex;
14
11
  gap: 12px;
15
12
  width: 100%;
16
13
 
17
-
18
- .pisell-wallet-pass-gallery_footer-buttons-item-secondary{
19
- overflow: hidden;
20
- display: flex;
21
- >span{
22
- display: block;
23
- // width: 100%;
24
- flex:1;
14
+ .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
15
+ overflow: hidden;
16
+ display: inline-block;
25
17
  white-space: nowrap;
26
18
  overflow: hidden;
27
19
  text-overflow: ellipsis;
28
20
  text-wrap: nowrap;
29
- }
30
- }
31
-
32
-
33
- // 按钮数量样式
34
- // 单个按钮占满宽度
35
- &-count-1 {
36
- .pisell-wallet-pass-gallery_footer-buttons-item {
37
- flex: 1;
38
- width: 100%;
39
- }
40
- }
41
-
42
- // 两个按钮各占一半
43
- &-count-2 {
44
- .pisell-wallet-pass-gallery_footer-buttons-item {
45
- flex: 1;
46
- width: calc(50% - 6px);
21
+ > span {
22
+ display: inline;
47
23
  }
48
24
  }
49
-
50
- // 三个按钮各占三分之一
51
- &-count-3 {
52
- .pisell-wallet-pass-gallery_footer-buttons-item {
53
- flex: 1;
54
- width: calc(33.33% - 8px);
55
- }
56
- }
57
-
58
- // 四个按钮各占四分之一
59
- &-count-4 {
60
- .pisell-wallet-pass-gallery_footer-buttons-item {
61
- flex: 1;
62
- width: calc(25% - 9px);
63
- }
64
- }
65
-
66
- // Ant Design按钮覆盖样式
67
- :global(.ant-btn) {
68
- height: 48px;
69
- border-radius: 6px;
70
- font-size: 16px;
71
- font-weight: 500;
72
- width: 100%;
25
+
26
+ .pisell-wallet-pass-gallery_footer-buttons-item {
27
+ flex-grow: 1;
73
28
  }
74
-
29
+
75
30
  &-item {
76
31
  // 修饰符:主按钮
77
32
  &-primary {
78
- background-color: var(--theme-color, #7F56D9);
33
+ background-color: var(--theme-color, #7f56d9);
79
34
  }
80
-
35
+
81
36
  // 修饰符:次按钮
82
37
  &-secondary {
83
38
  background-color: #fff;
@@ -90,4 +45,4 @@
90
45
 
91
46
  .pisell-wallet-pass-gallery_footer:empty {
92
47
  display: none;
93
- }
48
+ }