@pisell/private-materials 3.3.67 → 3.3.69

package/es/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

package/es/components/schedules/components/ScheduleList/index.d.ts

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

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddSchedules: ({ value, onChange, drawerContainer, isSelf }: any) => JSX.Element;
 export default AddSchedules;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type Value = number[];
 declare const SchedulesModule: ({ value, onChange, drawerContainer, ruleFn, tabKey, previewItemChange, isSelf, isTitle, }: {

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const ProductDetail: ({ form, currentProduct, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts

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

package/es/components/schedules/products/ProductDetailDrawer/index.d.ts

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

package/es/components/schedules/products/index.d.ts

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

package/es/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/es/components/schedules/products/list/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/es/components/schedules/resources/index.d.ts

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

package/es/components/schedules/resources/list/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/es/components/schedules/resources/relationProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

package/es/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

package/es/components/schedules/schedules/index.d.ts

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

package/es/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/es/components/shoppingCart/components/Empty/index.d.ts

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

package/es/components/shoppingCart/components/Render/index.d.ts

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

package/es/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/es/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/es/components/shoppingCart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/es/components/taxSelect/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

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

@@ -21,16 +21,16 @@ import { getUniqueId, locales } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { appointmentTypes } from "../../../booking/info/service2/status";
-import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import { holderId, isDaysBooking } from "../../../booking/info/service2/utils";
 import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
 import { getProductDetail } from "../../../booking/info/service/serve";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductSelect from "../../../productSelect";
 import "./index.less";
-import { addService, addServiceScroll } from "../../utils";
+import { addService, addServiceScroll, genServiceKey, getIsShowNumber } 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$service3, _state$service4;
@@ -262,6 +262,7 @@ var AddSerivce = function AddSerivce(props) {
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
     var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
     var lock = false;
     if (isEject) {
       setCurrentProduct(item);
@@ -278,8 +279,9 @@ var AddSerivce = function AddSerivce(props) {
           session: isSession,
           variant: true,
           package: true,
-          number: isNormalProductByDurationSchedule(item)
+          number: getIsShowNumber(item, state)
         },
+        isOnlySession: isOnlySession,
         is_eject: isEject ? 1 : 0,
         customer_id: customerId,
         isOS: isSession
@@ -366,7 +368,8 @@ var AddSerivce = function AddSerivce(props) {
                 }
                 if (cacheItem.autoClose) {
                   cacheItem.autoClose = false;
-                  _addService = addService(state.service.value, cacheItem), _list = _addService.list, quantity = _addService.quantity;
+                  cacheItem._serviceKey = genServiceKey(cacheItem);
+                  _addService = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService.list, quantity = _addService.quantity;
                   Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {
                     className: "add-toast-wrap"
                   }, /*#__PURE__*/React.createElement("div", {
@@ -456,7 +459,7 @@ var AddSerivce = function AddSerivce(props) {
           isTitle: 1,
           isSubtitle: 1,
           isPrice: 1,
-          isOriginPrice: 1,
+          isOriginPrice: 0,
           isStock: 1
         }
       }), /*#__PURE__*/React.createElement(NotAvailable, {

package/es/components/ticketBooking/components/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/ticketBooking/components/menuBar/index.d.ts

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

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

@@ -11,6 +11,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 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); }
@@ -30,6 +31,9 @@ import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOther
 import AddServiceVariant from "../addServiceVariant";
 import TimeBar from "../timeBar";
 import "./index.less";
+import { formatProducts } from "../../../booking/info/service2/utils";
+import { getSumTotal } from "../../../booking/components/footer/amount";
+import formatProductMessage from "../../utils/formatProductMessage";
 var TicketBooking = function TicketBooking() {
   var _engineContext$appHel2;
   var _useStore = useStore(),
@@ -45,7 +49,9 @@ var TicketBooking = function TicketBooking() {
     interaction = _engineContext$appHel.interaction,
     store = _engineContext$appHel.store,
     storage = _engineContext$appHel.storage,
-    Toast = _engineContext$appHel.Toast;
+    Toast = _engineContext$appHel.Toast,
+    getSymbolic = _engineContext$appHel.getSymbolic,
+    translation = _engineContext$appHel.translation;
   var _persistentRef = useRef(false);
   var _initStateRef = useRef({});
   var _listTimerRef = useRef();
@@ -125,6 +131,119 @@ var TicketBooking = function TicketBooking() {
     });
   };
 
+  // 商品加购信息发生变化时，需要发送至native端
+  useEffect(function () {
+    var _state$modalState, _locales$getText, _interaction$utils5, _interaction$utils5$p;
+    var cartItems = state === null || state === void 0 || (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.service) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
+    if (!Array.isArray(cartItems) || cartItems.length === 0) {
+      var _interaction$utils4, _interaction$utils4$p;
+      interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$p = _interaction$utils4.postMessageToApp) === null || _interaction$utils4$p === void 0 || _interaction$utils4$p.call(_interaction$utils4, {
+        module: 'cds',
+        key: 'cartUpdate',
+        data: {
+          currency_symbol: getSymbolic(),
+          total: '0',
+          // 小计
+          products: [],
+          fees: []
+        }
+      });
+    }
+    var total = getSumTotal(state.modalState, true);
+    var formatedProducts = [];
+    try {
+      formatedProducts = formatProducts(cartItems, state.modalState, false, true, true);
+    } catch (error) {
+      console.error(error);
+    }
+    console.log('formatedProducts', total, formatedProducts);
+    var fees = [];
+    var products = [];
+    var _iterator = _createForOfIteratorHelper(formatedProducts),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _origin$discount_list;
+        var item = _step.value;
+        var id = item.id,
+          name = item.name,
+          image = item.image,
+          origin_total = item.origin_total,
+          _total = item.total,
+          num = item.num,
+          note = item.note,
+          _origin = item._origin;
+        _origin === null || _origin === void 0 || (_origin$discount_list = _origin.discount_list) === null || _origin$discount_list === void 0 || _origin$discount_list.forEach(function (dl) {
+          fees.push({
+            isReduce: dl.type === 'good_pass',
+            title: translation(dl === null || dl === void 0 ? void 0 : dl.discount.title),
+            price: dl.amount,
+            type: dl.type
+          });
+        });
+        var msg = '';
+        try {
+          var _engineContext$appHel3;
+          msg = formatProductMessage(_objectSpread(_objectSpread({}, item), {}, {
+            currency_symbol: getSymbolic()
+          }), (_engineContext$appHel3 = engineContext.appHelper) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.utils);
+        } catch (error) {
+          console.error(error);
+        }
+        var _item = {
+          productID: id,
+          title: name,
+          cover: image,
+          //  封面图
+          price: _total,
+          // 售价
+          buyCount: num,
+          // 购买数量
+          productFormatMessage: msg,
+          note: note
+        };
+        if (origin_total !== _total) _item.modifyPrice = origin_total; //原价, 注意字段名反了
+        products.push(_item);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    console.log('formatedProducts', (_locales$getText = locales.getText('pisell2.product.card.cart-items')) === null || _locales$getText === void 0 ? void 0 : _locales$getText(products.length));
+    if (products.length > 0) {
+      var _locales$getText2;
+      fees.unshift({
+        title: locales.getText('pisell2.product.card.subtotal'),
+        price: total.productAmount,
+        type: 'subtotal',
+        message: (_locales$getText2 = locales.getText('pisell2.product.card.cart-items')) === null || _locales$getText2 === void 0 ? void 0 : _locales$getText2(products.length)
+      });
+    }
+    console.log('start post message, config:', {
+      module: 'cds',
+      key: 'cartUpdate',
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.productAmount,
+        // 小计
+        products: products,
+        fees: fees
+      }
+    });
+    interaction === null || interaction === void 0 || (_interaction$utils5 = interaction.utils) === null || _interaction$utils5 === void 0 || (_interaction$utils5$p = _interaction$utils5.postMessageToApp) === null || _interaction$utils5$p === void 0 || _interaction$utils5$p.call(_interaction$utils5, {
+      module: 'cds',
+      key: 'cartUpdate',
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.expectAmount,
+        // 小计
+        products: products,
+        fees: fees
+      }
+    });
+  }, [state.modalState]);
+
   /**
    * 设置弹窗内的状态
    */
@@ -773,7 +892,8 @@ var TicketBooking = function TicketBooking() {
       addTimeProducts: state.addTimeProducts,
       isBookingCreatePage: true,
       closeAutoOpenService: true,
-      productExtensionType: state.productExtensionType
+      productExtensionType: state.productExtensionType,
+      isBookingTicket2: true
     }),
     setGlobalState: _setModalState
   })), /*#__PURE__*/React.createElement(TimeBar, {
@@ -817,7 +937,8 @@ var TicketBooking = function TicketBooking() {
       refreshData: _refreshData,
       setActiveTab: _setActiveTab,
       clearAllValue: _clearAllValue,
-      drawerMask: true
+      drawerMask: true,
+      isBookingTicket2: true
     }),
     setGlobalState: _setModalState,
     setState: setState,

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];