@pisell/private-materials 6.3.25 → 6.3.27

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 (361) 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/index.js +1 -1
  5. package/build/lowcode/meta.js +1 -1
  6. package/build/lowcode/preview.js +146 -146
  7. package/build/lowcode/render/default/view.css +1 -1
  8. package/build/lowcode/render/default/view.js +7 -7
  9. package/build/lowcode/view.css +1 -1
  10. package/build/lowcode/view.js +8 -8
  11. package/es/components/Sales/Summary/utils.d.ts +1 -1
  12. package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
  13. package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
  14. package/es/components/appointmentBooking/components/Cart/index.d.ts +1 -0
  15. package/es/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
  16. package/es/components/appointmentBooking/components/Footer/index.d.ts +1 -0
  17. package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
  18. package/es/components/appointmentBooking/components/Services/index.js +22 -8
  19. package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
  20. package/es/components/booking/addons/model.d.ts +10 -1
  21. package/es/components/booking/components/TabProduct/index.d.ts +1 -0
  22. package/es/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  23. package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  24. package/es/components/booking/components/collapsibleList/utils.d.ts +1 -0
  25. package/es/components/booking/components/emptyBooking/index.d.ts +1 -0
  26. package/es/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  27. package/es/components/booking/components/formItemChildrenWrap/index.d.ts +1 -0
  28. package/es/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  29. package/es/components/booking/forms/model.d.ts +10 -1
  30. package/es/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
  31. package/es/components/booking/forms/single/index.d.ts +1 -0
  32. package/es/components/booking/forms/table/index.d.ts +1 -0
  33. package/es/components/booking/hooks/useClearCart.d.ts +1 -0
  34. package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  35. package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +1 -0
  36. package/es/components/booking/info/date/index.d.ts +1 -0
  37. package/es/components/booking/info/dateRange/index.d.ts +1 -0
  38. package/es/components/booking/info/model.d.ts +10 -1
  39. package/es/components/booking/info/notes/index.d.ts +1 -0
  40. package/es/components/booking/info/service/actions/index.d.ts +1 -0
  41. package/es/components/booking/info/service/addService/utils.d.ts +1 -1
  42. package/es/components/booking/info/service/like/index.d.ts +1 -0
  43. package/es/components/booking/info2/service/actions/index.d.ts +1 -0
  44. package/es/components/booking/info2/service/addService/utils.d.ts +1 -1
  45. package/es/components/booking/materiels/contacts/index.d.ts +1 -0
  46. package/es/components/booking/materiels/duration/index.d.ts +1 -0
  47. package/es/components/booking/materiels/holder/index.d.ts +1 -0
  48. package/es/components/booking/materiels/startTime/index.d.ts +1 -0
  49. package/es/components/booking/model.d.ts +9 -1
  50. package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  51. package/es/components/booking/notes/NoteBlock/index.d.ts +1 -0
  52. package/es/components/booking/notes/model.d.ts +10 -1
  53. package/es/components/booking/payments/model.d.ts +10 -1
  54. package/es/components/eftpos/deviceList/index.d.ts +1 -0
  55. package/es/components/eftpos/form/index.d.ts +1 -0
  56. package/es/components/eftpos/group/index.d.ts +1 -0
  57. package/es/components/eftpos/hooks.d.ts +1 -0
  58. package/es/components/eftpos/icon/apiKey.d.ts +1 -0
  59. package/es/components/eftpos/icon/device.d.ts +1 -0
  60. package/es/components/eftpos/index.d.ts +1 -0
  61. package/es/components/eftpos/pos.d.ts +1 -0
  62. package/es/components/eftpos/receipt/index.d.ts +1 -0
  63. package/es/components/eftposPay/amount.d.ts +1 -0
  64. package/es/components/eftposPay/app.d.ts +1 -1
  65. package/es/components/eftposPay/component/alert/warn.d.ts +1 -0
  66. package/es/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  67. package/es/components/eftposPay/component/fail/index.d.ts +1 -0
  68. package/es/components/eftposPay/component/fail/network.d.ts +1 -0
  69. package/es/components/eftposPay/component/fail/unknow.d.ts +1 -0
  70. package/es/components/eftposPay/component/header/titlebar.d.ts +1 -0
  71. package/es/components/eftposPay/component/manual/index.d.ts +1 -0
  72. package/es/components/eftposPay/component/signature/index.d.ts +1 -0
  73. package/es/components/eftposPay/component/step/index.d.ts +1 -0
  74. package/es/components/eftposPay/component/step/step.d.ts +1 -0
  75. package/es/components/eftposPay/hooks.d.ts +1 -1
  76. package/es/components/eftposPay/pay.d.ts +1 -0
  77. package/es/components/eftposPay/payo/config.d.ts +1 -0
  78. package/es/components/eftposPay/store/index.d.ts +1 -1
  79. package/es/components/eftposPay/tip.d.ts +1 -0
  80. package/es/components/eftposPay/tyro/hooks.d.ts +1 -0
  81. package/es/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  82. package/es/components/eftposPay/windcave/windcave.d.ts +1 -0
  83. package/es/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
  84. package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +1 -0
  85. package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
  86. package/es/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
  87. package/es/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  88. package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
  89. package/es/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
  90. package/es/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
  91. package/es/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  92. package/es/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
  93. package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
  94. package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
  95. package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
  96. package/es/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
  97. package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  98. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +1 -0
  99. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
  100. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
  101. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +1 -0
  102. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +1 -0
  103. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +1 -0
  104. package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
  105. package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +1 -0
  106. package/es/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +1 -0
  107. package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  108. package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
  109. package/es/components/login/index.d.ts +1 -0
  110. package/es/components/pay/toC/PaymentMethods/ApplePay/index.js +68 -35
  111. package/es/components/pay/toC/PaymentMethods/GooglePay/index.js +70 -42
  112. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +1 -0
  113. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
  114. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +1 -0
  115. package/es/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +72 -41
  116. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.d.ts +15 -0
  117. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js +143 -0
  118. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less +34 -0
  119. package/es/components/pay/toC/PaymentMethods/hooks/index.d.ts +19 -0
  120. package/es/components/pay/toC/PaymentMethods/hooks/index.js +126 -0
  121. package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
  122. package/es/components/pay/toC/index.js +3 -2
  123. package/es/components/pay/toC/locales.d.ts +9 -0
  124. package/es/components/pay/toC/locales.js +12 -3
  125. package/es/components/pay/toC/model.d.ts +10 -1
  126. package/es/components/pay/toC/serve.d.ts +5 -0
  127. package/es/components/pay/toC/serve.js +9 -1
  128. package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  129. package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  130. package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  131. package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
  132. package/es/components/productExtension/fields/Actor/index.d.ts +1 -0
  133. package/es/components/productExtension/fields/Forms/index.d.ts +1 -0
  134. package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  135. package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  136. package/es/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  137. package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  138. package/es/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  139. package/es/components/schedules/calendar/calendarItem.d.ts +1 -0
  140. package/es/components/schedules/calendar/index.d.ts +1 -0
  141. package/es/components/schedules/components/CurrentDay/index.d.ts +1 -0
  142. package/es/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  143. package/es/components/schedules/components/ScheduleList/index.d.ts +1 -0
  144. package/es/components/schedules/model.d.ts +9 -1
  145. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  146. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  147. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +1 -0
  148. package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +1 -0
  149. package/es/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  150. package/es/components/schedules/products/index.d.ts +1 -0
  151. package/es/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  152. package/es/components/schedules/products/list/index.d.ts +1 -0
  153. package/es/components/schedules/resources/index.d.ts +1 -0
  154. package/es/components/schedules/resources/list/index.d.ts +1 -0
  155. package/es/components/schedules/resources/relationProduct/index.d.ts +1 -0
  156. package/es/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  157. package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  158. package/es/components/schedules/schedules/index.d.ts +1 -0
  159. package/es/components/shoppingCart/components/Empty/index.d.ts +1 -0
  160. package/es/components/shoppingCart/components/Render/index.d.ts +1 -0
  161. package/es/components/shoppingCart/hooks/useAddService.d.ts +1 -0
  162. package/es/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
  163. package/es/components/shoppingCart/index.d.ts +1 -0
  164. package/es/components/wallet/Detail/model.d.ts +13 -1
  165. package/es/components/wallet/DiscountCard/model.d.ts +14 -1
  166. package/es/components/wallet/PointCard/model.d.ts +13 -1
  167. package/es/components/wallet/RechargeableCard/model.d.ts +29 -1
  168. package/es/components/wallet/Voucher/model.d.ts +13 -1
  169. package/es/components/wallet/hooks/useWalletCard.d.ts +1 -0
  170. package/es/components/wallet/model.d.ts +9 -1
  171. package/es/components/workSpaceList/components/Modal/index.d.ts +1 -0
  172. package/es/hooks/usePaymentLogger.d.ts +1 -0
  173. package/es/plus/productSelect/ProductCard/index.d.ts +3 -1
  174. package/es/plus/productSelect/ProductCard/index.js +14 -5
  175. package/es/plus/productSelect/index.d.ts +3 -2
  176. package/es/plus/productSelect/index.js +33 -8
  177. package/es/plus/productSelect/index.less +4 -0
  178. package/es/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  179. package/es/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  180. package/es/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  181. package/es/plus/saasRegister/components/GoLogin.d.ts +1 -0
  182. package/es/plus/saasRegister/components/Header.d.ts +1 -0
  183. package/es/plus/saasRegister/components/VerifyError.d.ts +1 -0
  184. package/es/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  185. package/es/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
  186. package/lib/components/Sales/Summary/utils.d.ts +1 -1
  187. package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
  188. package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
  189. package/lib/components/appointmentBooking/components/Cart/index.d.ts +1 -0
  190. package/lib/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
  191. package/lib/components/appointmentBooking/components/Footer/index.d.ts +1 -0
  192. package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
  193. package/lib/components/appointmentBooking/components/Services/index.js +8 -3
  194. package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
  195. package/lib/components/booking/addons/model.d.ts +10 -1
  196. package/lib/components/booking/components/TabProduct/index.d.ts +1 -0
  197. package/lib/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  198. package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  199. package/lib/components/booking/components/collapsibleList/utils.d.ts +1 -0
  200. package/lib/components/booking/components/emptyBooking/index.d.ts +1 -0
  201. package/lib/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  202. package/lib/components/booking/components/formItemChildrenWrap/index.d.ts +1 -0
  203. package/lib/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  204. package/lib/components/booking/forms/model.d.ts +10 -1
  205. package/lib/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
  206. package/lib/components/booking/forms/single/index.d.ts +1 -0
  207. package/lib/components/booking/forms/table/index.d.ts +1 -0
  208. package/lib/components/booking/hooks/useClearCart.d.ts +1 -0
  209. package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  210. package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +1 -0
  211. package/lib/components/booking/info/date/index.d.ts +1 -0
  212. package/lib/components/booking/info/dateRange/index.d.ts +1 -0
  213. package/lib/components/booking/info/model.d.ts +10 -1
  214. package/lib/components/booking/info/notes/index.d.ts +1 -0
  215. package/lib/components/booking/info/service/actions/index.d.ts +1 -0
  216. package/lib/components/booking/info/service/addService/utils.d.ts +1 -1
  217. package/lib/components/booking/info/service/like/index.d.ts +1 -0
  218. package/lib/components/booking/info2/service/actions/index.d.ts +1 -0
  219. package/lib/components/booking/info2/service/addService/utils.d.ts +1 -1
  220. package/lib/components/booking/materiels/contacts/index.d.ts +1 -0
  221. package/lib/components/booking/materiels/duration/index.d.ts +1 -0
  222. package/lib/components/booking/materiels/holder/index.d.ts +1 -0
  223. package/lib/components/booking/materiels/startTime/index.d.ts +1 -0
  224. package/lib/components/booking/model.d.ts +9 -1
  225. package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  226. package/lib/components/booking/notes/NoteBlock/index.d.ts +1 -0
  227. package/lib/components/booking/notes/model.d.ts +10 -1
  228. package/lib/components/booking/payments/model.d.ts +10 -1
  229. package/lib/components/eftpos/deviceList/index.d.ts +1 -0
  230. package/lib/components/eftpos/form/index.d.ts +1 -0
  231. package/lib/components/eftpos/group/index.d.ts +1 -0
  232. package/lib/components/eftpos/hooks.d.ts +1 -0
  233. package/lib/components/eftpos/icon/apiKey.d.ts +1 -0
  234. package/lib/components/eftpos/icon/device.d.ts +1 -0
  235. package/lib/components/eftpos/index.d.ts +1 -0
  236. package/lib/components/eftpos/pos.d.ts +1 -0
  237. package/lib/components/eftpos/receipt/index.d.ts +1 -0
  238. package/lib/components/eftposPay/amount.d.ts +1 -0
  239. package/lib/components/eftposPay/app.d.ts +1 -1
  240. package/lib/components/eftposPay/component/alert/warn.d.ts +1 -0
  241. package/lib/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  242. package/lib/components/eftposPay/component/fail/index.d.ts +1 -0
  243. package/lib/components/eftposPay/component/fail/network.d.ts +1 -0
  244. package/lib/components/eftposPay/component/fail/unknow.d.ts +1 -0
  245. package/lib/components/eftposPay/component/header/titlebar.d.ts +1 -0
  246. package/lib/components/eftposPay/component/manual/index.d.ts +1 -0
  247. package/lib/components/eftposPay/component/signature/index.d.ts +1 -0
  248. package/lib/components/eftposPay/component/step/index.d.ts +1 -0
  249. package/lib/components/eftposPay/component/step/step.d.ts +1 -0
  250. package/lib/components/eftposPay/hooks.d.ts +1 -1
  251. package/lib/components/eftposPay/pay.d.ts +1 -0
  252. package/lib/components/eftposPay/payo/config.d.ts +1 -0
  253. package/lib/components/eftposPay/store/index.d.ts +1 -1
  254. package/lib/components/eftposPay/tip.d.ts +1 -0
  255. package/lib/components/eftposPay/tyro/hooks.d.ts +1 -0
  256. package/lib/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  257. package/lib/components/eftposPay/windcave/windcave.d.ts +1 -0
  258. package/lib/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
  259. package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +1 -0
  260. package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
  261. package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
  262. package/lib/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  263. package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
  264. package/lib/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
  265. package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
  266. package/lib/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  267. package/lib/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
  268. package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
  269. package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
  270. package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
  271. package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
  272. package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  273. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +1 -0
  274. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
  275. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
  276. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +1 -0
  277. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +1 -0
  278. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +1 -0
  279. package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
  280. package/lib/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +1 -0
  281. package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +1 -0
  282. package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  283. package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
  284. package/lib/components/login/index.d.ts +1 -0
  285. package/lib/components/pay/toC/PaymentMethods/ApplePay/index.js +27 -7
  286. package/lib/components/pay/toC/PaymentMethods/GooglePay/index.js +32 -8
  287. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +1 -0
  288. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
  289. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +1 -0
  290. package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +30 -4
  291. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.d.ts +15 -0
  292. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js +88 -0
  293. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less +34 -0
  294. package/lib/components/pay/toC/PaymentMethods/hooks/index.d.ts +19 -0
  295. package/lib/components/pay/toC/PaymentMethods/hooks/index.js +90 -0
  296. package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
  297. package/lib/components/pay/toC/index.js +2 -1
  298. package/lib/components/pay/toC/locales.d.ts +9 -0
  299. package/lib/components/pay/toC/locales.js +12 -3
  300. package/lib/components/pay/toC/model.d.ts +10 -1
  301. package/lib/components/pay/toC/serve.d.ts +5 -0
  302. package/lib/components/pay/toC/serve.js +3 -0
  303. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  304. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  305. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  306. package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
  307. package/lib/components/productExtension/fields/Actor/index.d.ts +1 -0
  308. package/lib/components/productExtension/fields/Forms/index.d.ts +1 -0
  309. package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  310. package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  311. package/lib/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  312. package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  313. package/lib/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  314. package/lib/components/schedules/calendar/calendarItem.d.ts +1 -0
  315. package/lib/components/schedules/calendar/index.d.ts +1 -0
  316. package/lib/components/schedules/components/CurrentDay/index.d.ts +1 -0
  317. package/lib/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  318. package/lib/components/schedules/components/ScheduleList/index.d.ts +1 -0
  319. package/lib/components/schedules/model.d.ts +9 -1
  320. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  321. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  322. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +1 -0
  323. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +1 -0
  324. package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  325. package/lib/components/schedules/products/index.d.ts +1 -0
  326. package/lib/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  327. package/lib/components/schedules/products/list/index.d.ts +1 -0
  328. package/lib/components/schedules/resources/index.d.ts +1 -0
  329. package/lib/components/schedules/resources/list/index.d.ts +1 -0
  330. package/lib/components/schedules/resources/relationProduct/index.d.ts +1 -0
  331. package/lib/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  332. package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  333. package/lib/components/schedules/schedules/index.d.ts +1 -0
  334. package/lib/components/shoppingCart/components/Empty/index.d.ts +1 -0
  335. package/lib/components/shoppingCart/components/Render/index.d.ts +1 -0
  336. package/lib/components/shoppingCart/hooks/useAddService.d.ts +1 -0
  337. package/lib/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
  338. package/lib/components/shoppingCart/index.d.ts +1 -0
  339. package/lib/components/wallet/Detail/model.d.ts +13 -1
  340. package/lib/components/wallet/DiscountCard/model.d.ts +14 -1
  341. package/lib/components/wallet/PointCard/model.d.ts +13 -1
  342. package/lib/components/wallet/RechargeableCard/model.d.ts +29 -1
  343. package/lib/components/wallet/Voucher/model.d.ts +13 -1
  344. package/lib/components/wallet/hooks/useWalletCard.d.ts +1 -0
  345. package/lib/components/wallet/model.d.ts +9 -1
  346. package/lib/components/workSpaceList/components/Modal/index.d.ts +1 -0
  347. package/lib/hooks/usePaymentLogger.d.ts +1 -0
  348. package/lib/plus/productSelect/ProductCard/index.d.ts +3 -1
  349. package/lib/plus/productSelect/ProductCard/index.js +18 -4
  350. package/lib/plus/productSelect/index.d.ts +3 -2
  351. package/lib/plus/productSelect/index.js +20 -6
  352. package/lib/plus/productSelect/index.less +4 -0
  353. package/lib/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  354. package/lib/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  355. package/lib/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  356. package/lib/plus/saasRegister/components/GoLogin.d.ts +1 -0
  357. package/lib/plus/saasRegister/components/Header.d.ts +1 -0
  358. package/lib/plus/saasRegister/components/VerifyError.d.ts +1 -0
  359. package/lib/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  360. package/lib/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
  361. package/package.json +2 -2
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Event: () => JSX.Element;
3
4
  export default Event;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Footer: () => JSX.Element;
3
4
  export default Footer;
@@ -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,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Information: () => JSX.Element;
3
4
  export default Information;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const InformationOptionsModal: (props: any) => JSX.Element;
3
4
  export default InformationOptionsModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const OrderProductModal: (props: any) => JSX.Element;
3
4
  export default OrderProductModal;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const RemoveOptionConfirmModal: (props: any) => JSX.Element;
2
3
  export default RemoveOptionConfirmModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Resource: () => JSX.Element;
3
4
  export default Resource;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const SelectHolderModal: (props: any) => JSX.Element;
2
3
  export default SelectHolderModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Status: (props: any) => JSX.Element;
3
4
  export default Status;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const WeekItem: (props: any) => JSX.Element;
3
4
  export default WeekItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare type CalenDateWeekProps = {
3
4
  currentDate: string;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const DayItem: (props: any) => JSX.Element;
3
4
  export default DayItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  import { CalendarItemProps } from '../../../../../type';
3
4
  declare const Item: (props: CalendarItemProps) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Status: (props: any) => JSX.Element;
3
4
  export default Status;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const BookingOptions: (props: {
2
3
  onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
3
4
  }) => JSX.Element;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const Resource: (props: any) => JSX.Element;
2
3
  export default Resource;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const Schedule: () => JSX.Element;
2
3
  export default Schedule;
@@ -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
  declare const ScheduleTimeItem: ({ timeList }: any) => JSX.Element;
3
4
  export default ScheduleTimeItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  export interface LoginProps {
3
4
  title: string;
@@ -11,11 +11,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
11
  import React, { useState, useImperativeHandle, forwardRef, useContext } from 'react';
12
12
  import { PisellModal } from '@pisell/materials';
13
13
  import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
14
+ import PaymentReturnContent from "../components/PaymentReturnContent";
14
15
  import { Context } from "../../model";
15
16
  import { locales } from '@pisell/utils';
16
17
  import { getPayGroupParamsFromStorage } from "../../payGroup";
17
18
  import useEngineContext from "../../../../../hooks/useEngineContext";
18
19
  import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
20
+ import { usePaymentRedirect } from "../hooks";
19
21
  import "./index.less";
20
22
  import { formatFranchiseeRoute } from "../../utils";
21
23
  /**
@@ -28,7 +30,7 @@ import { formatFranchiseeRoute } from "../../utils";
28
30
  * @Date: 2024-08-16 10:58
29
31
  */
30
32
  var ApplePay = function ApplePay(props, ref) {
31
- var _context$appHelper, _state$payGroup;
33
+ var _context$appHelper, _state$payGroup, _state$payGroup2, _state$payGroup4;
32
34
  var _useContext = useContext(Context),
33
35
  state = _useContext.state;
34
36
  var _useState = useState(false),
@@ -45,6 +47,15 @@ var ApplePay = function ApplePay(props, ref) {
45
47
  step: '2'
46
48
  });
47
49
 
50
+ // 使用支付跳转 hooks
51
+ var _usePaymentRedirect = usePaymentRedirect({
52
+ orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
53
+ paymentType: 'applePay'
54
+ }),
55
+ isReturned = _usePaymentRedirect.isReturned,
56
+ handleRedirect = _usePaymentRedirect.handleRedirect,
57
+ resetState = _usePaymentRedirect.resetState;
58
+
48
59
  /**
49
60
  * @title: 初始化
50
61
  * @description:
@@ -56,7 +67,7 @@ var ApplePay = function ApplePay(props, ref) {
56
67
  var init = /*#__PURE__*/function () {
57
68
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
58
69
  var _utils$getStore;
59
- var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup2, locale, shopId, currentURL, linkElement, shop_domain, _href;
70
+ var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup3, locale, shopId, currentURL, linkElement, shop_domain, _href;
60
71
  return _regeneratorRuntime().wrap(function _callee$(_context) {
61
72
  while (1) switch (_context.prev = _context.next) {
62
73
  case 0:
@@ -95,43 +106,50 @@ var ApplePay = function ApplePay(props, ref) {
95
106
  key: 'ApplePay获取支付参数成功',
96
107
  value: ""
97
108
  });
98
- try {
99
- // 语言
100
- locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
101
- shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id; // 当前url
102
- currentURL = window.location.href; // 创建一个a元素,用于解析URL
103
- linkElement = document.createElement('a');
104
- linkElement.href = currentURL;
109
+ _context.prev = 12;
110
+ // 语言
111
+ locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en'; // 店铺id
112
+ shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id; // 当前url
113
+ currentURL = window.location.href; // 创建一个a元素,用于解析URL
114
+ linkElement = document.createElement('a');
115
+ linkElement.href = currentURL;
116
+
117
+ // 提取域名
118
+ shop_domain = linkElement.hostname;
119
+ _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id, "&front_order_uuid=").concat(state.front_order_uuid), state.history)); // 记录即将跳转到ApplePay
120
+ paymentLogger.addLog({
121
+ key: 'ApplePay准备跳转',
122
+ value: ""
123
+ });
124
+ paymentLogger.sendLogs('ApplePay跳转成功');
105
125
 
106
- // 提取域名
107
- shop_domain = linkElement.hostname;
108
- _href = "".concat(config.pay).concat(formatFranchiseeRoute("/apple-pay?order_id=".concat((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history)); // 记录即将跳转到ApplePay
109
- paymentLogger.addLog({
110
- key: 'ApplePay准备跳转',
111
- value: ""
112
- });
113
- paymentLogger.sendLogs('ApplePay跳转成功');
114
- window.location.href = _href;
115
- } catch (err) {
116
- // 记录ApplePay处理错误
117
- paymentLogger.addLog({
118
- key: 'ApplePay处理错误',
119
- value: {
120
- title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
121
- data: {
122
- payGroup: payGroup,
123
- values: values
124
- }
126
+ // 使用 hooks 提供的跳转方法
127
+ _context.next = 24;
128
+ return handleRedirect(_href);
129
+ case 24:
130
+ _context.next = 31;
131
+ break;
132
+ case 26:
133
+ _context.prev = 26;
134
+ _context.t0 = _context["catch"](12);
135
+ // 记录ApplePay处理错误
136
+ paymentLogger.addLog({
137
+ key: 'ApplePay处理错误',
138
+ value: {
139
+ title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " ApplePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
140
+ data: {
141
+ payGroup: payGroup,
142
+ values: values
125
143
  }
126
- });
127
- paymentLogger.sendLogs('ApplePay处理失败', err);
128
- setOpen(false);
129
- }
130
- case 13:
144
+ }
145
+ });
146
+ paymentLogger.sendLogs('ApplePay处理失败', _context.t0);
147
+ setOpen(false);
148
+ case 31:
131
149
  case "end":
132
150
  return _context.stop();
133
151
  }
134
- }, _callee);
152
+ }, _callee, null, [[12, 26]]);
135
153
  }));
136
154
  return function init(_x) {
137
155
  return _ref3.apply(this, arguments);
@@ -142,6 +160,10 @@ var ApplePay = function ApplePay(props, ref) {
142
160
  init: init
143
161
  };
144
162
  });
163
+ var handleReturn = function handleReturn() {
164
+ setOpen(false);
165
+ resetState();
166
+ };
145
167
  return /*#__PURE__*/React.createElement(PisellModal, {
146
168
  platform: 'h5',
147
169
  open: open,
@@ -153,8 +175,19 @@ var ApplePay = function ApplePay(props, ref) {
153
175
  }
154
176
  }, /*#__PURE__*/React.createElement("div", {
155
177
  className: ""
156
- }, /*#__PURE__*/React.createElement(ThreedsLoading, {
178
+ }, !isReturned &&
179
+ /*#__PURE__*/
180
+ // 跳转前展示 Loading
181
+ React.createElement(ThreedsLoading, {
157
182
  title: locales.getText('tocPay.text.connectingApplePay')
183
+ }), isReturned &&
184
+ /*#__PURE__*/
185
+ // 跳转后返回时展示新组件内容
186
+ React.createElement(PaymentReturnContent, {
187
+ handleReturn: handleReturn,
188
+ state: state,
189
+ orderId: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id,
190
+ unique_payment_number: state === null || state === void 0 ? void 0 : state.front_order_uuid
158
191
  })));
159
192
  };
160
193
  export default /*#__PURE__*/forwardRef(ApplePay);
@@ -17,6 +17,8 @@ import { getPayGroupParamsFromStorage } from "../../payGroup";
17
17
  import useEngineContext from "../../../../../hooks/useEngineContext";
18
18
  import usePaymentLogger from "../../../../../hooks/usePaymentLogger";
19
19
  import { clientPayment, formatFranchiseeRoute } from "../../utils";
20
+ import { usePaymentRedirect } from "../hooks";
21
+ import PaymentReturnContent from "../components/PaymentReturnContent";
20
22
  /**
21
23
  * @title: 谷歌支付
22
24
  * @description:
@@ -27,7 +29,7 @@ import { clientPayment, formatFranchiseeRoute } from "../../utils";
27
29
  * @Date: 2024-08-16 11:01
28
30
  */
29
31
  var GooglePay = function GooglePay(props, ref) {
30
- var _context$appHelper, _context$appHelper2, _state$payGroup;
32
+ var _context$appHelper, _context$appHelper2, _state$payGroup, _state$payGroup2, _state$payGroup4;
31
33
  var _useContext = useContext(Context),
32
34
  state = _useContext.state;
33
35
  var _useState = useState(false),
@@ -46,6 +48,15 @@ var GooglePay = function GooglePay(props, ref) {
46
48
  step: '2'
47
49
  });
48
50
 
51
+ // 使用支付跳转 hooks
52
+ var _usePaymentRedirect = usePaymentRedirect({
53
+ orderId: (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id,
54
+ paymentType: 'googlePay'
55
+ }),
56
+ isReturned = _usePaymentRedirect.isReturned,
57
+ handleRedirect = _usePaymentRedirect.handleRedirect,
58
+ resetState = _usePaymentRedirect.resetState;
59
+
49
60
  /**
50
61
  * @title: 初始化
51
62
  * @description:
@@ -57,7 +68,7 @@ var GooglePay = function GooglePay(props, ref) {
57
68
  var init = /*#__PURE__*/function () {
58
69
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
59
70
  var _utils$getStore, _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
60
- var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup2, locale, shopId, currentURL, linkElement, shop_domain, _href;
71
+ var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup3, locale, shopId, currentURL, linkElement, shop_domain, _href;
61
72
  return _regeneratorRuntime().wrap(function _callee$(_context) {
62
73
  while (1) switch (_context.prev = _context.next) {
63
74
  case 0:
@@ -65,13 +76,14 @@ var GooglePay = function GooglePay(props, ref) {
65
76
  // 记录GooglePay初始化开始
66
77
  paymentLogger.addLog({
67
78
  key: 'GooglePay初始化开始',
68
- value: ""
79
+ value: ''
69
80
  });
81
+ setOpen(true);
70
82
  utils = context.appHelper.utils || {};
71
83
  dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState(); // 获取交易组
72
84
  values = getPayGroupParamsFromStorage(payGroup.order_id);
73
85
  if (values) {
74
- _context.next = 10;
86
+ _context.next = 11;
75
87
  break;
76
88
  }
77
89
  // 记录获取支付参数失败
@@ -87,20 +99,20 @@ var GooglePay = function GooglePay(props, ref) {
87
99
  paymentLogger.sendLogs('GooglePay获取支付参数失败');
88
100
  setOpen(false);
89
101
  return _context.abrupt("return");
90
- case 10:
102
+ case 11:
91
103
  // 记录获取支付参数成功
92
104
  paymentLogger.addLog({
93
105
  key: 'GooglePay获取支付参数成功',
94
- value: ""
106
+ value: ''
95
107
  });
96
108
  if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils) && (interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAndroid_ios) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2)) === 'android')) {
97
- _context.next = 15;
109
+ _context.next = 16;
98
110
  break;
99
111
  }
100
112
  // 记录Android客户端支付
101
113
  paymentLogger.addLog({
102
114
  key: 'GooglePay使用Android客户端支付',
103
- value: ""
115
+ value: ''
104
116
  });
105
117
  paymentLogger.sendLogs('GooglePay客户端支付');
106
118
  return _context.abrupt("return", clientPayment({
@@ -109,44 +121,48 @@ var GooglePay = function GooglePay(props, ref) {
109
121
  values: values,
110
122
  interaction: interaction
111
123
  }));
112
- case 15:
113
- setOpen(true);
114
- try {
115
- locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
116
- shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
117
- currentURL = window.location.href; // 创建一个a元素,用于解析URL
118
- linkElement = document.createElement('a');
119
- linkElement.href = currentURL;
124
+ case 16:
125
+ _context.prev = 16;
126
+ locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
127
+ shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
128
+ currentURL = window.location.href; // 创建一个a元素,用于解析URL
129
+ linkElement = document.createElement('a');
130
+ linkElement.href = currentURL;
120
131
 
121
- // 提取域名
122
- shop_domain = linkElement.hostname;
123
- _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id), state.history)); // 记录即将跳转到GooglePay
124
- paymentLogger.addLog({
125
- key: 'GooglePay准备跳转',
126
- value: ""
127
- });
128
- paymentLogger.sendLogs('GooglePay跳转成功');
129
- window.location.href = _href;
130
- } catch (err) {
131
- // 记录GooglePay处理错误
132
- paymentLogger.addLog({
133
- key: 'GooglePay处理错误',
134
- value: {
135
- title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " GooglePay\u5904\u7406\u5931\u8D25: ").concat((err === null || err === void 0 ? void 0 : err.message) || '未知错误'),
136
- data: {
137
- payGroup: payGroup,
138
- values: values
139
- }
132
+ // 提取域名
133
+ shop_domain = linkElement.hostname;
134
+ _href = "".concat(config.pay).concat(formatFranchiseeRoute("/google-pay?order_id=".concat((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id, "&shop_id=").concat(shopId, "&locale=").concat(locale, "&shop_domain=").concat(shop_domain, "&total_amount=").concat(values.amount, "&payment_group_id=").concat(values.payment_group_id, "&front_order_uuid=").concat(state.front_order_uuid), state.history)); // 记录即将跳转到GooglePay
135
+ paymentLogger.addLog({
136
+ key: 'GooglePay准备跳转',
137
+ value: ''
138
+ });
139
+ paymentLogger.sendLogs('GooglePay跳转成功');
140
+ _context.next = 28;
141
+ return handleRedirect(_href);
142
+ case 28:
143
+ _context.next = 35;
144
+ break;
145
+ case 30:
146
+ _context.prev = 30;
147
+ _context.t0 = _context["catch"](16);
148
+ // 记录GooglePay处理错误
149
+ paymentLogger.addLog({
150
+ key: 'GooglePay处理错误',
151
+ value: {
152
+ title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " GooglePay\u5904\u7406\u5931\u8D25: ").concat((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'),
153
+ data: {
154
+ payGroup: payGroup,
155
+ values: values
140
156
  }
141
- });
142
- paymentLogger.sendLogs('GooglePay处理失败', err);
143
- setOpen(false);
144
- }
145
- case 17:
157
+ }
158
+ });
159
+ paymentLogger.sendLogs('GooglePay处理失败', _context.t0);
160
+ setOpen(false);
161
+ case 35:
146
162
  case "end":
147
163
  return _context.stop();
148
164
  }
149
- }, _callee);
165
+ }, _callee, null, [[16, 30]]);
150
166
  }));
151
167
  return function init(_x) {
152
168
  return _ref3.apply(this, arguments);
@@ -157,6 +173,10 @@ var GooglePay = function GooglePay(props, ref) {
157
173
  init: init
158
174
  };
159
175
  });
176
+ var handleReturn = function handleReturn() {
177
+ setOpen(false);
178
+ resetState();
179
+ };
160
180
  return /*#__PURE__*/React.createElement(PisellModal, {
161
181
  platform: 'h5',
162
182
  open: open,
@@ -168,8 +188,16 @@ var GooglePay = function GooglePay(props, ref) {
168
188
  }
169
189
  }, /*#__PURE__*/React.createElement("div", {
170
190
  className: ""
171
- }, /*#__PURE__*/React.createElement(ThreedsLoading, {
191
+ }, !isReturned && /*#__PURE__*/React.createElement(ThreedsLoading, {
172
192
  title: locales.getText('tocPay.text.connectingGooglePay')
193
+ }), isReturned &&
194
+ /*#__PURE__*/
195
+ // 跳转后返回时展示新组件内容
196
+ React.createElement(PaymentReturnContent, {
197
+ handleReturn: handleReturn,
198
+ state: state,
199
+ orderId: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id,
200
+ unique_payment_number: state.front_order_uuid
173
201
  })));
174
202
  };
175
203
  export default /*#__PURE__*/forwardRef(GooglePay);
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
2
3
  public_key: string;
3
4
  client_secret?: string | undefined;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
3
4
  export default SetupForm;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.module.less';
2
3
  declare const StripePayment: () => JSX.Element;
3
4
  export default StripePayment;