@pisell/private-materials 3.3.55 → 3.3.56

package/lib/components/booking/info/service2/utils.js

@@ -454,7 +454,7 @@ var isAllNormalProductByState = (state) => {
   return isAllNormalProduct(state.service.value);
 };
 var getGeneralParams = (item, state, isParallelResource) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { pet, service } = state;
   const { holders = [], formData } = pet || {};
   const parallelResourceOtherParams = {};
@@ -519,6 +519,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
     start_date: !isNormalProduct ? (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate : "",
     end_date: !isNormalProduct ? ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date) : "",
+    rowKey: `rowKey-${(_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey}`,
     ...parallelResourceOtherParams
   };
 };
@@ -543,7 +544,6 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
-    console.log(isNormalProduct, "isNormalProduct");
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,

package/lib/components/booking/info2/index.js

@@ -92,7 +92,7 @@ var Info = (0, import_model.Provider)((props) => {
       });
     }
   }, []);
-  (0, import_react.useEffect)(() => {
+  (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
@@ -165,9 +165,12 @@ var Info = (0, import_model.Provider)((props) => {
     try {
       setTimeout(async () => {
         var _a2;
-        let data = await (0, import_serve.getResourceList)({
-          date: currentDate
-        }, (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.bookingId);
+        let data = await (0, import_serve.getResourceList)(
+          {
+            date: currentDate
+          },
+          (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.bookingId
+        );
         data.date = currentDate;
         localStorage.setItem("bookingResourceList", JSON.stringify(data));
         modal.dispatch({

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -77,7 +77,7 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
 /**
  * @title: 格式化服务列表
  * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据

package/lib/components/booking/info2/service/addService/utils.js

@@ -355,7 +355,7 @@ var getIsAutoClose = (cacheItem) => {
     }
   );
 };
-var getProductExtend = ({ cacheItem, state }) => {
+var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -409,7 +409,9 @@ var getProductExtend = ({ cacheItem, state }) => {
     if (_cacheItem._extend.bundle_edit !== void 0) {
       _cacheItem._extend.bundle_edit = 1;
     }
-    _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
+    if (!isDisabledTime) {
+      _cacheItem._time = (/* @__PURE__ */ new Date()).getTime();
+    }
   } else {
     if (!_cacheItem._data.capacitys) {
       _cacheItem._data.capacitys = cacheItem.capacity;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info2/service/editService/index.js

@@ -428,6 +428,7 @@ var Info = (_, ref) => {
       titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
+      mask: state.drawerMask,
       open: state.service.editModal && !((_p = state.service.cacheItem) == null ? void 0 : _p.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {

package/lib/components/eventBooking/components/Provider/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.js

@@ -37,6 +37,8 @@ var import_OpenCard = __toESM(require("../../OpenCard"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_Sales = require("../../../../Sales");
+var import_decimal = __toESM(require("decimal.js"));
+var import_pisellPriceText = __toESM(require("../../../../productSelect/components/pisellPriceText"));
 var BookingOptions = (props) => {
   var _a, _b;
   const { detail, currentBookingOption, selectEventDetailBookingOptions } = (0, import_Sales.useEventDetail)();
@@ -63,14 +65,22 @@ var BookingOptions = (props) => {
         optionClassName: `option-item ${((_b = detail == null ? void 0 : detail.bookingOptions) == null ? void 0 : _b.length) > 1 ? "option-item-pointer" : ""}`,
         value: currentBookingOption,
         renderOption: (option) => {
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(
-            import_materials.PisellText.Amount,
-            {
-              value: option.price,
-              showCurrencySymbol: true,
-              className: "price"
-            }
-          ));
+          const { price, is_bundle, minimum_markup_price } = option._originData || {};
+          if (!option._originData || !is_bundle) {
+            return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(
+              import_materials.PisellText.Amount,
+              {
+                value: option.price,
+                showCurrencySymbol: true,
+                className: "price"
+              }
+            ));
+          }
+          let _price = price;
+          if (is_bundle) {
+            _price = new import_decimal.default(price).plus(new import_decimal.default(minimum_markup_price)).toFixed(2);
+          }
+          return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(import_pisellPriceText.default, { className: "price", value: _price, isMini: true }));
         },
         onChange
       }

package/lib/components/eventBooking/components/progressBar/index.js

@@ -37,6 +37,7 @@ var import_materials = require("@pisell/materials");
 var import_Sales = require("../../../Sales");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var ProgressBar = ({
   title,
   description,
@@ -48,8 +49,11 @@ var ProgressBar = ({
   onBack,
   onClose
 }) => {
+  var _a;
   const [open, setOpen] = (0, import_react.useState)(false);
   const { removeSessionStorage } = (0, import_Sales.useSales)();
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const handleClose = () => {
     if (isConfirmClose) {
       setOpen(true);
@@ -58,6 +62,17 @@ var ProgressBar = ({
     }
   };
   const handleOk = () => {
+    var _a2, _b;
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      interaction.utils.postMessageToApp({
+        module: "global",
+        key: "paymentResultAction",
+        data: {
+          actionType: "backHome"
+        }
+      });
+      return;
+    }
     onClose == null ? void 0 : onClose();
     setOpen(false);
     removeSessionStorage == null ? void 0 : removeSessionStorage();

package/lib/components/eventBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const EventBooking: () => JSX.Element;
 export default EventBooking;

package/lib/components/pay/toC/PaymentList/index.js

@@ -46,19 +46,20 @@ var offline = [
   "pisell.custom_payment"
 ];
 var PaymentList = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c;
   const [paymentList, setPaymentList] = (0, import_react.useState)([]);
   const [paymentType, setPaymentType] = (0, import_react.useState)("");
   const [loading, setLoading] = (0, import_react.useState)(true);
   const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const _paymentList = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = props == null ? void 0 : props.store) == null ? void 0 : _a2.paymentList) || paymentList;
-  }, [paymentList, (_a = props == null ? void 0 : props.store) == null ? void 0 : _a.paymentList]);
+  }, [paymentList, (_b = props == null ? void 0 : props.store) == null ? void 0 : _b.paymentList]);
   const _paymentType = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = props == null ? void 0 : props.store) == null ? void 0 : _a2.paymentType) || paymentType;
-  }, [paymentType, (_b = props == null ? void 0 : props.store) == null ? void 0 : _b.paymentType]);
+  }, [paymentType, (_c = props == null ? void 0 : props.store) == null ? void 0 : _c.paymentType]);
   const _getPaymentList = async (initProps) => {
     var _a2;
     setLoading(true);
@@ -85,11 +86,15 @@ var PaymentList = (props, ref) => {
     setPaymentList(list);
     return list;
   };
+  const isApp = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2);
+  }, []);
   const init = (list) => {
     var _a2, _b2;
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
-    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform);
+    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp);
     if (paymentList2.length > 0) {
       let first = paymentList2[0];
       setPaymentList(paymentList2);
@@ -131,13 +136,13 @@ var PaymentList = (props, ref) => {
     })
   );
   const renderToast = (_item) => {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c2;
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-title" }, _item.title + " " + (((_a2 = _item == null ? void 0 : _item.params) == null ? void 0 : _a2.description) ? import_utils2.locales.getText("tocPay.text.paymentInstructions") : import_utils2.locales.getText("tocPay.text.serviceCharge"))), /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "surcharge-info",
         dangerouslySetInnerHTML: {
-          __html: ((_b2 = _item == null ? void 0 : _item.params) == null ? void 0 : _b2.description) ? (_c = _item == null ? void 0 : _item.params) == null ? void 0 : _c.description : _item.surcharge_fee
+          __html: ((_b2 = _item == null ? void 0 : _item.params) == null ? void 0 : _b2.description) ? (_c2 = _item == null ? void 0 : _item.params) == null ? void 0 : _c2.description : _item.surcharge_fee
         }
       }
     ));

package/lib/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform?: string) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
     message: string;
     status: string;
     paymentList: any[];

package/lib/components/pay/toC/PaymentList/serve.js

@@ -31,12 +31,12 @@ var getPaymentList = async (values) => {
   let { data = [] } = await import_utils.request.getRequest().get("/h5/pay/order/payments", values);
   return filterPaymentList(data);
 };
-var filterPaymentList = (list, platform = "h5") => {
+var filterPaymentList = (list, platform = "h5", isApp) => {
   let paymentList = [...list];
   let _paymentKeys = [...import_status.paymentKeys];
   const walletPass = paymentList.find((d) => d.service === "pisell.wallet_pass");
   let arr = [];
-  if (!(0, import_utils2.isWx)()) {
+  if (!(0, import_utils2.isWx)() && !isApp) {
     arr = arr.concat(["globepay.wechat.jsapi", "superpay.wechat.h5"]);
   }
   if (platform === "h5") {
@@ -45,6 +45,9 @@ var filterPaymentList = (list, platform = "h5") => {
   if (!(0, import_utils2.isIOS)()) {
     arr = arr.concat(["mw.apple"]);
   }
+  if ((0, import_utils2.isIOS)() && isApp) {
+    arr = arr.concat(["mw.google"]);
+  }
   _paymentKeys = _paymentKeys.filter((d) => !arr.includes(d));
   paymentList = paymentList.filter(
     (d) => _paymentKeys.includes(d.service)

package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js

@@ -39,12 +39,21 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_serve = require("./serve");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var SuperPayAliPayH5 = (props, ref) => {
+  var _a;
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ payGroup }) => {
-    setOpen(true);
+    var _a2, _b;
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "aliPay", values, interaction });
+    }
+    setOpen(true);
     if (!values) {
       setOpen(false);
       return;

package/lib/components/pay/toC/PaymentMethods/SuperPayWxPayH5/index.js

@@ -39,11 +39,20 @@ var import_serve = require("./serve");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var SuperPayWxPayH5 = (props, ref) => {
+  var _a;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ payGroup }) => {
-    setOpen(true);
+    var _a2, _b;
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "wxPay", values, interaction });
+    }
+    setOpen(true);
     if (!values) {
       setOpen(false);
       return;

package/lib/components/pay/toC/PaymentMethods/index.js

@@ -51,6 +51,9 @@ var import_GlobePayWxH5 = __toESM(require("./GlobePayWxH5"));
 var import_GlobePayQrcode = __toESM(require("./GlobePayQrcode"));
 var import_serve = require("./WalletPass/serve");
 var import_utils = require("../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("@pisell/utils");
+var import_serve2 = require("./GlobePayQrcode/serve");
 var isOfflinePayment = (type) => {
   if ((0, import_status.isCustomPayment)(type)) {
     return true;
@@ -63,6 +66,7 @@ var isOfflinePayment = (type) => {
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
+  var _a;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -77,10 +81,12 @@ var PaymentMethods = (props, ref) => {
   const GlobePayPaypalH5Ref2 = (0, import_react.useRef)(null);
   const GlobePayWxH5Ref2 = (0, import_react.useRef)(null);
   const GlobePayQrcodeRef2 = (0, import_react.useRef)(null);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ type, payGroup }) => {
-    var _a, _b;
+    var _a2, _b;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
-    const cards = (_b = (_a = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a.cards) == null ? void 0 : _b.length;
+    const cards = (_b = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b.length;
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -110,11 +116,29 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
+  (0, import_react.useEffect)(() => {
+    var _a2, _b, _c, _d;
+    console.log("paymentResult isAppEnv", (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2));
+    if ((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) {
+      interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
+        console.log("paymentResult", strResult);
+        if (!(0, import_utils2.isJson)(strResult)) return;
+        const result = JSON.parse(strResult);
+        const { type, pay_number, order_id } = result;
+        if (type && order_id && pay_number) {
+          (0, import_payGroup.setPayNumber)(order_id, pay_number);
+        }
+        const url = `${(0, import_serve2.getReturnUrl)()}?order_id=${order_id}&status=success`;
+        console.log(url, "paymentResult");
+        window.location.href = url;
+      });
+    }
+  }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
-      await ((_a = ApplePayRef2.current) == null ? void 0 : _a.init({ payGroup }));
+      await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
       return;
     }
     if (type === "mw.google") {

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/lib/components/pay/toC/WalletPassBlock/index.less

@@ -10,6 +10,10 @@
       display: flex;
       align-items: center;
       justify-content: center;
+      & > span:first-child {
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
 

package/lib/components/pay/toC/index.js

@@ -70,7 +70,7 @@ var ToCPay = (props, ref) => {
   import_utils.locales.init(import_locales.default, ((_m = dvaStore.core) == null ? void 0 : _m.translateLocale) || "en");
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   const _initStore = (initProps) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2;
     dispatch({
       type: "init",
       payload: {
@@ -78,15 +78,15 @@ var ToCPay = (props, ref) => {
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
+        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history
         // 支付组
-        payGroup: {
-          order_id: (_b2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _b2.order_id,
-          total_amount: (_c2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _c2.amount,
-          // 原订单信息
-          _order: initProps == null ? void 0 : initProps.order,
-          payment_group_id: (_d2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _d2.payment_group_id
-        }
+        // payGroup: {
+        //   order_id: initProps?.order?.order_id,
+        //   total_amount: initProps?.order?.amount,
+        //   // 原订单信息
+        //   _order: initProps?.order,
+        //   payment_group_id: initProps?.order?.payment_group_id,
+        // },
       }
     });
   };
@@ -140,7 +140,12 @@ var ToCPay = (props, ref) => {
       dispatch({
         type: "setPayGroup",
         payload: {
-          ...state.payGroup,
+          // ...state.payGroup,
+          order_id: order == null ? void 0 : order.order_id,
+          // total_amount: order?.amount,
+          // 原订单信息
+          _order: order,
+          payment_group_id: order == null ? void 0 : order.payment_group_id,
           // 支付方式没有walletPass时walletPass设置null
           walletPass: walletPass ? {
             ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
@@ -148,7 +153,7 @@ var ToCPay = (props, ref) => {
             amount: wallet_pass_amount,
             cards: wallet_pass_recommend_list
           } : null,
-          total_amount: order.amount,
+          total_amount: order == null ? void 0 : order.amount,
           wait_amount: remain_amount
         }
       });
@@ -277,13 +282,15 @@ var ToCPay = (props, ref) => {
     (_a2 = props.callback) == null ? void 0 : _a2.call(props, res);
   };
   const onCancel = () => {
-    var _a2;
+    var _a2, _b2;
     (0, import_payGroup.removePayGroupFromStorage)((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
     setShowInformation(false);
     setOpen(false);
     payCallback({
       key: "cancel",
-      data: {}
+      data: {
+        order_id: (_b2 = state.payGroup) == null ? void 0 : _b2.order_id
+      }
     });
   };
   (0, import_ahooks.useUpdateEffect)(() => {

package/lib/components/pay/toC/utils.d.ts

@@ -49,3 +49,9 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
+export declare const clientPayment: (params: {
+    order_id: number;
+    type: "aliPay" | "wxPay";
+    values: any;
+    interaction?: any;
+}) => void;

package/lib/components/pay/toC/utils.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calcWalletPassListAmount: () => calcWalletPassListAmount,
+  clientPayment: () => clientPayment,
   formatFranchiseeRoute: () => formatFranchiseeRoute,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
   formatWalletPassParams: () => formatWalletPassParams,
@@ -85,9 +86,23 @@ var formatFranchiseeRoute = (url, history) => {
 var getAvailableMaxAmount = (data) => {
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
+var clientPayment = (params) => {
+  var _a, _b;
+  const { interaction, type, order_id, values } = params;
+  (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
+    module: "global",
+    key: "paymentClient",
+    data: {
+      type,
+      order_id,
+      ...values
+    }
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
+  clientPayment,
   formatFranchiseeRoute,
   formatWalletPassList2PreparePayments,
   formatWalletPassParams,

package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,3 @@
-import "./index.less";
+import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.js

@@ -35,6 +35,8 @@ module.exports = __toCommonJS(ProductItem_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
+var import_decimal = __toESM(require("decimal.js"));
+var import_pisellPriceText = __toESM(require("../../../../productSelect/components/pisellPriceText"));
 var import_index = require("./index.less");
 var ProductItem = ({
   item = {},
@@ -43,6 +45,11 @@ var ProductItem = ({
   style,
   className
 }) => {
+  const { price, is_bundle, minimum_markup_price } = item;
+  let _price = price;
+  if (is_bundle) {
+    _price = new import_decimal.default(price).plus(new import_decimal.default(minimum_markup_price)).toFixed(2);
+  }
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -59,7 +66,7 @@ var ProductItem = ({
         className: "product-item-card-cover"
       }
     ) : null,
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-title" }, item.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-title" }, item.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "product-item-card-price" }, /* @__PURE__ */ import_react.default.createElement(import_pisellPriceText.default, { value: _price, isMini: is_bundle })))
   );
 };
 var ProductItem_default = ProductItem;

package/lib/components/productSelect/components/TabProduct/index.js

@@ -37,7 +37,7 @@ var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_ahooks = require("ahooks");
 var import_utils = require("@pisell/utils");
-var import_tabs = __toESM(require("../../../booking/components/TabProduct/tabs"));
+var import_tabs = __toESM(require("./tabs"));
 var import_productGroup = __toESM(require("../productGroup"));
 var io = null;
 var TabProduct = (props) => {
@@ -63,17 +63,30 @@ var TabProduct = (props) => {
       });
     }
   }, [list]);
+  const debouncedScroll = (0, import_ahooks.useDebounceFn)(
+    (id) => {
+      var _a;
+      (_a = tabsRef == null ? void 0 : tabsRef.current) == null ? void 0 : _a.scroll(id);
+    },
+    { wait: 100 }
+    // 100ms防抖
+  );
   const handleObserver = (0, import_ahooks.useMemoizedFn)(() => {
     const _marginTop = 270;
     const _marginBottom = window.innerHeight - 70 - 200 - 70;
     const _rootMargin = `${_marginTop * -1}px 0px ${_marginBottom * -1}px 0px`;
     io = new IntersectionObserver(
       (entries) => {
-        var _a, _b, _c, _d;
-        if (entries[0].isIntersecting) {
-          const [name, id] = (_c = (_b = (_a = entries[0]) == null ? void 0 : _a.target) == null ? void 0 : _b.id) == null ? void 0 : _c.split("-");
-          setCurrentGroupId(Number(id));
-          (_d = tabsRef == null ? void 0 : tabsRef.current) == null ? void 0 : _d.scroll(id);
+        var _a, _b;
+        const enteringEntries = entries.filter((entry) => entry.isIntersecting);
+        if (enteringEntries.length > 0) {
+          const topMostEntry = enteringEntries.reduce((top, current) => {
+            return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
+          });
+          const [name, id] = (_b = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id) == null ? void 0 : _b.split("-");
+          const newGroupId = Number(id);
+          setCurrentGroupId(newGroupId);
+          debouncedScroll.run(id);
         }
       },
       {

package/lib/components/productSelect/components/TabProduct/tabs/index.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import './index.less';
+export interface Com<T> extends React.FC<T> {
+}
+export declare type RowKey = string | number;
+export interface Option {
+    id: number | string;
+    name: React.ReactNode;
+}
+export interface TabsProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'onChange'> {
+    renderTab: (item: any) => React.ReactNode;
+    rowKey: RowKey;
+    name: RowKey;
+    onChange: (key: RowKey, _item: any) => void;
+    tab: RowKey;
+    className: string;
+    tabsRef: any;
+    options: Option[];
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<Partial<TabsProps>, "ref"> & React.RefAttributes<unknown>>;
+export default _default;