@pisell/private-materials 3.3.65 → 3.3.66

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const TabProduct: (props: any) => JSX.Element;
 export default TabProduct;

package/lib/components/productSelect/components/productGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/schedules/calendar/index.less

@@ -1,167 +1,173 @@
 .calender-box {
-    padding: 0 10px;
-
-    .calender-year-wrap {
-        position: relative;
-    }
-
-    .calender-year {
-        padding: 20px 0;
-        color: #000;
-        font-family: Inter;
-        font-size: 36px;
-        font-style: normal;
-        font-weight: 500;
-        line-height: 44px;
-        letter-spacing: -0.72px;
-        background-color: #fff;
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .caleddar-month {
-        color: #344054;
-        font-family: Inter;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: 600;
-        line-height: 24px;
-        margin-bottom: 4px;
-
+  padding: 0 10px;
+
+  .calender-year-wrap {
+    position: relative;
+  }
+
+  .calender-year {
+    padding: 20px 0;
+    color: #000;
+    font-size: 36px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 44px;
+    letter-spacing: -0.72px;
+    background-color: #fff;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+  }
+
+  .caleddar-month {
+    color: #344054;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 24px;
+    margin-bottom: 4px;
+  }
+
+  // antd calendar样式修改
+  .ant-picker-panel {
+    border-top: none;
+  }
+
+  .pisell-lowcode-picker-cell {
+    padding: 0;
+    border-top: none;
+  }
+
+  .cell-size {
+    width: 40px;
+    height: 40px;
+    padding: 4px;
+  }
+
+  .date-cell {
+    .cell-size ();
+    text-align: center;
+    line-height: 50px;
+  }
+
+  .ant-picker-content th {
+    .date-cell();
+  }
+
+  .caleddar-date-cell {
+    .cell-size ();
+    position: relative;
+    border-radius: 50%;
+
+    &.select {
+      background-color: #fedf89;
+      padding: 4px;
     }
 
-    // antd calendar样式修改
-    .ant-picker-panel {
-        border-top: none;
+    &.excluded {
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0%;
+        left: 0%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(
+          -45deg,
+          #ffffff 25%,
+          transparent 25%,
+          transparent 50%,
+          #ffffff 50%,
+          #ffffff 75%,
+          transparent 75%,
+          transparent
+        );
+        background-size: 10px 10px;
+      }
     }
 
-    .pisell-lowcode-picker-cell {
-        padding: 0;
-        border-top: none;
+    .caleddar-date {
+      color: #101828;
+      border-radius: 50%;
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &.has-status {
+        color: #ffffff;
+      }
+
+      &.disabled-date {
+        color: #7d89b0;
+      }
     }
+  }
 
-    .cell-size {
-        width: 40px;
-        height: 40px;
-        padding: 4px;
-    }
-
-    .date-cell {
-        .cell-size ();
-        text-align: center;
-        line-height: 50px;
-    }
-
-    .ant-picker-content th {
-        .date-cell()
-    }
-
-    .caleddar-date-cell {
-        .cell-size ();
-        position: relative;
-        border-radius: 50%;
-
-        &.select {
-            background-color: #FEDF89;
-            padding: 4px;
-        }
-
-        &.excluded {
-            &::after {
-                content: '';
-                position: absolute;
-                top: 0%;
-                left: 0%;
-                width: 100%;
-                height: 100%;
-                background: linear-gradient(-45deg, #ffffff 25%, transparent 25%, transparent 50%, #ffffff 50%, #ffffff 75%, transparent 75%, transparent);
-                background-size: 10px 10px;
-            }
-        }
-
-        .caleddar-date {
-            color: #101828;
-            border-radius: 50%;
-            width: 100%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-
-            &.has-status {
-                color: #ffffff;
-            }
-
-            &.disabled-date {
-                color: #7D89B0;
-            }
-        }
-    }
-
-    .ant-picker-cell {
-        padding: 0;
-        .cell-size ();
-    }
+  .ant-picker-cell {
+    padding: 0;
+    .cell-size ();
+  }
 }
 
 // 布局
 .month-list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
-
-    .month-item-box {
-        display: flex;
-        // &.month-item-1 {
-        //     justify-content: center;
-        // }
-
-        // &.month-item-2 {
-        //     justify-content: center;
-        // }
-
-        // &.month-item-3 {
-        //     &:nth-child(1n) {
-        //         justify-content: flex-start;
-        //     }
-
-        //     &:nth-child(2n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(3n) {
-        //         justify-content: flex-end;
-        //     }
-        // }
-
-        // &.month-item-4 {
-        //     &:nth-child(1n) {
-        //         justify-content: flex-start;
-        //     }
-
-        //     &:nth-child(2n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(3n) {
-        //         justify-content: center;
-        //     }
-
-        //     &:nth-child(4n) {
-        //         justify-content: flex-end;
-        //     }
-        // }
-    }
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
 
-    .month-item {
-        width: 280px;
-        margin: 10px;
-    }
+  .month-item-box {
+    display: flex;
+    // &.month-item-1 {
+    //     justify-content: center;
+    // }
+
+    // &.month-item-2 {
+    //     justify-content: center;
+    // }
+
+    // &.month-item-3 {
+    //     &:nth-child(1n) {
+    //         justify-content: flex-start;
+    //     }
+
+    //     &:nth-child(2n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(3n) {
+    //         justify-content: flex-end;
+    //     }
+    // }
+
+    // &.month-item-4 {
+    //     &:nth-child(1n) {
+    //         justify-content: flex-start;
+    //     }
+
+    //     &:nth-child(2n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(3n) {
+    //         justify-content: center;
+    //     }
+
+    //     &:nth-child(4n) {
+    //         justify-content: flex-end;
+    //     }
+    // }
+  }
+
+  .month-item {
+    width: 280px;
+    margin: 10px;
+  }
 }
 
 .pisell-lowcode-picker-cell-disabled {
-    &::before {
-        display: none;
-    }
-}
+  &::before {
+    display: none;
+  }
+}

package/lib/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProductProps } from '../../type';
 declare const Product: (props: ProductProps) => JSX.Element;
 export default Product;

package/lib/components/shoppingCart/components/Cart/index.d.ts

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

package/lib/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/lib/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element | null;
 export default useClearCart;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -67,6 +67,8 @@ var AddSerivce = (props) => {
     state == null ? void 0 : state.renderType
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
+  const stateRef = (0, import_react.useRef)(state);
+  stateRef.current = state;
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
@@ -124,13 +126,13 @@ var AddSerivce = (props) => {
     });
   };
   const removeNotAvailableService = (list) => {
-    var _a2, _b2, _c2;
-    if (!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) return;
+    var _a2, _b2, _c2, _d2, _e2;
+    if (!((_c2 = (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length)) return;
     const listMap = list.reduce((acc, cur) => {
       acc[cur.id] = cur;
       return acc;
     }, {});
-    const newValue = (((_c2 = state.service) == null ? void 0 : _c2.value) || []).filter(
+    const newValue = (((_e2 = (_d2 = stateRef.current) == null ? void 0 : _d2.service) == null ? void 0 : _e2.value) || []).filter(
       (item) => listMap[item.product_id]
     );
     dispatch({

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -45,19 +45,32 @@ var import_utils2 = require("../../utils");
 var import_addServiceVariant = __toESM(require("../addServiceVariant"));
 var import_timeBar = __toESM(require("../timeBar"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../booking/info/service2/utils");
+var import_amount = require("../../../booking/components/footer/amount");
+var import_formatProductMessage = __toESM(require("../../utils/formatProductMessage"));
 var TicketBooking = () => {
   var _a;
   const [state, setState] = (0, import_miniRedux.useStore)();
   const engineContext = (0, import_useEngineContext.default)();
   const { props: engineProps } = engineContext.engine;
-  const { action, isTerminal, lowcodeRef, interaction, store, storage, Toast } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
+  const {
+    action,
+    isTerminal,
+    lowcodeRef,
+    interaction,
+    store,
+    storage,
+    Toast,
+    getSymbolic,
+    translation
+  } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
   const _persistentRef = (0, import_react.useRef)(false);
   const _initStateRef = (0, import_react.useRef)({});
   const _listTimerRef = (0, import_react.useRef)();
   const _timerRef = (0, import_react.useRef)();
   const _callbackFnRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e, _f;
     _persistentRef.current = storage.get(`drawer-booking`) === "true" ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(void 0);
@@ -95,10 +108,15 @@ var TicketBooking = () => {
       "booking",
       "refreshBookingDetail",
       (type, orderId) => {
-        console.log(type, orderId, "type, orderId");
-        if (state.bookingId) {
-          _getBookingDetail();
-        }
+        _initFn(() => {
+        });
+      }
+    );
+    (_f = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _f.mountFunction(
+      "booking",
+      "voidBooking",
+      (orderId) => {
+        (0, import_serve.voidAppointment)(orderId);
       }
     );
     return () => {
@@ -132,6 +150,112 @@ var TicketBooking = () => {
       intervalSetTime: isInterval
     });
   };
+  (0, import_react.useEffect)(() => {
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    const cartItems = (_b = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.service) == null ? void 0 : _b.value;
+    if (!Array.isArray(cartItems) || cartItems.length === 0) {
+      (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
+        module: "cds",
+        key: "cartUpdate",
+        data: {
+          currency_symbol: getSymbolic(),
+          total: "0",
+          // 小计
+          products: [],
+          fees: []
+        }
+      });
+    }
+    const total = (0, import_amount.getSumTotal)(state.modalState, true);
+    let formatedProducts = [];
+    try {
+      formatedProducts = (0, import_utils3.formatProducts)(
+        cartItems,
+        state.modalState,
+        false,
+        true,
+        true
+      );
+    } catch (error) {
+      console.error(error);
+    }
+    console.log("formatedProducts", total, formatedProducts);
+    let fees = [];
+    let products = [];
+    for (const item of formatedProducts) {
+      const { id, name, image, origin_total, total: total2, num, note, _origin } = item;
+      (_e = _origin == null ? void 0 : _origin.discount_list) == null ? void 0 : _e.forEach((dl) => {
+        fees.push({
+          isReduce: dl.type === "good_pass",
+          title: translation(dl == null ? void 0 : dl.discount.title),
+          price: dl.amount,
+          type: dl.type
+        });
+      });
+      let msg = "";
+      try {
+        msg = (0, import_formatProductMessage.default)(
+          {
+            ...item,
+            currency_symbol: getSymbolic()
+          },
+          (_f = engineContext.appHelper) == null ? void 0 : _f.utils
+        );
+      } catch (error) {
+        console.error(error);
+      }
+      let _item = {
+        productID: id,
+        title: name,
+        cover: image,
+        //  封面图
+        price: total2,
+        // 售价
+        buyCount: num,
+        // 购买数量
+        productFormatMessage: msg,
+        note
+      };
+      if (origin_total !== total2) _item.modifyPrice = origin_total;
+      products.push(_item);
+    }
+    console.log(
+      "formatedProducts",
+      (_g = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _g(products.length)
+    );
+    if (products.length > 0) {
+      fees.unshift({
+        title: import_utils.locales.getText("pisell2.product.card.subtotal"),
+        price: total.productAmount,
+        type: "subtotal",
+        message: (_h = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _h(
+          products.length
+        )
+      });
+    }
+    console.log("start post message, config:", {
+      module: "cds",
+      key: "cartUpdate",
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.productAmount,
+        // 小计
+        products,
+        fees
+      }
+    });
+    (_j = (_i = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _i.postMessageToApp) == null ? void 0 : _j.call(_i, {
+      module: "cds",
+      key: "cartUpdate",
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.expectAmount,
+        // 小计
+        products,
+        fees
+      }
+    });
+  }, [state.modalState]);
   const _setModalState = (props) => {
     var _a2, _b;
     console.log("同步state到外层", props);
@@ -645,8 +769,10 @@ var TicketBooking = () => {
       }
     );
   };
-  const _callback = (data) => {
-    console.log("callbackcallback");
+  const _callback = (data, type) => {
+    if (isTerminal() && type === "checkout") {
+      return;
+    }
     setState({
       createCount: state.createCount + 1
     });

package/lib/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {