@pisell/private-materials 3.3.23 → 3.3.25

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/addons/model.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/components/TabProduct/selectProductItem/index.js

@@ -6,7 +6,7 @@ import CollapsibleList from "../../collapsibleList";
 import { renderBundles } from "../../collapsibleList/utils";
 import "./index.less";
 var SelectProductItem = function SelectProductItem(_ref) {
-  var _item$_extend, _item$_extend2;
+  var _item$_extend, _item$_extend$other, _item$_extend2, _item$_extend2$other;
   var item = _ref.item,
     _onClick = _ref.onClick,
     onChangeQuantity = _ref.onChangeQuantity,
@@ -28,7 +28,7 @@ var SelectProductItem = function SelectProductItem(_ref) {
     style: style,
     className: classNames("server-select-product", className),
     onClick: function onClick() {
-      _onClick === null || _onClick === void 0 || _onClick(item);
+      _onClick === null || _onClick === void 0 ? void 0 : _onClick(item);
     }
   }, item.cover ? /*#__PURE__*/React.createElement("img", {
     src: image.ali(item.cover, 100),
@@ -39,11 +39,11 @@ var SelectProductItem = function SelectProductItem(_ref) {
     className: "server-select-product-title"
   }, item.title), /*#__PURE__*/React.createElement("div", {
     className: "server-select-product-subtitle"
-  }, item.subtitle || ""), (((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).length ? /*#__PURE__*/React.createElement(CollapsibleList, {
+  }, item.subtitle || ""), (((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle) || []).length ? /*#__PURE__*/React.createElement(CollapsibleList, {
     style: {
       width: "100%"
     },
-    list: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || [],
+    list: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.bundle) || [],
     renderItem: function renderItem(item) {
       return renderBundles(item, amountSymbol);
     }

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,10 +13,6 @@ import "./index.less";
 
 // tabs 子组件定义
 
-// 定义主键类型
-
-// Tabs 可传递的参数
-
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

package/es/components/booking/components/browserSelect/index.js

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

package/es/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/components/footer/index.js

@@ -26,7 +26,6 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { formatProducts } from "../../addons";
 import { getIsSubjectRequire, isDayBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
-import { isBooking4Shop } from "../../info/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
 import FooterMenus from "./FooterMenus";
@@ -36,6 +35,8 @@ import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
 import VoucherCard from "../voucher";
 import { SubTotal } from "../../../../index";
+import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
+
 /**
  * @title: 底部
  * @description:
@@ -69,6 +70,7 @@ var Footer = function Footer(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     isShowPaymentLink = _useState8[0],
     setIsShowPaymentLink = _useState8[1];
+  var isBooking4Shop = useIsBooking4Shop(state);
   var appointmentProductRef = useRef(null);
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
@@ -375,8 +377,7 @@ var Footer = function Footer(props) {
     };
   }();
   var getApis = function getApis() {
-    var _context$appHelper$ut2, _context$appHelper$ut3;
-    if (isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) || state.renderType === 'dayBooking') {
+    if (isBooking4Shop || state.renderType === 'dayBooking') {
       return {
         editBooking: editBookings,
         createBooking: createBookings
@@ -430,7 +431,7 @@ var Footer = function Footer(props) {
             }
             return _context4.abrupt("return");
           case 5:
-            if (!(getIsSubjectRequire(state) && checkHolderIsError(state))) {
+            if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
               _context4.next = 7;
               break;
             }

package/es/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/forms/model.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/forms/single/index.js

@@ -20,6 +20,8 @@ import CollapsibleList from "../../components/collapsibleList";
 import "./index.less";
 import RenderValueById from "./RenderValueById";
 import useComponents from "../../../../hooks/useComponents";
+import dayjs from 'dayjs';
+import { formatDate } from "../../../../utils/date";
 var queryValueById = ['checkbox', 'radioButton', 'select', 'form_to_form'];
 
 /**
@@ -30,7 +32,7 @@ var queryValueById = ['checkbox', 'radioButton', 'select', 'form_to_form'];
  * @Date: 2024-01-30 17:06
  */
 var Single = function Single(_ref) {
-  var _form$form3, _form$form4;
+  var _form$form4, _form$form5;
   var value = _ref.value,
     onChange = _ref.onChange,
     form = _ref.form,
@@ -166,6 +168,53 @@ var Single = function Single(_ref) {
       }
     });
   }, [form]);
+  console.log('fff', form);
+  var ignoreValidity = useMemo(function () {
+    var _form$form;
+    return !(form !== null && form !== void 0 && (_form$form = form.form) !== null && _form$form !== void 0 && (_form$form = _form$form.setting) !== null && _form$form !== void 0 && _form$form.validity) || form.form.setting.validity.type === 'no_expiry';
+  }, [form === null || form === void 0 ? void 0 : form.form]);
+  var getExpireStatus = function getExpireStatus(expiredAt) {
+    if (ignoreValidity || !expiredAt) return null;
+    var now = dayjs();
+    // 将过期时间设置为当天的最后一秒
+    var expireDate = dayjs(expiredAt).endOf('day');
+    var diffDays = expireDate.diff(now, 'day');
+    // 格式化显示日期（不显示时间）
+    var cnDate = 'YYYY-MM-DD';
+    var enDate = 'DD/MM/YYYY';
+    var formattedDate = formatDate(expireDate, cnDate, enDate);
+    if (now.isAfter(expireDate)) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#999999',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, /*#__PURE__*/React.createElement(Tag, {
+        color: "red",
+        style: {
+          borderRadius: 16,
+          marginRight: 8
+        }
+      }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
+    }
+    if (diffDays < 7) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#FFA940',
+          fontSize: '14px',
+          lineHeight: '20px'
+        }
+      }, locales.getText('pisell2.text.validity.expiring_soon')(formattedDate));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#999999',
+        fontSize: '14px',
+        lineHeight: '20px'
+      }
+    }, locales.getText('pisell2.text.validity.valid_through')(formattedDate));
+  };
 
   /**
    * @title: 渲染字段
@@ -181,16 +230,16 @@ var Single = function Single(_ref) {
     }
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        flex: 1,
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'space-between'
+        flex: 1
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: '#1B1B1B',
+        fontSize: 16,
+        fontWeight: 600,
+        lineHeight: '22px'
       }
-    }, item['main_field'] || item[form.option_key] || '-', item !== null && item !== void 0 && item.status ? item.status === 'valid' ? /*#__PURE__*/React.createElement(Tag, {
-      color: "#56c064"
-    }, locales.getText('pisell2.text.status.valid')) : /*#__PURE__*/React.createElement(Tag, {
-      color: "#d83963"
-    }, locales.getText('pisell2.text.status.expired')) : null);
+    }, item['main_field'] || item[form.option_key] || '-'), /*#__PURE__*/React.createElement("div", null, getExpireStatus(item.expired_at)));
   };
 
   /**
@@ -202,10 +251,10 @@ var Single = function Single(_ref) {
    * @Date: 2024-01-30 17:09
    */
   var _addButtonProps = useMemo(function () {
-    var _form$form, _form$form2;
+    var _form$form2, _form$form3;
     var obj = _objectSpread({
-      title: "".concat(locales.getText('pisell2.text.add-a'), " ").concat(((_form$form = form.form) === null || _form$form === void 0 ? void 0 : _form$form.title) || '-'),
-      subTitle: "".concat(locales.getText('pisell2.text.add-another'), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || '-')
+      title: "".concat(locales.getText('pisell2.text.add-a'), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || '-'),
+      subTitle: "".concat(locales.getText('pisell2.text.add-another'), " ").concat(((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || '-')
     }, addButtonProps);
     // 表单和表格点击事件触发新增弹窗
     if (['form', 'table'].includes(form.type)) {
@@ -246,10 +295,10 @@ var Single = function Single(_ref) {
     previewItemRender: function previewItemRender(d) {
       return renderItem(d);
     },
-    name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || '-',
+    name: ((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || '-',
     addButtonProps: _addButtonProps,
     drawerProps: _objectSpread({
-      title: "".concat(locales.getText('pisell2.text.select'), " ").concat(((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || '-'),
+      title: "".concat(locales.getText('pisell2.text.select'), " ").concat(((_form$form5 = form.form) === null || _form$form5 === void 0 ? void 0 : _form$form5.title) || '-'),
       destroyOnClose: true
     }, drawerProps || {}),
     optionRender: _optionRender,

package/es/components/booking/info/index.d.ts

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

package/es/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/info/pet/index.js

@@ -34,6 +34,7 @@ import "./index.less";
 import useAddHolder, { useFormDataConfig } from "../hooks/useAddHolder";
 import useGetHolderList from "../hooks/useGetHolderList";
 import dayjs from 'dayjs';
+import { formatDate } from "../../../../utils/date";
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -558,7 +559,9 @@ var Pet = function Pet(props) {
     var expireDate = dayjs(expiredAt).endOf('day');
     var diffDays = expireDate.diff(now, 'day');
     // 格式化显示日期（不显示时间）
-    var formattedDate = expireDate.format('YYYY-MM-DD');
+    var cnDate = 'YYYY-MM-DD';
+    var enDate = 'DD/MM/YYYY';
+    var formattedDate = formatDate(expireDate, cnDate, enDate);
     if (now.isAfter(expireDate)) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
@@ -574,7 +577,7 @@ var Pet = function Pet(props) {
         }
       }, locales.getText('pisell2.text.status.expired')), locales.getText('pisell2.text.validity.expired')(formattedDate));
     }
-    if (diffDays <= 7) {
+    if (diffDays < 7) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
           color: '#FFA940',

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/editService/index.js

@@ -42,7 +42,7 @@ import useSelectPet from "../../service2/hooks/useSelectPet";
 import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj } from "../addService/utils";
 import Like from "../like";
-import { getMultiDayPrices } from "../../utils";
+import { editSessionProduct, getMultiDayPrices } from "../../utils";
 import { useService } from "../serviceManager";
 import EditTabs from "./EditTabs";
 var submitLock = false;
@@ -649,7 +649,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = useMemoizedFn(function (e) {
-    var _item$_extend3, _state$client;
+    var _item$_extend6, _state$client;
     // 当前商品
     var item = state.service.cacheItem;
 
@@ -668,6 +668,15 @@ var Info = function Info(_, ref) {
       dayValue.product_option = option || [];
     }
     var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend3, _item$_extend4, _item$_extend5;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
+        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+      };
+    }
 
     // 打开商品详情弹窗
     state.action({
@@ -681,25 +690,29 @@ var Info = function Info(_, ref) {
           variant: isDayBookingMode ? true : false,
           package: true
         },
-        value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
+        value: _objectSpread(_objectSpread(_objectSpread({}, ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other) || {}), dayValue), sessionValue),
         isOS: isSession,
         customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
           var _cacheItem$_extend;
-          var _detail, cacheItem, _total, _cacheItem$_extend2;
+          var _detail, other, cacheItem, _total, _cacheItem$_extend2, sessionDetail;
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _detail = detail || item; // 重新生成商品
+                _detail = detail || item;
+                other = JSON.parse(JSON.stringify(e));
+                other.session = e.session;
+
+                // 重新生成商品
                 cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
                   product_id: item.id,
                   _id: item === null || item === void 0 ? void 0 : item._id,
                   _key: e.key,
                   _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
                     // 覆盖选择的规格和套餐
-                    other: JSON.parse(JSON.stringify(e))
+                    other: other
                   }),
                   new: 0
                 }); // 获取商品总价
@@ -707,8 +720,7 @@ var Info = function Info(_, ref) {
                 if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
                   cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
                 }
-
-                // 用于折扣 可修改
+                sessionDetail = editSessionProduct(cacheItem, e.session); // 用于折扣 可修改
                 cacheItem._extend.total = _total;
 
                 // 用于储存原价
@@ -721,13 +733,25 @@ var Info = function Info(_, ref) {
                     cacheItem: cacheItem
                   }
                 });
-                setTimeout(function () {
-                  updateMultiDay({
-                    start_date: values.start_date,
-                    end_date: values.end_date
-                  });
-                }, 100);
-              case 8:
+                if (isDayBookingMode) {
+                  setTimeout(function () {
+                    updateMultiDay({
+                      start_date: values.start_date,
+                      end_date: values.end_date
+                    });
+                  }, 100);
+                } else {
+                  // 商家反馈更新商品后没有展示最新价格，此处编辑商品后恢复折扣信息
+                  // https://go.feishu.cn/approval/s/iaxPKxFW/
+                  // 更新表单内的商品价格
+                  form.setFieldsValue(_objectSpread({
+                    total: _total
+                  }, isSessionProduct(cacheItem) && sessionDetail ? {
+                    start_time: sessionDetail.start_time,
+                    duration: sessionDetail.duration
+                  } : {}));
+                }
+              case 11:
               case "end":
                 return _context4.stop();
             }

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/components/booking/info/utils.d.ts

@@ -43,4 +43,8 @@ export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
 export declare const isDayBooking: (shopId: number) => boolean;
 export declare const isOpenAddTime: (state: any) => boolean;
 export declare const isShowAddTime: (state: any, currentService: any) => boolean;
+export declare const editSessionProduct: (cacheItem: any, session: any) => {
+    duration: any;
+    start_time: any;
+} | undefined;
 export {};

package/es/components/booking/info/utils.js

@@ -5,7 +5,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
-import { getIsEdit } from "../utils";
+import { getDays, getIsEdit, isSessionProduct } from "../utils";
 import { isUsableProduct } from "../info2/service/addTimeModal/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
@@ -171,4 +171,21 @@ export var isShowAddTime = function isShowAddTime(state, currentService) {
     return false;
   }
   return true;
+};
+export var editSessionProduct = function editSessionProduct(cacheItem, session) {
+  if (isSessionProduct(cacheItem) && session) {
+    cacheItem._extend.start_date = session.start_at;
+    cacheItem._extend.startDate = session.start_at;
+    cacheItem._extend.start_time = session.start_time;
+    cacheItem._extend.end_time = session.end_time;
+    cacheItem._extend.end_date = session.end_at;
+    cacheItem._extend.endDate = session.end_at;
+    cacheItem._extend.duration = getDays({
+      _extend: cacheItem._extend
+    }, 'minutes');
+    return {
+      duration: cacheItem._extend.duration,
+      start_time: session.start_time
+    };
+  }
 };

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -33,6 +33,7 @@ import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProd
 import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
+import { editSessionProduct } from "../../../info/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service3, _state$service5, _window$BaseMaterials, _state$service$cacheI6, _state$service6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
@@ -391,6 +392,16 @@ var Info = function Info(_, ref) {
     // 表单数据
     var values = form.getFieldsValue();
     var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend, _item$_extend2, _item$_extend3;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.end_date,
+        duration: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration
+      };
+    }
+
     // 打开商品详情弹窗
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -404,11 +415,14 @@ var Info = function Info(_, ref) {
           package: true
         },
         isOS: isSession,
-        value: item._extend.other
+        value: _objectSpread(_objectSpread({}, item._extend.other), sessionValue)
       },
       callback: function callback(e, extension_type, detail) {
         var _cacheItem$_extend;
         var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
+
         // 重新生成商品
         var cacheItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
           product_id: item.id,
@@ -416,7 +430,7 @@ var Info = function Info(_, ref) {
           _key: e.key,
           _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
             // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e))
+            other: other
           }),
           new: 0
         });
@@ -432,6 +446,15 @@ var Info = function Info(_, ref) {
             cacheItem: cacheItem
           });
         } catch (err) {}
+        var sessionDetail = editSessionProduct(cacheItem, e.session);
+        if (sessionDetail) {
+          setTimeout(function () {
+            form.setFieldsValue({
+              start_time: sessionDetail.start_time,
+              duration: sessionDetail.duration
+            });
+          }, 200);
+        }
 
         // 用于储存原价
         cacheItem._extend.origin_total = _total;

package/es/components/booking/materiels/startTime/index.js

@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
     return sliceDayIntoFiveMinutes(slice, locale);
   }, [slice, locale]);
   useEffect(function () {
-    timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
+    timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(timeObj);
   }, [timeObj]);
   var renderOptions = useCallback(function (array) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";

package/es/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -104,4 +105,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;