@pisell/private-materials 6.3.139 → 6.3.140

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

@@ -1,6 +1,17 @@
 /// <reference types="react" />
 interface MenuProps {
     onCheckout: () => void;
+    /**
+     * 商品列表（由上层 ReadyState 持有，配合 onEnsureProductList 做幂等拉取与持久化：
+     * 切 step 回到 product 时 Menu 会 remount，但 productList 在 ReadyState 不会丢）
+     */
+    productList: any[];
+    /**
+     * 幂等触发商品列表拉取。Menu mount 时调用：
+     * - 首次：真发请求
+     * - 后续（如从 check 返回 product）：命中缓存，直接短路，不重复发请求
+     */
+    onEnsureProductList: () => Promise<void>;
 }
 export default function Menu(props: MenuProps): JSX.Element;
 export {};

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

@@ -13,17 +13,18 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import ProductSelect from "../../../../plus/productSelect";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useScanOrderContext } from "../../context";
 import { isMobile, locales } from '@pisell/utils';
-import { Modal } from 'antd';
 import { PisellScrollView } from '@pisell/materials';
 import { transformProductDetailToOrderProduct } from "../../utils/transformProductDetail";
 export default function Menu(props) {
   var _scrollRef$current;
-  var onCheckout = props.onCheckout;
+  var onCheckout = props.onCheckout,
+    productList = props.productList,
+    onEnsureProductList = props.onEnsureProductList;
   var context = useEngineContext();
   var _ref = context.appHelper || {},
     utils = _ref.utils;
@@ -36,201 +37,163 @@ export default function Menu(props) {
     dineInConfig = _useState2[0],
     setDineInConfig = _useState2[1];
   // 去读 pisellos 内的配置
-  var getConfig = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _otherParams$dineInCo;
-      var otherParams, dineInConfig;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return runModuleAction('getOtherParams');
-          case 2:
-            otherParams = _context.sent;
-            console.log('otherParams >>>>> ', otherParams);
-            dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
-            setDineInConfig(dineInConfig);
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getConfig() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  getConfig();
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    productList = _useState4[0],
-    setProductList = _useState4[1];
+  var getConfig = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _otherParams$dineInCo;
+    var otherParams, dineInConfig;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return runModuleAction('getOtherParams');
+        case 2:
+          otherParams = _context.sent;
+          console.log('otherParams >>>>> ', otherParams);
+          dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
+          setDineInConfig(dineInConfig);
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [runModuleAction]);
   useEffect(function () {
-    var fetchProductList = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var res;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return runModuleAction('getProductList');
-            case 2:
-              res = _context2.sent;
-              console.log('getProductList >>>>> ', res);
-              if (Array.isArray(res)) {
-                setProductList(res);
-              } else {
-                Modal.confirm({
-                  title: res.message,
-                  okText: String(locales.getText('pisell2.event.confirm') || 'OK'),
-                  cancelButtonProps: {
-                    style: {
-                      display: 'none'
-                    }
-                  },
-                  maskClosable: false,
-                  onOk: function onOk() {
-                    location.replace('/');
-                  }
-                });
-              }
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function fetchProductList() {
-        return _ref3.apply(this, arguments);
-      };
-    }();
-    fetchProductList();
+    getConfig();
   }, []);
+  useEffect(function () {
+    void onEnsureProductList();
+  }, [onEnsureProductList]);
   var scrollRef = useRef(null);
   var isMobileView = isMobile();
   var height = window.innerHeight - 100;
   var addOrderProduct = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var orderProduct, sourceData;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             orderProduct = params.orderProduct, sourceData = params.sourceData;
-            _context3.prev = 1;
-            _context3.next = 4;
+            _context2.prev = 1;
+            _context2.next = 4;
             return runModuleAction('addProductToOrder', orderProduct);
           case 4:
-            _context3.next = 6;
+            _context2.next = 6;
             return refreshViewModel();
           case 6:
-            _context3.next = 11;
+            _context2.next = 11;
             break;
           case 8:
-            _context3.prev = 8;
-            _context3.t0 = _context3["catch"](1);
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](1);
             console.error('[scanOrder] addProductToOrder failed', {
-              error: _context3.t0,
+              error: _context2.t0,
               sourceData: sourceData,
               mappedData: orderProduct
             });
           case 11:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, null, [[1, 8]]);
+      }, _callee2, null, [[1, 8]]);
     }));
     return function addOrderProduct(_x) {
-      return _ref4.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var removeOrderProduct = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-      var product_id, product_variant_id, sourceData;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      var product_id, product_variant_id, identity_key, sourceData;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            product_id = params.product_id, product_variant_id = params.product_variant_id, sourceData = params.sourceData;
-            _context4.prev = 1;
-            _context4.next = 4;
-            return runModuleAction('removeProductFromOrder', {
+            product_id = params.product_id, product_variant_id = params.product_variant_id, identity_key = params.identity_key, sourceData = params.sourceData;
+            _context3.prev = 1;
+            _context3.next = 4;
+            return runModuleAction('removeProductFromOrder', _objectSpread({
               product_id: product_id,
               product_variant_id: product_variant_id
-            });
+            }, identity_key ? {
+              identity_key: identity_key
+            } : {}));
           case 4:
-            _context4.next = 6;
+            _context3.next = 6;
             return refreshViewModel();
           case 6:
-            _context4.next = 11;
+            _context3.next = 11;
             break;
           case 8:
-            _context4.prev = 8;
-            _context4.t0 = _context4["catch"](1);
+            _context3.prev = 8;
+            _context3.t0 = _context3["catch"](1);
             console.error('[scanOrder] removeProductFromOrder failed', {
-              error: _context4.t0,
+              error: _context3.t0,
               sourceData: sourceData,
               product_id: product_id,
-              product_variant_id: product_variant_id
+              product_variant_id: product_variant_id,
+              identity_key: identity_key
             });
           case 11:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4, null, [[1, 8]]);
+      }, _callee3, null, [[1, 8]]);
     }));
     return function removeOrderProduct(_x2) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var updateOrderProduct = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-      var product_id, product_variant_id, updates, sourceData;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+      var product_id, product_variant_id, identity_key, updates, sourceData;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, sourceData = params.sourceData;
-            _context5.prev = 1;
-            _context5.next = 4;
-            return runModuleAction('updateProductInOrder', {
+            product_id = params.product_id, product_variant_id = params.product_variant_id, identity_key = params.identity_key, updates = params.updates, sourceData = params.sourceData;
+            _context4.prev = 1;
+            _context4.next = 4;
+            return runModuleAction('updateProductInOrder', _objectSpread(_objectSpread({
               product_id: product_id,
-              product_variant_id: product_variant_id,
+              product_variant_id: product_variant_id
+            }, identity_key ? {
+              identity_key: identity_key
+            } : {}), {}, {
               updates: updates
-            });
+            }));
           case 4:
-            _context5.next = 6;
+            _context4.next = 6;
             return refreshViewModel();
           case 6:
-            _context5.next = 11;
+            _context4.next = 11;
             break;
           case 8:
-            _context5.prev = 8;
-            _context5.t0 = _context5["catch"](1);
+            _context4.prev = 8;
+            _context4.t0 = _context4["catch"](1);
             console.error('[scanOrder] updateProductInOrder failed', {
-              error: _context5.t0,
+              error: _context4.t0,
               sourceData: sourceData,
               product_id: product_id,
               product_variant_id: product_variant_id,
+              identity_key: identity_key,
               updates: updates
             });
           case 11:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
-      }, _callee5, null, [[1, 8]]);
+      }, _callee4, null, [[1, 8]]);
     }));
     return function updateOrderProduct(_x3) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var handleSelectProduct = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(item, clickType, meta) {
-      var sourceItem, _item$option, _item$bundle, _item$price, _item$product_id, _ref8, _meta$quantity, _orderProduct$product, _orderProduct$product4, quantityData, orderProduct, nextQuantity, productVariantId, normalizedQuantity, _orderProduct$product2, cartItems, existedCartItem;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(item, clickType, meta) {
+      var sourceItem, _item$option, _item$bundle, _item$price, _item$product_id, _ref7, _meta$quantity, _orderProduct$product, _orderProduct$product4, quantityData, orderProduct, nextQuantity, productVariantId, normalizedQuantity, cartItems, existedCartItem, existedIdentityKey, _orderProduct$product3;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             console.log(item, clickType, meta);
             sourceItem = (meta === null || meta === void 0 ? void 0 : meta.product) || item;
             if (!((meta === null || meta === void 0 ? void 0 : meta.intent) === 'quantity')) {
-              _context7.next = 28;
+              _context6.next = 29;
               break;
             }
             quantityData = _objectSpread(_objectSpread({}, item), {}, {
@@ -246,71 +209,75 @@ export default function Menu(props) {
               sourceItem: sourceItem
             });
             if (orderProduct) {
-              _context7.next = 8;
+              _context6.next = 8;
               break;
             }
             console.warn('[scanOrder] quantity add missing product_id', quantityData);
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
           case 8:
-            nextQuantity = Number((_ref8 = (_meta$quantity = meta === null || meta === void 0 ? void 0 : meta.quantity) !== null && _meta$quantity !== void 0 ? _meta$quantity : quantityData === null || quantityData === void 0 ? void 0 : quantityData.quantity) !== null && _ref8 !== void 0 ? _ref8 : 0);
+            nextQuantity = Number((_ref7 = (_meta$quantity = meta === null || meta === void 0 ? void 0 : meta.quantity) !== null && _meta$quantity !== void 0 ? _meta$quantity : quantityData === null || quantityData === void 0 ? void 0 : quantityData.quantity) !== null && _ref7 !== void 0 ? _ref7 : 0);
             productVariantId = Number((_orderProduct$product = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_variant_id) !== null && _orderProduct$product !== void 0 ? _orderProduct$product : 0);
             if (!Number.isNaN(productVariantId)) {
-              _context7.next = 13;
+              _context6.next = 13;
               break;
             }
             console.warn('[scanOrder] quantity action missing product_variant_id', {
               quantityData: quantityData,
               orderProduct: orderProduct
             });
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
           case 13:
             normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
+            cartItems = Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : []; // 不透明 identity 契约：同 SKU 多行场景下，必须直接从已存在的 cartItem 上取 identity_key，
+            // 否则 update / remove 容易误命中其它选项相同的行。
+            existedCartItem = cartItems.find(function (cartItem) {
+              var _cartItem$product_id, _orderProduct$product2, _cartItem$product_var;
+              return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
+            });
+            existedIdentityKey = typeof (existedCartItem === null || existedCartItem === void 0 ? void 0 : existedCartItem.identity_key) === 'string' && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : undefined;
             if (!(normalizedQuantity <= 0)) {
-              _context7.next = 18;
+              _context6.next = 21;
               break;
             }
-            _context7.next = 17;
+            _context6.next = 20;
             return removeOrderProduct({
-              product_id: (_orderProduct$product2 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product2 !== void 0 ? _orderProduct$product2 : null,
+              product_id: (_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null,
               product_variant_id: productVariantId,
+              identity_key: existedIdentityKey,
               sourceData: quantityData
             });
-          case 17:
-            return _context7.abrupt("return");
-          case 18:
-            cartItems = Array.isArray(viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
-            existedCartItem = cartItems.find(function (cartItem) {
-              var _cartItem$product_id, _orderProduct$product3, _cartItem$product_var;
-              return String((_cartItem$product_id = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_id) !== null && _cartItem$product_id !== void 0 ? _cartItem$product_id : null) === String((_orderProduct$product3 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product3 !== void 0 ? _orderProduct$product3 : null) && Number((_cartItem$product_var = cartItem === null || cartItem === void 0 ? void 0 : cartItem.product_variant_id) !== null && _cartItem$product_var !== void 0 ? _cartItem$product_var : 0) === productVariantId;
-            });
+          case 20:
+            return _context6.abrupt("return");
+          case 21:
             if (existedCartItem) {
-              _context7.next = 24;
+              _context6.next = 25;
               break;
             }
-            _context7.next = 23;
+            _context6.next = 24;
             return addOrderProduct({
               orderProduct: _objectSpread(_objectSpread({}, orderProduct), {}, {
                 num: normalizedQuantity
               }),
               sourceData: quantityData
             });
-          case 23:
-            return _context7.abrupt("return");
           case 24:
-            _context7.next = 26;
+            return _context6.abrupt("return");
+          case 25:
+            _context6.next = 27;
             return updateOrderProduct({
               product_id: (_orderProduct$product4 = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.product_id) !== null && _orderProduct$product4 !== void 0 ? _orderProduct$product4 : null,
               product_variant_id: productVariantId,
+              identity_key: existedIdentityKey,
               updates: {
                 num: normalizedQuantity,
                 _origin: orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct._origin
               },
               sourceData: quantityData
             });
-          case 26:
-            _context7.next = 29;
+          case 27:
+            _context6.next = 30;
             break;
-          case 28:
+          case 29:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
               data: {
@@ -320,21 +287,21 @@ export default function Menu(props) {
                 setting: {
                   can_input: true,
                   item_max_length: 1,
-                  is_detail_open: true
+                  is_detail_open: false
                 }
               },
               callback: function () {
-                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data) {
+                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
                   var _item$product_id2;
                   var orderProduct;
-                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                    while (1) switch (_context6.prev = _context6.next) {
+                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                    while (1) switch (_context5.prev = _context5.next) {
                       case 0:
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context6.next = 2;
+                          _context5.next = 2;
                           break;
                         }
-                        return _context6.abrupt("return");
+                        return _context5.abrupt("return");
                       case 2:
                         orderProduct = transformProductDetailToOrderProduct({
                           payload: data,
@@ -342,22 +309,22 @@ export default function Menu(props) {
                           sourceItem: sourceItem
                         });
                         if (orderProduct) {
-                          _context6.next = 6;
+                          _context5.next = 6;
                           break;
                         }
                         console.warn('[scanOrder] productDetail callback missing product_id', data);
-                        return _context6.abrupt("return");
+                        return _context5.abrupt("return");
                       case 6:
-                        _context6.next = 8;
+                        _context5.next = 8;
                         return addOrderProduct({
                           orderProduct: orderProduct,
                           sourceData: data
                         });
                       case 8:
                       case "end":
-                        return _context6.stop();
+                        return _context5.stop();
                     }
-                  }, _callee6);
+                  }, _callee5);
                 }));
                 function callback(_x7) {
                   return _callback.apply(this, arguments);
@@ -365,14 +332,14 @@ export default function Menu(props) {
                 return callback;
               }()
             });
-          case 29:
+          case 30:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
-      }, _callee7);
+      }, _callee6);
     }));
     return function handleSelectProduct(_x4, _x5, _x6) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var productSelectNode = /*#__PURE__*/React.createElement(ProductSelect, {
@@ -407,11 +374,15 @@ export default function Menu(props) {
     },
     cartElementId: "#scan-order-v2-cart-btn"
   });
-  if (isMobileView) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-scan-menu pisell-scan-menu-mobile"
-    }, productSelectNode);
-  }
+
+  // if (isMobileView) {
+  //   return (
+  //     <div className="pisell-scan-menu pisell-scan-menu-mobile" ref={scrollRef}>
+  //       {productSelectNode}
+  //     </div>
+  //   );
+  // }
+
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-menu"
   }, /*#__PURE__*/React.createElement(PisellScrollView, {

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import '../../../booking/components/voucher/index.less';
+import '../../../appointmentBooking/components/Voucher/index.less';
+/**
+ * VoucherCard -- 优惠券/Promotion 区块
+ * 嵌入购物车底部，提供券列表展示、勾选、扫码兑码、未登录引导等能力
+ */
+export default function VoucherCard(): JSX.Element;