@pisell/private-materials 6.8.30 → 6.8.31

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

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

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

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

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

@@ -3,16 +3,19 @@ import type { SkuValue } from '../../plus/skuOptionsSelection/types';
 import './index.less';
 /**
  * @description Kiosk 商品详情（参考 Figma: Kiosk / Launchpad screen）
- * - 外部传入商品 id，内部通过 getProductDetail 拉取详情
+ * - 默认从 URL query 读取商品 id（productId / product_id / id），内部通过 getProductDetail 拉取详情
  * - 中间区域用 SKUOptionsSelection 做 SKU 选择
  * - 底部用 PisellNumberSelector 做数量编辑
  */
 declare function KioskSkuDetail(props: KioskSkuDetailProps): JSX.Element;
 export default KioskSkuDetail;
 export interface KioskSkuDetailProps {
-    /** 商品 id */
-    productId: number | string;
-    /** 可选：用于商品报价的日期（预约类商品） */
+    /** 商品 id（可选：目前默认从 URL 读取，props 仅作为兜底以兼容老用法） */
+    productId?: number | string;
+    /**
+     * 可选：用于商品报价的日期（预约类商品）
+     * @deprecated 目前 kiosk 详情暂时固定取当天，这个参数暂不生效
+     */
     scheduleDate?: string;
     /** 自定义类名 */
     className?: string;

package/es/components/kioskSkuDetail/index.js

@@ -1,4 +1,5 @@
 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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -16,32 +17,79 @@ import React, { useEffect, useMemo, useState } from 'react';
 import Decimal from 'decimal.js';
 import classNames from 'classnames';
 import { Button } from '@pisell/materials';
+import dayjs from 'dayjs';
+import { locales } from '@pisell/utils';
 import SKUOptionsSelection from "../../plus/skuOptionsSelection";
 import PisellNumberSelector from "../../pro/pisellNumberSelector";
 import useEngineContext from "../../hooks/useEngineContext";
 import { getProductDetail } from "../booking/info/service/serve";
+import localeTexts from "./locales";
 import "./index.less";
+import { request } from "../booking/utils";
 
 /**
  * @description Kiosk 商品详情（参考 Figma: Kiosk / Launchpad screen）
- * - 外部传入商品 id，内部通过 getProductDetail 拉取详情
+ * - 默认从 URL query 读取商品 id（productId / product_id / id），内部通过 getProductDetail 拉取详情
  * - 中间区域用 SKUOptionsSelection 做 SKU 选择
  * - 底部用 PisellNumberSelector 做数量编辑
  */
 function KioskSkuDetail(props) {
-  var _context$appHelper, _store$getState, _store$getState2;
-  var productId = props.productId,
-    scheduleDate = props.scheduleDate,
-    className = props.className,
+  var _context$appHelper, _context$engine, _context$appHelper2, _store$getState, _store$getState2;
+  var className = props.className,
     style = props.style,
     onBack = props.onBack,
     onAddToCart = props.onAddToCart;
+
+  /**
+   * @description 从 URL 中读取 productId（兼容 search / hash query）
+   * - 支持 key: productId / product_id / id
+   */
+  var productIdFromUrl = useMemo(function () {
+    return getQueryFirstMatch({
+      keys: ['productId', 'product_id', 'id']
+    });
+  }, []);
+
+  /**
+   * @description 最终使用的商品 id
+   * - 以 URL 为准（方便 kiosk 场景通过路由跳转直接带参）
+   * - props.productId 作为兜底，兼容老用法
+   */
+  var resolvedProductId = productIdFromUrl !== null && productIdFromUrl !== void 0 ? productIdFromUrl : props.productId;
+
+  /**
+   * @description 目前 scheduleDate 暂时固定成“当天”
+   * - 按本地时区格式化为 YYYY-MM-DD
+   */
+  var scheduleDate = useMemo(function () {
+    return dayjs().format('YYYY-MM-DD');
+  }, []);
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    store = _ref.store,
-    getData = _ref.getData;
+    interaction = _ref.interaction;
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+  request.setRequest(context.appHelper.utils.request);
+  var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
+    store = _ref2.store,
+    getData = _ref2.getData;
   var state = store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 ? void 0 : _store$getState.call(store);
   var symbol = (store === null || store === void 0 || (_store$getState2 = store.getState) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.call(store)) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.global) === null || _store$getState2 === void 0 ? void 0 : _store$getState2.symbol) || '$';
+  useEffect(function () {
+    var _interaction$utils, _interaction$utils$po;
+    // 通知原生初始化
+    interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+      module: 'tickets',
+      key: 'page_load'
+    });
+    // 原生初始化调用-新购流程
+    interaction.utils.mountFunction('tickets', 'restore_buy_wallet_pass', function (data) {
+      console.log('重置状态', data);
+    });
+    // 原生初始化调用-购物车编辑
+    interaction.utils.mountFunction('tickets', 'edit_buy_wallet_pass', function (data) {
+      console.log('编辑状态', data);
+    });
+  }, []);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isLoading = _useState2[0],
@@ -87,7 +135,7 @@ function KioskSkuDetail(props) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (productId) {
+              if (resolvedProductId) {
                 _context.next = 2;
                 break;
               }
@@ -100,9 +148,9 @@ function KioskSkuDetail(props) {
               _params = {
                 open_deposit: open_deposit
               };
-              if (scheduleDate) _params.schedule_date = scheduleDate;
+              _params.schedule_date = scheduleDate;
               _context.next = 10;
-              return getProductDetail(String(productId), _params);
+              return getProductDetail(String(resolvedProductId), _params);
             case 10:
               res = _context.sent;
               apiData = (res === null || res === void 0 ? void 0 : res.data) || {};
@@ -113,7 +161,7 @@ function KioskSkuDetail(props) {
               return _context.abrupt("return");
             case 14:
               setProductData(apiData);
-              normalizedProductId = Number((apiData === null || apiData === void 0 ? void 0 : apiData.product_id) || (apiData === null || apiData === void 0 ? void 0 : apiData.id) || productId || 0);
+              normalizedProductId = Number((apiData === null || apiData === void 0 ? void 0 : apiData.product_id) || (apiData === null || apiData === void 0 ? void 0 : apiData.id) || resolvedProductId || 0);
               minNumUnit = Number((apiData === null || apiData === void 0 ? void 0 : apiData.min_num_unit) || 1);
               setQuantity(minNumUnit > 0 ? minNumUnit : 1);
               initialSkuValue = {
@@ -124,33 +172,34 @@ function KioskSkuDetail(props) {
               };
               setSkuValue(initialSkuValue);
               setSkuDefaultValue(initialSkuValue);
-              _context.next = 28;
+              _context.next = 29;
               break;
             case 23:
               _context.prev = 23;
               _context.t0 = _context["catch"](4);
+              console.error(_context.t0);
               if (!isCancelled) {
-                _context.next = 27;
+                _context.next = 28;
                 break;
               }
               return _context.abrupt("return");
-            case 27:
-              setErrorText('Failed to load product detail');
             case 28:
-              _context.prev = 28;
+              setErrorText('Failed to load product detail');
+            case 29:
+              _context.prev = 29;
               if (!isCancelled) {
-                _context.next = 31;
+                _context.next = 32;
                 break;
               }
               return _context.abrupt("return");
-            case 31:
+            case 32:
               setIsLoading(false);
-              return _context.finish(28);
-            case 33:
+              return _context.finish(29);
+            case 34:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 23, 28, 33]]);
+        }, _callee, null, [[4, 23, 29, 34]]);
       }));
       return _load.apply(this, arguments);
     }
@@ -158,7 +207,7 @@ function KioskSkuDetail(props) {
     return function () {
       isCancelled = true;
     };
-  }, [getData, productId, scheduleDate]);
+  }, [getData, resolvedProductId, scheduleDate]);
   var coverUrl = useMemo(function () {
     return (productData === null || productData === void 0 ? void 0 : productData.cover) || (productData === null || productData === void 0 ? void 0 : productData.image) || '';
   }, [productData]);
@@ -201,16 +250,72 @@ function KioskSkuDetail(props) {
     var deQty = new Decimal(quantity || 0);
     return deUnit.mul(deQty).toNumber();
   }, [quantity, unitPrice]);
+
+  /**
+   * @description 用于展示的总价文案（参考 SkuDetailModal 的 totalText 逻辑）
+   * - 统一处理负数符号
+   * - 统一保留两位小数
+   */
+  var itemTotalText = useMemo(function () {
+    var deTotal = new Decimal(itemTotal || 0);
+    var priceSign = deTotal.toNumber() < 0 ? '-' : '';
+    return "".concat(priceSign).concat(symbol).concat(deTotal.abs().toNumber().toFixed(2));
+  }, [itemTotal, symbol]);
   var handleAddToCart = function handleAddToCart() {
     if (!productData) return;
-    onAddToCart === null || onAddToCart === void 0 || onAddToCart({
-      product: productData,
-      skuValue: skuValue,
+    // onAddToCart?.({
+    //   product: productData,
+    //   skuValue,
+    //   quantity,
+    //   unitPrice,
+    //   total: itemTotal,
+    //   currencySymbol: symbol,
+    //   bookingConfig: state?.bookingConfig,
+    // });
+    var productBundle = [];
+    skuValue.bundle.forEach(function (item) {
+      if (!item.num || item.num < 1) return;
+      var targetBundleData;
+      var bundle_group_id;
+      for (var i = 0; i < productData.bundle_group.length; i++) {
+        var _productData$bundle_g = productData.bundle_group[i],
+          id = _productData$bundle_g.id,
+          _productData$bundle_g2 = _productData$bundle_g.bundle_item,
+          bundle_item = _productData$bundle_g2 === void 0 ? [] : _productData$bundle_g2;
+        for (var j = 0; j < bundle_item.length; j++) {
+          if (item.id === bundle_item[j].bundle_product_id) {
+            bundle_group_id = id;
+            targetBundleData = bundle_item[j];
+            break;
+          }
+        }
+      }
+      productBundle.push({
+        bundle_group_id: bundle_group_id,
+        bundle_id: targetBundleData.id,
+        bundle_product_id: item.id,
+        bundle_variant_id: targetBundleData.bundle_variant_id,
+        num: item.num,
+        extension_id: targetBundleData.extension_id,
+        extension_type: targetBundleData.extension_type
+      });
+    });
+    productData.option_group = [];
+    productData.variant_group = [];
+    var obj = {
+      productDetail: productData,
       quantity: quantity,
-      unitPrice: unitPrice,
-      total: itemTotal,
-      currencySymbol: symbol,
-      bookingConfig: state === null || state === void 0 ? void 0 : state.bookingConfig
+      pricePerUnit: unitPrice,
+      bundlePrice: productData.price,
+      productBundle: productBundle
+    };
+    interaction.utils.postMessageToApp({
+      module: 'tickets',
+      key: 'buy_wallet_pass',
+      data: {
+        // 把洗好的数据放这里
+        productData: [obj]
+      }
     });
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -232,7 +337,12 @@ function KioskSkuDetail(props) {
     className: "pisell-kiosk-sku-detail__title"
   }, titleText || (isLoading ? 'Loading…' : '')), !!descriptionText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__desc"
-  }, descriptionText), !!priceRangeText && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    // descriptionText 为 HTML 字符串，需要按 HTML 渲染
+    dangerouslySetInnerHTML: {
+      __html: descriptionText
+    }
+  })), !!priceRangeText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__price-range"
   }, priceRangeText), !!errorText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__error"
@@ -247,17 +357,17 @@ function KioskSkuDetail(props) {
     customScrollParent: ".pisell-kiosk-sku-detail"
   }) : /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__options-loading"
-  }, isLoading ? 'Loading options…' : ''))), /*#__PURE__*/React.createElement("div", {
+  }, isLoading ? locales.getText('pisell2.text.kiosk.sku.detail.loading.options') : ''))), /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__footer"
   }, /*#__PURE__*/React.createElement(Button, {
     className: "pisell-kiosk-sku-detail__back-btn",
     size: "large",
     onClick: onBack
-  }, "Back"), /*#__PURE__*/React.createElement("div", {
+  }, locales.getText('pisell2.text.kiosk.sku.detail.btn.back')), /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__footer-center"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__item-total"
-  }, "Item total: ", symbol, new Decimal(itemTotal || 0).toFixed(2)), /*#__PURE__*/React.createElement("div", {
+  }, locales.getText('pisell2.text.kiosk.sku.detail.item.total'), ":", ' ', itemTotalText), /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__qty"
   }, /*#__PURE__*/React.createElement(PisellNumberSelector, {
     value: quantity,
@@ -277,6 +387,43 @@ function KioskSkuDetail(props) {
     size: "large",
     onClick: handleAddToCart,
     disabled: !productData || isLoading
-  }, "Add to cart")));
+  }, locales.getText('pisell2.text.kiosk.sku.detail.btn.add.to.cart'))));
 }
-export default KioskSkuDetail;
+export default KioskSkuDetail;
+
+/**
+ * @description 从当前页面 URL 中读取 query 参数（兼容 hash router）
+ * - search: ?a=b
+ * - hash: #/path?a=b
+ */
+function getQueryFirstMatch(params) {
+  var _params$keys;
+  if (typeof window === 'undefined') return null;
+  if (!(params !== null && params !== void 0 && (_params$keys = params.keys) !== null && _params$keys !== void 0 && _params$keys.length)) return null;
+  var keys = params.keys;
+  var tryRead = function tryRead(raw) {
+    if (!raw) return null;
+    var normalized = raw.startsWith('?') ? raw.slice(1) : raw;
+    var searchParams = new URLSearchParams(normalized);
+    var _iterator = _createForOfIteratorHelper(keys),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        var value = searchParams.get(key);
+        if (value) return value;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return null;
+  };
+  var fromSearch = tryRead(window.location.search || '');
+  if (fromSearch) return fromSearch;
+  var hash = window.location.hash || '';
+  var queryIndex = hash.indexOf('?');
+  if (queryIndex === -1) return null;
+  return tryRead(hash.slice(queryIndex + 1));
+}

package/es/components/kioskSkuDetail/locales.d.ts

@@ -0,0 +1,21 @@
+declare const _default: {
+    en: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+    };
+    'zh-CN': {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+    };
+    'zh-TW': {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+    };
+};
+export default _default;

package/es/components/kioskSkuDetail/locales.js

@@ -0,0 +1,20 @@
+export default {
+  en: {
+    'pisell2.text.kiosk.sku.detail.btn.back': 'Back',
+    'pisell2.text.kiosk.sku.detail.item.total': 'Item total',
+    'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Add to cart',
+    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…'
+  },
+  'zh-CN': {
+    'pisell2.text.kiosk.sku.detail.btn.back': '返回',
+    'pisell2.text.kiosk.sku.detail.item.total': '小计',
+    'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入购物车',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…'
+  },
+  'zh-TW': {
+    'pisell2.text.kiosk.sku.detail.btn.back': '返回',
+    'pisell2.text.kiosk.sku.detail.item.total': '小計',
+    'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入購物車',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…'
+  }
+};

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;

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

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

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

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

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

@@ -3,16 +3,19 @@ import type { SkuValue } from '../../plus/skuOptionsSelection/types';
 import './index.less';
 /**
  * @description Kiosk 商品详情（参考 Figma: Kiosk / Launchpad screen）
- * - 外部传入商品 id，内部通过 getProductDetail 拉取详情
+ * - 默认从 URL query 读取商品 id（productId / product_id / id），内部通过 getProductDetail 拉取详情
  * - 中间区域用 SKUOptionsSelection 做 SKU 选择
  * - 底部用 PisellNumberSelector 做数量编辑
  */
 declare function KioskSkuDetail(props: KioskSkuDetailProps): JSX.Element;
 export default KioskSkuDetail;
 export interface KioskSkuDetailProps {
-    /** 商品 id */
-    productId: number | string;
-    /** 可选：用于商品报价的日期（预约类商品） */
+    /** 商品 id（可选：目前默认从 URL 读取，props 仅作为兜底以兼容老用法） */
+    productId?: number | string;
+    /**
+     * 可选：用于商品报价的日期（预约类商品）
+     * @deprecated 目前 kiosk 详情暂时固定取当天，这个参数暂不生效
+     */
     scheduleDate?: string;
     /** 自定义类名 */
     className?: string;