@pisell/pisellos 0.10.43 → 0.10.44

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;

package/dist/solution/BookingTicket/index.js

@@ -180,6 +180,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "addTimeProductsCatalog", []);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshCustomerId", null);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshTarget", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerPromotionRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlightTarget", null);
@@ -1884,15 +1885,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "refreshDiscountConfigAfterOrderCustomerChange",
     value: function refreshDiscountConfigAfterOrderCustomerChange(customerId) {
-      var _this5 = this;
+      var _this$store$order$get4,
+        _this$store$order6,
+        _this$getOrderIdentit,
+        _this5 = this;
       if (!customerId || customerId === 1) return Promise.resolve();
-      if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+      var tempOrder = (_this$store$order$get4 = (_this$store$order6 = this.store.order).getTempOrder) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.call(_this$store$order6);
+      var orderIdentity = (_this$getOrderIdentit = this.getOrderIdentity) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.call(this);
+      var orderId = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.orderId);
+      var action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+      var orderTarget = orderId ? "order:".concat(String(orderId)) : "external:".concat(String((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.externalSaleNumber) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.localId) || 'new'));
+      var refreshTarget = "".concat(customerId, ":").concat(action, ":").concat(orderTarget);
+      if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshTarget === refreshTarget) {
         return this.orderCustomerDiscountRefreshInFlight;
       }
       var previousRefresh = this.orderCustomerDiscountRefreshInFlight;
       var refreshTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var _this5$store$order$ge, _this5$store$order, _this5$getOrderIdenti;
-        var currentCustomer, tempOrder, orderId, action;
+        var currentCustomer, currentTempOrder, currentOrderIdentity, currentOrderId, currentAction, currentOrderTarget;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1912,15 +1922,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               return _context25.abrupt("return");
             case 6:
-              tempOrder = (_this5$store$order$ge = (_this5$store$order = _this5.store.order).getTempOrder) === null || _this5$store$order$ge === void 0 ? void 0 : _this5$store$order$ge.call(_this5$store$order);
-              orderId = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || ((_this5$getOrderIdenti = _this5.getOrderIdentity) === null || _this5$getOrderIdenti === void 0 || (_this5$getOrderIdenti = _this5$getOrderIdenti.call(_this5)) === null || _this5$getOrderIdenti === void 0 ? void 0 : _this5$getOrderIdenti.orderId);
-              action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
-              _context25.next = 11;
+              currentTempOrder = (_this5$store$order$ge = (_this5$store$order = _this5.store.order).getTempOrder) === null || _this5$store$order$ge === void 0 ? void 0 : _this5$store$order$ge.call(_this5$store$order);
+              currentOrderIdentity = (_this5$getOrderIdenti = _this5.getOrderIdentity) === null || _this5$getOrderIdenti === void 0 ? void 0 : _this5$getOrderIdenti.call(_this5);
+              currentOrderId = (currentTempOrder === null || currentTempOrder === void 0 ? void 0 : currentTempOrder.order_id) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.orderId);
+              currentAction = !currentOrderId || String(currentOrderId).startsWith('local_order') ? 'create' : 'edit';
+              currentOrderTarget = currentOrderId ? "order:".concat(String(currentOrderId)) : "external:".concat(String((currentTempOrder === null || currentTempOrder === void 0 ? void 0 : currentTempOrder.external_sale_number) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.externalSaleNumber) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.localId) || 'new'));
+              if (!("".concat(customerId, ":").concat(currentAction, ":").concat(currentOrderTarget) !== refreshTarget)) {
+                _context25.next = 13;
+                break;
+              }
+              return _context25.abrupt("return");
+            case 13:
+              _context25.next = 15;
               return _this5.loadDiscountConfig({
                 customerId: customerId,
-                action: action
+                action: action,
+                force: true
               });
-            case 11:
+            case 15:
             case "end":
               return _context25.stop();
           }
@@ -1928,12 +1947,14 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }))();
       this.orderCustomerDiscountRefreshInFlight = refreshTask;
       this.orderCustomerDiscountRefreshCustomerId = customerId;
+      this.orderCustomerDiscountRefreshTarget = refreshTarget;
       refreshTask.catch(function (error) {
         console.error('Failed to load discount config after customer change:', error);
       }).finally(function () {
         if (_this5.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
         _this5.orderCustomerDiscountRefreshInFlight = null;
         _this5.orderCustomerDiscountRefreshCustomerId = null;
+        _this5.orderCustomerDiscountRefreshTarget = null;
       });
       return refreshTask;
     }
@@ -2497,10 +2518,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get5, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
+      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get5 = this.store.order.getTempOrder()) === null || _this$store$order$get5 === void 0 ? void 0 : _this$store$order$get5.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
       return _objectSpread(_objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2996,7 +3017,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handlePrintWristband",
     value: function () {
       var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this$getOrderIdentit;
+        var _this$getOrderIdentit2;
         var deviceTask, deviceId, idempotencyKey;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -3033,7 +3054,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 payload: {
                   type: 'WRISTBAND',
                   data: {
-                    order_id: (_this$getOrderIdentit = this.getOrderIdentity()) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId,
+                    order_id: (_this$getOrderIdentit2 = this.getOrderIdentity()) === null || _this$getOrderIdentit2 === void 0 ? void 0 : _this$getOrderIdentit2.orderId,
                     voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
                   }
                 },
@@ -3058,7 +3079,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleRedeem",
     value: function () {
       var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-        var _this$store$order6, _this$store$order6$ge, _this$store$order7, _ref20, _tempOrder$order_id2;
+        var _this$store$order7, _this$store$order7$ge, _this$store$order8, _ref20, _tempOrder$order_id2;
         var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
@@ -3074,8 +3095,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 }
               });
               voucherIdSet = new Set(voucherIds);
-              tempOrder = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$ge = _this$store$order6.getTempOrder) === null || _this$store$order6$ge === void 0 ? void 0 : _this$store$order6$ge.call(_this$store$order6);
-              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getVouchers()) || [];
+              tempOrder = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getTempOrder) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getVouchers()) || [];
               hasUpdatedVoucher = false;
               nextVouchers = vouchers.map(function (voucher) {
                 if (!voucherIdSet.has(voucher.voucher_id)) return voucher;

package/dist/solution/BookingTicket/utils/orderCustomer.js

@@ -18,8 +18,9 @@ function resolveCustomerDisplayName(customer) {
 
 /** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 export function formatOrderCustomerPatch(customer) {
-  var _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
-  var rawId = customer.id;
+  var _ref, _c$customer_id, _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
+  var c = customer;
+  var rawId = (_ref = (_c$customer_id = c.customer_id) !== null && _c$customer_id !== void 0 ? _c$customer_id : c.customerId) !== null && _ref !== void 0 ? _ref : customer.id;
   var numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
   return {
     customer_id: Number.isFinite(numericId) ? numericId : null,

package/dist/solution/RegisterAndLogin/config.d.ts

@@ -10,7 +10,11 @@ export interface ApiConfig {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     transformParams?: (params: any) => any;
     transformResponse?: (response: any) => any;
-    options?: Record<string, any>;
+    options?: Record<string, any> | ((params: any) => Record<string, any>);
+}
+export interface ApiCallerOptions {
+    baseUrl?: string;
+    shopDomain?: string;
 }
 /**
  * 渠道配置接口
@@ -65,12 +69,14 @@ export declare function getChannelConfig(channel: string): ChannelConfig;
 export declare class ApiCaller {
     private request;
     private config;
+    private options;
     constructor(request: {
         get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         delete: <T = any>(url: string, options?: any) => Promise<T>;
-    }, config: ChannelConfig);
+    }, config: ChannelConfig, options?: ApiCallerOptions);
+    private resolveUrl;
     /**
      * 执行 API 调用
      */
@@ -84,4 +90,4 @@ export declare function createApiCaller(request: {
     post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     delete: <T = any>(url: string, options?: any) => Promise<T>;
-}, channel: string): ApiCaller;
+}, channel: string, options?: ApiCallerOptions): ApiCaller;

package/dist/solution/RegisterAndLogin/config.js

@@ -1,15 +1,24 @@
 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); }
+var _excluded = ["withCredentials"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-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 _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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 _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 _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); }
+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; }
 /**
  * 注册登录解决方案配置
  * 根据不同渠道配置不同的接口地址和参数
@@ -19,6 +28,8 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * API 配置接口
  */
 
+var h5CustomerAuthApiNames = new Set(['sendEmailVerificationCode', 'sendEmailLoginCode', 'sendSmsRegisterCode', 'sendEmailRegisterLink', 'verifyEmailRegistrationLink', 'emailPasswordLogin', 'emailCodeRegister', 'phoneCodeRegister', 'resendEmailRegisterLink', 'checkEmailLinkCode', 'sendSmsLoginCode', 'phoneCodeLogin', 'guestLogin', 'checkEmailExists', 'checkEmailCode', 'checkMobileCode', 'phonePasswordLogin', 'sendPasswordResetEmail', 'sendPasswordResetSms', 'sendResetPasswordLink', 'checkResetPasswordCode', 'resetPasswordByCode', 'resetPasswordByEmail', 'resetPasswordByPhone', 'verifyCode', 'register', 'login', 'oauthLogin', 'facebookLogin', 'appleLogin']);
+
 /**
  * 渠道配置接口
  */
@@ -350,6 +361,31 @@ var onlineStoreConfig = {
     }
   }
 };
+function withH5AuthPrefix(config) {
+  var nextConfig = {};
+  Object.entries(config).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      apiConfig = _ref2[1];
+    if (!apiConfig.url.startsWith('/auth/')) {
+      nextConfig[key] = apiConfig;
+      return;
+    }
+    nextConfig[key] = _objectSpread(_objectSpread({}, apiConfig), {}, {
+      url: apiConfig.url.startsWith('/h5/') ? apiConfig.url : "/h5".concat(apiConfig.url),
+      options: function options(params) {
+        var _ref3 = (typeof apiConfig.options === 'function' ? apiConfig.options(params) : apiConfig.options) || {},
+          withCredentials = _ref3.withCredentials,
+          baseOptions = _objectWithoutProperties(_ref3, _excluded);
+        return _objectSpread(_objectSpread({}, baseOptions), {}, {
+          prefix: false
+        });
+      }
+    });
+  });
+  return nextConfig;
+}
+var h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
 
 /**
  * 默认配置（通用配置）
@@ -1346,6 +1382,7 @@ var shopWebposConfig = {
  */
 export var channelConfigMap = {
   'online-store': onlineStoreConfig,
+  'online-store-h5': h5OnlineStoreConfig,
   'default': defaultConfig,
   'webpos': webposConfig,
   'shop.webpos': shopWebposConfig
@@ -1364,15 +1401,25 @@ export function getChannelConfig(channel) {
  */
 export var ApiCaller = /*#__PURE__*/function () {
   function ApiCaller(request, config) {
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     _classCallCheck(this, ApiCaller);
     this.request = request;
     this.config = config;
+    this.options = options;
   }
-
-  /**
-   * 执行 API 调用
-   */
   _createClass(ApiCaller, [{
+    key: "resolveUrl",
+    value: function resolveUrl(url) {
+      if (!this.options.baseUrl || !url.startsWith('/h5/auth/')) {
+        return url;
+      }
+      return "".concat(this.options.baseUrl.replace(/\/$/, '')).concat(url);
+    }
+
+    /**
+     * 执行 API 调用
+     */
+  }, {
     key: "call",
     value: (function () {
       var _call = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(apiName, params, additionalOptions) {
@@ -1397,7 +1444,15 @@ export var ApiCaller = /*#__PURE__*/function () {
               }
 
               // 构建请求选项
-              requestOptions = _objectSpread(_objectSpread({}, options), additionalOptions); // 处理动态 headers
+              requestOptions = _objectSpread(_objectSpread({}, options), additionalOptions);
+              if (apiConfig.url.startsWith('/h5/auth/') && h5CustomerAuthApiNames.has(apiName)) {
+                requestOptions.h5CustomerAuth = true;
+                if (this.options.shopDomain) {
+                  requestOptions.h5AuthShopDomain = this.options.shopDomain;
+                }
+              }
+
+              // 处理动态 headers
               if (requestOptions.headers && typeof requestOptions.headers === 'function') {
                 requestOptions.headers = requestOptions.headers(params);
               }
@@ -1405,49 +1460,49 @@ export var ApiCaller = /*#__PURE__*/function () {
 
               // 根据 HTTP 方法调用对应的请求方法
               _context.t0 = apiConfig.method;
-              _context.next = _context.t0 === 'GET' ? 12 : _context.t0 === 'POST' ? 22 : _context.t0 === 'PUT' ? 26 : _context.t0 === 'DELETE' ? 30 : 34;
+              _context.next = _context.t0 === 'GET' ? 13 : _context.t0 === 'POST' ? 23 : _context.t0 === 'PUT' ? 27 : _context.t0 === 'DELETE' ? 31 : 35;
               break;
-            case 12:
+            case 13:
               if (!(transformedParams && Object.keys(transformedParams).length > 0)) {
-                _context.next = 18;
+                _context.next = 19;
                 break;
               }
-              _context.next = 15;
-              return this.request.get(apiConfig.url, transformedParams, requestOptions);
-            case 15:
+              _context.next = 16;
+              return this.request.get(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
+            case 16:
               response = _context.sent;
-              _context.next = 21;
+              _context.next = 22;
               break;
-            case 18:
-              _context.next = 20;
-              return this.request.get(apiConfig.url, undefined, requestOptions);
-            case 20:
-              response = _context.sent;
+            case 19:
+              _context.next = 21;
+              return this.request.get(this.resolveUrl(apiConfig.url), undefined, requestOptions);
             case 21:
-              return _context.abrupt("break", 35);
+              response = _context.sent;
             case 22:
-              _context.next = 24;
-              return this.request.post(apiConfig.url, transformedParams, requestOptions);
-            case 24:
+              return _context.abrupt("break", 36);
+            case 23:
+              _context.next = 25;
+              return this.request.post(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
+            case 25:
               response = _context.sent;
-              return _context.abrupt("break", 35);
-            case 26:
-              _context.next = 28;
-              return this.request.put(apiConfig.url, transformedParams, requestOptions);
-            case 28:
+              return _context.abrupt("break", 36);
+            case 27:
+              _context.next = 29;
+              return this.request.put(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
+            case 29:
               response = _context.sent;
-              return _context.abrupt("break", 35);
-            case 30:
-              _context.next = 32;
-              return this.request.delete(apiConfig.url, requestOptions);
-            case 32:
+              return _context.abrupt("break", 36);
+            case 31:
+              _context.next = 33;
+              return this.request.delete(this.resolveUrl(apiConfig.url), requestOptions);
+            case 33:
               response = _context.sent;
-              return _context.abrupt("break", 35);
-            case 34:
-              throw new Error("\u4E0D\u652F\u6301\u7684 HTTP \u65B9\u6CD5: ".concat(apiConfig.method));
+              return _context.abrupt("break", 36);
             case 35:
-              return _context.abrupt("return", apiConfig.transformResponse ? apiConfig.transformResponse(response) : response);
+              throw new Error("\u4E0D\u652F\u6301\u7684 HTTP \u65B9\u6CD5: ".concat(apiConfig.method));
             case 36:
+              return _context.abrupt("return", apiConfig.transformResponse ? apiConfig.transformResponse(response) : response);
+            case 37:
             case "end":
               return _context.stop();
           }
@@ -1465,7 +1520,7 @@ export var ApiCaller = /*#__PURE__*/function () {
 /**
  * 创建 API 调用器
  */
-export function createApiCaller(request, channel) {
+export function createApiCaller(request, channel, options) {
   var config = getChannelConfig(channel);
-  return new ApiCaller(request, config);
+  return new ApiCaller(request, config, options);
 }

package/dist/solution/RegisterAndLogin/index.js

@@ -323,7 +323,10 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('RegisterAndLogin 模块需要 window 插件支持');
             case 10:
               // 创建 API 调用器
-              this.apiCaller = createApiCaller(this.request, this.channel);
+              this.apiCaller = createApiCaller(this.request, this.channel, {
+                baseUrl: this.otherParams.h5AuthBaseUrl,
+                shopDomain: this.otherParams.h5AuthShopDomain
+              });
 
               // 尝试从本地存储恢复登录状态
               _context4.next = 13;

package/dist/solution/ScanOrder/index.d.ts

@@ -13,6 +13,7 @@ interface ScanOrderItemRuleRuntimeConfig {
     pax?: Partial<PaxInfo>;
     historicalItems?: CartItemSummary[];
     serviceType?: string;
+    channel?: string;
     submissionIndex?: number;
     custom?: Record<string, any>;
 }