@pisell/private-materials 6.3.141 → 6.3.142

package/es/components/scanOrder/components/Content/index.js

@@ -124,6 +124,10 @@ function ReadyState() {
     _useState10 = _slicedToArray(_useState9, 2),
     productList = _useState10[0],
     setProductList = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isProductListLoading = _useState12[0],
+    setIsProductListLoading = _useState12[1];
   var productListLoadedRef = useRef(false);
   var productListPromiseRef = useRef(null);
   var ensureProductListLoaded = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -151,19 +155,20 @@ function ReadyState() {
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  _context.prev = 0;
-                  _context.next = 3;
+                  setIsProductListLoading(true);
+                  _context.prev = 1;
+                  _context.next = 4;
                   return runModuleAction('getProductList');
-                case 3:
+                case 4:
                   res = _context.sent;
                   if (!Array.isArray(res)) {
-                    _context.next = 8;
+                    _context.next = 9;
                     break;
                   }
                   productListLoadedRef.current = true;
                   setProductList(res);
                   return _context.abrupt("return");
-                case 8:
+                case 9:
                   // 非数组错误载荷：沿用原 Menu 内的 Modal.confirm + 跳首页逻辑
                   Modal.confirm({
                     title: res === null || res === void 0 ? void 0 : res.message,
@@ -178,21 +183,22 @@ function ReadyState() {
                       location.replace('/');
                     }
                   });
-                  _context.next = 14;
+                  _context.next = 15;
                   break;
-                case 11:
-                  _context.prev = 11;
-                  _context.t0 = _context["catch"](0);
+                case 12:
+                  _context.prev = 12;
+                  _context.t0 = _context["catch"](1);
                   console.warn('[scanOrder] getProductList failed', _context.t0);
-                case 14:
-                  _context.prev = 14;
+                case 15:
+                  _context.prev = 15;
+                  setIsProductListLoading(false);
                   productListPromiseRef.current = null;
-                  return _context.finish(14);
-                case 17:
+                  return _context.finish(15);
+                case 19:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[0, 11, 14, 17]]);
+            }, _callee, null, [[1, 12, 15, 19]]);
           }))();
           productListPromiseRef.current = request;
           _context2.next = 10;
@@ -681,6 +687,7 @@ function ReadyState() {
         return goToStep('check');
       },
       productList: productList,
+      isProductListLoading: isProductListLoading,
       onEnsureProductList: ensureProductListLoaded
     }),
     check: /*#__PURE__*/React.createElement(Check, null),

package/es/components/scanOrder/components/Menu/index.d.ts

@@ -11,6 +11,7 @@ interface MenuProps {
      * - 首次：真发请求
      * - 后续（如从 check 返回 product）：命中缓存，直接短路，不重复发请求
      */
+    isProductListLoading: boolean;
     onEnsureProductList: () => Promise<void>;
 }
 export default function Menu(props: MenuProps): JSX.Element;

package/es/components/scanOrder/components/Menu/index.js

@@ -24,6 +24,7 @@ export default function Menu(props) {
   var _scrollRef$current;
   var onCheckout = props.onCheckout,
     productList = props.productList,
+    isProductListLoading = props.isProductListLoading,
     onEnsureProductList = props.onEnsureProductList;
   var context = useEngineContext();
   var _ref = context.appHelper || {},
@@ -349,7 +350,7 @@ export default function Menu(props) {
     //   _isMobile ? '.parallel-content-wrap' : '.parallel-booking-wrap'
     // }
     ,
-    loading: false,
+    loading: isProductListLoading,
     emptyDescription: locales.getText('pisell2.scan.order.empty.product'),
     token: {
       colorPrimary: 'var(--theme-color)',

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

@@ -9,6 +9,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -57,6 +58,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -105,6 +107,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -153,6 +156,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -201,6 +205,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;

package/es/components/scanOrder/locales.js

@@ -9,6 +9,7 @@ export default {
     'pisell2.scan.order.action.select.required': 'Select Required',
     'pisell2.scan.order.step.init': 'Initialize',
     'pisell2.scan.order.loading.initializing': 'Preparing your order, please wait...',
+    'pisell2.scan.order.loading.products': 'Loading products...',
     'pisell2.scan.order.step.product': 'Select product',
     'pisell2.scan.order.step.check': 'Check order',
     'pisell2.scan.order.step.error': 'Unavailable',
@@ -57,6 +58,7 @@ export default {
     'pisell2.scan.order.action.select.required': '请选择',
     'pisell2.scan.order.step.init': '初始化',
     'pisell2.scan.order.loading.initializing': '正在为您准备点餐页面，请稍候...',
+    'pisell2.scan.order.loading.products': '正在获取商品中...',
     'pisell2.scan.order.step.product': '选择商品',
     'pisell2.scan.order.step.check': '订单确认',
     'pisell2.scan.order.step.error': '不可用',
@@ -105,6 +107,7 @@ export default {
     'pisell2.scan.order.action.select.required': '請選擇',
     'pisell2.scan.order.step.init': '初始化',
     'pisell2.scan.order.loading.initializing': '正在為您準備點餐頁面，請稍候...',
+    'pisell2.scan.order.loading.products': '正在獲取商品中...',
     'pisell2.scan.order.step.product': '選擇商品',
     'pisell2.scan.order.step.check': '訂單確認',
     'pisell2.scan.order.step.error': '不可用',
@@ -153,6 +156,7 @@ export default {
     'pisell2.scan.order.action.select.required': '選択してください',
     'pisell2.scan.order.step.init': '初期化',
     'pisell2.scan.order.loading.initializing': 'ご注文画面を準備しています。しばらくお待ちください。',
+    'pisell2.scan.order.loading.products': '商品を取得しています...',
     'pisell2.scan.order.step.product': '商品を選択',
     'pisell2.scan.order.step.check': '注文確認',
     'pisell2.scan.order.step.error': '利用不可',
@@ -201,6 +205,7 @@ export default {
     'pisell2.scan.order.action.select.required': 'Selecionar obrigatório',
     'pisell2.scan.order.step.init': 'Inicializar',
     'pisell2.scan.order.loading.initializing': 'Estamos preparando sua tela de pedido, aguarde...',
+    'pisell2.scan.order.loading.products': 'Carregando produtos...',
     'pisell2.scan.order.step.product': 'Selecionar produto',
     'pisell2.scan.order.step.check': 'Verificar pedido',
     'pisell2.scan.order.step.error': 'Indisponível',

package/lib/components/scanOrder/components/Content/index.js

@@ -112,6 +112,7 @@ function ReadyState() {
   });
   const [pendingFormPayload, setPendingFormPayload] = (0, import_react.useState)(null);
   const [productList, setProductList] = (0, import_react.useState)([]);
+  const [isProductListLoading, setIsProductListLoading] = (0, import_react.useState)(false);
   const productListLoadedRef = (0, import_react.useRef)(false);
   const productListPromiseRef = (0, import_react.useRef)(null);
   const ensureProductListLoaded = (0, import_react.useCallback)(async () => {
@@ -122,6 +123,7 @@ function ReadyState() {
       return;
     }
     const request = (async () => {
+      setIsProductListLoading(true);
       try {
         const res = await runModuleAction("getProductList");
         if (Array.isArray(res)) {
@@ -141,6 +143,7 @@ function ReadyState() {
       } catch (error) {
         console.warn("[scanOrder] getProductList failed", error);
       } finally {
+        setIsProductListLoading(false);
         productListPromiseRef.current = null;
       }
     })();
@@ -465,6 +468,7 @@ function ReadyState() {
       {
         onCheckout: () => goToStep("check"),
         productList,
+        isProductListLoading,
         onEnsureProductList: ensureProductListLoaded
       }
     ),

package/lib/components/scanOrder/components/Menu/index.d.ts

@@ -11,6 +11,7 @@ interface MenuProps {
      * - 首次：真发请求
      * - 后续（如从 check 返回 product）：命中缓存，直接短路，不重复发请求
      */
+    isProductListLoading: boolean;
     onEnsureProductList: () => Promise<void>;
 }
 export default function Menu(props: MenuProps): JSX.Element;

package/lib/components/scanOrder/components/Menu/index.js

@@ -41,7 +41,7 @@ var import_materials = require("@pisell/materials");
 var import_transformProductDetail = require("../../utils/transformProductDetail");
 function Menu(props) {
   var _a;
-  const { onCheckout, productList, onEnsureProductList } = props;
+  const { onCheckout, productList, isProductListLoading, onEnsureProductList } = props;
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
   const {
@@ -214,7 +214,7 @@ function Menu(props) {
     {
       dataSource: productList,
       onChange: handleSelectProduct,
-      loading: false,
+      loading: isProductListLoading,
       emptyDescription: import_utils.locales.getText(
         "pisell2.scan.order.empty.product"
       ),

package/lib/components/scanOrder/locales.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -57,6 +58,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -105,6 +107,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -153,6 +156,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;
@@ -201,6 +205,7 @@ declare const _default: {
         'pisell2.scan.order.action.select.required': string;
         'pisell2.scan.order.step.init': string;
         'pisell2.scan.order.loading.initializing': string;
+        'pisell2.scan.order.loading.products': string;
         'pisell2.scan.order.step.product': string;
         'pisell2.scan.order.step.check': string;
         'pisell2.scan.order.step.error': string;

package/lib/components/scanOrder/locales.js

@@ -33,6 +33,7 @@ var locales_default = {
     "pisell2.scan.order.action.select.required": "Select Required",
     "pisell2.scan.order.step.init": "Initialize",
     "pisell2.scan.order.loading.initializing": "Preparing your order, please wait...",
+    "pisell2.scan.order.loading.products": "Loading products...",
     "pisell2.scan.order.step.product": "Select product",
     "pisell2.scan.order.step.check": "Check order",
     "pisell2.scan.order.step.error": "Unavailable",
@@ -81,6 +82,7 @@ var locales_default = {
     "pisell2.scan.order.action.select.required": "请选择",
     "pisell2.scan.order.step.init": "初始化",
     "pisell2.scan.order.loading.initializing": "正在为您准备点餐页面，请稍候...",
+    "pisell2.scan.order.loading.products": "正在获取商品中...",
     "pisell2.scan.order.step.product": "选择商品",
     "pisell2.scan.order.step.check": "订单确认",
     "pisell2.scan.order.step.error": "不可用",
@@ -129,6 +131,7 @@ var locales_default = {
     "pisell2.scan.order.action.select.required": "請選擇",
     "pisell2.scan.order.step.init": "初始化",
     "pisell2.scan.order.loading.initializing": "正在為您準備點餐頁面，請稍候...",
+    "pisell2.scan.order.loading.products": "正在獲取商品中...",
     "pisell2.scan.order.step.product": "選擇商品",
     "pisell2.scan.order.step.check": "訂單確認",
     "pisell2.scan.order.step.error": "不可用",
@@ -177,6 +180,7 @@ var locales_default = {
     "pisell2.scan.order.action.select.required": "選択してください",
     "pisell2.scan.order.step.init": "初期化",
     "pisell2.scan.order.loading.initializing": "ご注文画面を準備しています。しばらくお待ちください。",
+    "pisell2.scan.order.loading.products": "商品を取得しています...",
     "pisell2.scan.order.step.product": "商品を選択",
     "pisell2.scan.order.step.check": "注文確認",
     "pisell2.scan.order.step.error": "利用不可",
@@ -225,6 +229,7 @@ var locales_default = {
     "pisell2.scan.order.action.select.required": "Selecionar obrigatório",
     "pisell2.scan.order.step.init": "Inicializar",
     "pisell2.scan.order.loading.initializing": "Estamos preparando sua tela de pedido, aguarde...",
+    "pisell2.scan.order.loading.products": "Carregando produtos...",
     "pisell2.scan.order.step.product": "Selecionar produto",
     "pisell2.scan.order.step.check": "Verificar pedido",
     "pisell2.scan.order.step.error": "Indisponível",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.141",
+  "version": "6.3.142",
   "scripts": {
     "dev": "father dev",
     "build": "father build",

package/es/components/appointmentBooking/components/Form/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const Form: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default Form;

package/es/components/appointmentBooking/components/Services/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const Services: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
-export default Services;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const DepositModal: (props: any) => JSX.Element;
-export default DepositModal;

package/es/components/appointmentBooking/hooks.d.ts

@@ -1,107 +0,0 @@
-export declare const useAppointmentBooking: () => any;
-export declare const useShopDiscount: () => any;
-export declare const contextUtils: () => any;
-/**
- * @title: 监听步骤发生变化
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:11
- */
-export declare const useAppointmentBookingStep: () => {
-    getStepIndex: (type: string, skipNumber?: number) => any;
-    stepList: any;
-    removeStep: (key: string) => any;
-    addStep: (props: any, stepKey?: string) => any;
-    updateStep: (key: string, step: any) => void;
-    nextStep: (isLog?: boolean) => any;
-};
-/**
- * @title: 获取商品数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:12
- */
-export declare const useAppointmentBookingProduct: () => {
-    checkProductType: (productId: number) => Promise<any>;
-    getProducts: () => Promise<any>;
-};
-/**
- * @title: 更新购物车数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:12
- */
-export declare const useAppointmentBookingCart: () => void;
-/**
- * @title: 获取登录状态
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:14
- */
-export declare const useAppointmentBookingLogin: () => {
-    isLogin: boolean;
-    openLoginModal: (params: {
-        callback: any;
-    }) => void;
-};
-/**
- * @title: 获取账户
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:15
- */
-export declare const useAppointmentBookingAccount: () => {
-    accountLists: any;
-    getHolders: () => Promise<any>;
-    form_id: any;
-    addAccount: (val: any, type?: string) => Promise<any>;
-    checkAccount: (type: any) => any;
-};
-/**
- * @title: 获取资源数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:29
- */
-export declare const useAppointmentBookingResource: () => {
-    getResourceTimeSlot: (index?: number) => Promise<void>;
-    getResourceList: () => {
-        resources: any[];
-        resourceCodes: any;
-    };
-};
-/**
- * @title: 是否跳过资源选择步骤
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-21 11:47
- */
-export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: () => Promise<boolean>;
-};
-/**
- * @title: 获取预约配置
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-24 18:15
- */
-export declare const useAppointmentBookingSetting: () => {
-    isDateSelectedFirst: boolean;
-    isFormSubject: boolean;
-    isRetailTemplate: any;
-    customPageId: any;
-    channel: any;
-    bookingSubject: any;
-    setOtherData: (key: string, val: any) => any;
-    getOtherData: (key: string) => any;
-    formName: any;
-    bookingSetting: any;
-};