@pisell/private-materials 3.3.65 → 3.3.67

package/es/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/es/components/schedules/utils.d.ts

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/es/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/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -33,7 +33,7 @@ import "./index.less";
 import { addService, addServiceScroll } from "../../utils";
 import NotAvailable from "../notAvailable";
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service5, _state$service6;
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service3, _state$service4;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -61,6 +61,8 @@ var AddSerivce = function AddSerivce(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentProduct = _useState4[0],
     setCurrentProduct = _useState4[1];
+  var stateRef = useRef(state);
+  stateRef.current = state;
   var menuList = useMemo(function () {
     var _state$bookingConfig;
     return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.menu_list_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.menu_list) || [];
@@ -163,13 +165,13 @@ var AddSerivce = function AddSerivce(props) {
     };
   }();
   var removeNotAvailableService = function removeNotAvailableService(list) {
-    var _state$service, _state$service2;
-    if (!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) return;
+    var _stateRef$current, _stateRef$current2;
+    if (!((_stateRef$current = stateRef.current) !== null && _stateRef$current !== void 0 && (_stateRef$current = _stateRef$current.service) !== null && _stateRef$current !== void 0 && (_stateRef$current = _stateRef$current.value) !== null && _stateRef$current !== void 0 && _stateRef$current.length)) return;
     var listMap = list.reduce(function (acc, cur) {
       acc[cur.id] = cur;
       return acc;
     }, {});
-    var newValue = (((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []).filter(function (item) {
+    var newValue = (((_stateRef$current2 = stateRef.current) === null || _stateRef$current2 === void 0 || (_stateRef$current2 = _stateRef$current2.service) === null || _stateRef$current2 === void 0 ? void 0 : _stateRef$current2.value) || []).filter(function (item) {
       return listMap[item.product_id];
     });
     dispatch({
@@ -183,7 +185,7 @@ var AddSerivce = function AddSerivce(props) {
   var getServices = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _state$eventOtherPara, _data$data2, _data$data3;
-      var data, _state$service3, _notAvailableRef$curr, _data$data;
+      var data, _state$service, _notAvailableRef$curr, _data$data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -228,7 +230,7 @@ var AddSerivce = function AddSerivce(props) {
             setLoading(false);
             if ((data === null || data === void 0 ? void 0 : data.code) === 607100) {
               // 第一次加载时，或者之前有数据
-              if (!isLoadedServiceRef.current || (_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.services) !== null && _state$service3 !== void 0 && _state$service3.length) {
+              if (!isLoadedServiceRef.current || (_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.services) !== null && _state$service !== void 0 && _state$service.length) {
                 (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
               }
             }
@@ -408,8 +410,8 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   var renderList = useMemo(function () {
-    var _state$service4;
-    var _list = ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.services) || [];
+    var _state$service2;
+    var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
 
     // 跨日预约
     if (isDaysBooking(state)) {
@@ -421,7 +423,7 @@ var AddSerivce = function AddSerivce(props) {
       }
     }
     return _list;
-  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.services, state === null || state === void 0 ? void 0 : state.activeCartId]);
+  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services, state === null || state === void 0 ? void 0 : state.activeCartId]);
   var currentDate = useMemo(function () {
     return state.date.value.format('YYYY-MM-DD');
   }, [state.date.value]);
@@ -462,6 +464,6 @@ var AddSerivce = function AddSerivce(props) {
       }));
     }
     return null;
-  }, [(_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6.autoClose, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [(_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.cacheItem) === null || _state$service4 === void 0 ? void 0 : _state$service4.autoClose, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
 };
 export default AddSerivce;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -20,7 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useRef } from 'react';
 import { locales } from '@pisell/utils';
 import { message } from 'antd';
-import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
+import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
 import * as apis from "../../serve";
 import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -52,7 +52,7 @@ var TicketBooking = function TicketBooking() {
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
   useEffect(function () {
-    var _interaction$utils, _store$getState, _interaction$utils2;
+    var _interaction$utils, _store$getState, _interaction$utils2, _interaction$utils3;
     _persistentRef.current = storage.get("drawer-booking") === 'true' ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(_this);
@@ -80,10 +80,14 @@ var TicketBooking = function TicketBooking() {
     _setShopOpeningHours();
     _setIntervalTime(true);
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'refreshBookingDetail', function (type, orderId) {
-      console.log(type, orderId, 'type, orderId');
-      if (state.bookingId) {
-        _getBookingDetail();
-      }
+      // console.log(type, orderId, 'type, orderId');
+      // 支付成功后清空状态
+      _initFn(function () {});
+    });
+
+    // 作废预约
+    interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || _interaction$utils3.mountFunction('booking', 'voidBooking', function (orderId) {
+      voidAppointment(orderId);
     });
     return function () {
       off === null || off === void 0 || off();
@@ -696,8 +700,11 @@ var TicketBooking = function TicketBooking() {
   };
 
   // 新建完成之后的回调
-  var _callback = function _callback(data) {
-    console.log('callbackcallback');
+  var _callback = function _callback(data, type) {
+    // 结账时
+    if (isTerminal() && type === 'checkout') {
+      return;
+    }
     setState({
       createCount: state.createCount + 1
     });

package/es/components/ticketBooking/serve.d.ts

@@ -280,3 +280,8 @@ export declare const getOrderInfoByCode: (params: any) => Promise<any>;
  * @Date: 2025-04-24 16:28
  */
 export declare const getClientsEs: (params: any) => Promise<any>;
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export declare const voidAppointment: (order_id: number) => Promise<any>;

package/es/components/ticketBooking/serve.js

@@ -960,4 +960,31 @@ export var getClientsEs = /*#__PURE__*/function () {
   return function getClientsEs(_x42) {
     return _ref30.apply(this, arguments);
   };
+}();
+
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export var voidAppointment = /*#__PURE__*/function () {
+  var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(order_id) {
+    var _yield$request$getReq30, data;
+    return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+      while (1) switch (_context31.prev = _context31.next) {
+        case 0:
+          _context31.next = 2;
+          return request.getRequest().put(prefix + "/order/void/appointment/".concat(order_id), {});
+        case 2:
+          _yield$request$getReq30 = _context31.sent;
+          data = _yield$request$getReq30.data;
+          return _context31.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context31.stop();
+      }
+    }, _callee31);
+  }));
+  return function voidAppointment(_x43) {
+    return _ref31.apply(this, arguments);
+  };
 }();

package/es/components/wallet/DiscountCard/index.less

@@ -1,6 +1,5 @@
 .wallet-discountCard-title {
   color: var(--Gray-900, #101828);
-  font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;

package/es/components/wallet/PointCard/index.less

@@ -1,6 +1,5 @@
 .wallet-pointCard-title {
   color: var(--Gray-900, #101828);
-  font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;

package/es/components/wallet/RechargeableCard/index.less

@@ -20,7 +20,6 @@
             color: var(--Gray-900, #101828);
 
             /* Paragraph/Semi Bold */
-            font-family: Inter;
             font-size: 14px;
             font-style: normal;
             font-weight: 600;
@@ -36,7 +35,6 @@
             text-overflow: ellipsis;
 
             /* Small/Regular */
-            font-family: Inter;
             font-size: 12px;
             font-style: normal;
             font-weight: 400;
@@ -55,7 +53,6 @@
           text-overflow: ellipsis;
 
           /* Text md/Semibold */
-          font-family: Inter;
           font-size: 16px;
           font-style: normal;
           font-weight: 600;
@@ -66,8 +63,8 @@
     }
 
     .pisell-card-selected {
-      border: 1px solid var(--theme-color, #7F56D9);
-      background: var(--Primary-50, #F9F5FF);
+      border: 1px solid var(--theme-color, #7f56d9);
+      background: var(--Primary-50, #f9f5ff);
     }
 
     .pisell-card-item:last-child {
@@ -78,7 +75,6 @@
   // 充值卡标题
   &-title {
     color: var(--Gray-900, #101828);
-    font-family: Inter;
     font-size: 20px;
     font-style: normal;
     font-weight: 600;
@@ -104,9 +100,9 @@
     margin-bottom: 16px;
     cursor: pointer;
   }
-  
+
   .pisell-card-selected {
-    border: 1px solid var(--theme-color, #7F56D9);
-    background: var(--Primary-50, #F9F5FF);
+    border: 1px solid var(--theme-color, #7f56d9);
+    background: var(--Primary-50, #f9f5ff);
   }
 }

package/es/components/wallet/Voucher/index.less

@@ -1,6 +1,5 @@
 .wallet-voucher-title {
   color: var(--Gray-900, #101828);
-  font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;

package/es/components/wallet/index.less

@@ -18,7 +18,6 @@
         color: var(--Gray-900, #101828);
 
         /* Display sm/Semibold */
-        font-family: Inter;
         font-size: 30px;
         font-style: normal;
         font-weight: 600;
@@ -53,7 +52,6 @@
       text-align: center;
 
       /* Text sm/Semibold */
-      font-family: Inter;
       font-size: 14px;
       font-style: normal;
       font-weight: 600;
@@ -89,7 +87,6 @@
       }
       .pisell-lowcode-wallet-title {
         color: var(--Gray-900, #101828);
-        font-family: Inter;
         font-size: 30px;
         font-style: normal;
         font-weight: 600;
@@ -117,7 +114,6 @@
               color: var(--Gray-900, #101828);
 
               /* Text md/Medium */
-              font-family: Inter;
               font-size: 16px;
               font-style: normal;
               font-weight: 500;