@pisell/pisellos 2.2.282 → 2.2.284

package/lib/modules/Step/index.js

@@ -1,37 +1,21 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Step/index.ts
-var Step_exports = {};
-__export(Step_exports, {
-  StepModule: () => StepModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Step_exports);
-var import_BaseModule = require("../BaseModule");
-var StepModule = class extends import_BaseModule.BaseModule {
+exports.StepModule = void 0;
+var _BaseModule = require("../BaseModule");
+class StepModule extends _BaseModule.BaseModule {
+  defaultName = 'step';
+  defaultVersion = '1.0.0';
+  store;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "step";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   async initialize(core, options) {
-    var _a, _b;
     this.core = core;
     this.store = options.store;
     if (options.initialState) {
@@ -39,11 +23,11 @@ var StepModule = class extends import_BaseModule.BaseModule {
       this.store.currentStep = options.initialState.currentStep;
       this.store.currentStepIndex = options.initialState.currentStepIndex;
     }
-    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+    if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+    if (options.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
@@ -55,8 +39,7 @@ var StepModule = class extends import_BaseModule.BaseModule {
     this.store.stepList = stepList;
   }
   setCurrentStep(stepIndex) {
-    var _a;
-    if (stepIndex < 0 || stepIndex >= ((_a = this.store.stepList) == null ? void 0 : _a.length)) {
+    if (stepIndex < 0 || stepIndex >= this.store.stepList?.length) {
       return;
     }
     this.store.currentStepIndex = stepIndex;
@@ -71,32 +54,35 @@ var StepModule = class extends import_BaseModule.BaseModule {
   getCurrentStepIndex() {
     return this.store.currentStepIndex;
   }
+
   /**
    * 上一个步骤
    */
   prevStep() {
-    var _a;
+    // 如果上一个步骤是跳过，则继续往前找，直到找到一个不是跳过的步骤
     let prevStepIndex = this.store.currentStepIndex - 1;
-    while ((_a = this.store.stepList[prevStepIndex]) == null ? void 0 : _a.isSkip) {
+    while (this.store.stepList[prevStepIndex]?.isSkip) {
       prevStepIndex--;
     }
     if (prevStepIndex >= 0) {
       this.setCurrentStep(prevStepIndex);
     }
   }
+
   /**
    * 下一个步骤
    */
   nextStep() {
-    var _a;
+    // 如果下一个步骤是跳过，则继续往后找，直到找到一个不是跳过的步骤
     let nextStepIndex = this.store.currentStepIndex + 1;
-    while ((_a = this.store.stepList[nextStepIndex]) == null ? void 0 : _a.isSkip) {
+    while (this.store.stepList[nextStepIndex]?.isSkip) {
       nextStepIndex++;
     }
     if (nextStepIndex < this.store.stepList.length) {
       this.setCurrentStep(nextStepIndex);
     }
   }
+
   /**
    * 跳转到指定步骤
    * @param stepIndex 步骤的 index
@@ -104,6 +90,7 @@ var StepModule = class extends import_BaseModule.BaseModule {
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
+
   /**
    * 添加步骤
    * @param step 步骤
@@ -111,15 +98,16 @@ var StepModule = class extends import_BaseModule.BaseModule {
    */
   addStep(step, key) {
     let stepList = this.store.stepList;
-    const index = stepList.findIndex((n) => n.key === step.key);
+
+    // 前置检测step在stepList中是否存在
+    const index = stepList.findIndex(n => n.key === step.key);
     if (index !== -1) {
-      console.log("[StepModule] 步骤已存在，添加失败");
       return;
     }
     if (key) {
-      const index2 = this.store.stepList.findIndex((n) => n.key === key);
-      if (index2 !== -1) {
-        stepList.splice(index2 + 1, 0, step);
+      const index = this.store.stepList.findIndex(n => n.key === key);
+      if (index !== -1) {
+        stepList.splice(index + 1, 0, step);
       } else {
         stepList = [...stepList, step];
       }
@@ -128,31 +116,34 @@ var StepModule = class extends import_BaseModule.BaseModule {
     }
     this.store.stepList = [...stepList];
   }
+
   /**
    * 删除步骤
    * @param key 步骤的 key
    */
   removeStep(key) {
-    const newStepList = this.store.stepList.filter((n) => n.key !== key);
+    const newStepList = this.store.stepList.filter(n => n.key !== key);
     this.store.stepList = [...newStepList];
   }
+
   /**
    * 更新步骤
    * @param key 步骤的 key
    * @param step 步骤
    */
   updateStep(key, step) {
-    var _a, _b;
-    const newStepList = (_a = this.store.stepList) == null ? void 0 : _a.map((n) => {
+    const newStepList = this.store.stepList?.map(n => {
       if (n.key === key) {
         return step;
       }
       return n;
     });
-    if (key === ((_b = this.store.currentStep) == null ? void 0 : _b.key)) {
+
+    // 如果更新的是当前步骤，则更新当前步骤
+    if (key === this.store.currentStep?.key) {
       this.store.currentStep = step;
     }
-    this.store.stepList = [...newStepList || []];
+    this.store.stepList = [...(newStepList || [])];
   }
   storeChange() {
     if (this.openCache) {
@@ -160,12 +151,9 @@ var StepModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store: this.store,
-        cacheKey: ["currentStepIndex", "currentStep", "stepList"]
+        cacheKey: ['currentStepIndex', 'currentStep', 'stepList']
       });
     }
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  StepModule
-});
+}
+exports.StepModule = StepModule;

package/lib/modules/Step/tyeps.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Step/tyeps.ts
-var tyeps_exports = {};
-module.exports = __toCommonJS(tyeps_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/Summary/index.js

@@ -1,94 +1,73 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Summary/index.ts
-var Summary_exports = {};
-__export(Summary_exports, {
-  SummaryModule: () => SummaryModule
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(Summary_exports);
-var import_decimal = __toESM(require("decimal.js"));
-var import_BaseModule = require("../BaseModule");
-var import_Schedule = require("../Schedule");
-var import_utils = require("./utils");
-var SummaryModule = class extends import_BaseModule.BaseModule {
+exports.SummaryModule = void 0;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _BaseModule = require("../BaseModule");
+var _Schedule = require("../Schedule");
+var _utils = require("./utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+class SummaryModule extends _BaseModule.BaseModule {
+  defaultName = 'summary';
+  defaultVersion = '1.0.0';
+  shopStore;
+  store;
+  request;
+  cacheId;
+  openCache = false;
+  fatherModule;
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "summary";
-    this.defaultVersion = "1.0.0";
-    this.openCache = false;
   }
   async initialize(core, options) {
-    var _a, _b;
     this.core = core;
     this.store = options.store;
-    this.shopStore = this.core.getPlugin("shopStore");
-    this.request = this.core.getPlugin("request");
+    this.shopStore = this.core.getPlugin('shopStore');
+    this.request = this.core.getPlugin('request');
     if (options.initialState) {
       this.store.summary = options.initialState.summary;
     }
-    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+    if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+    if (options.otherParams?.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
     if (!this.shopStore) {
-      throw new Error("SummaryModule 需要 shopStore 插件支持");
+      throw new Error('SummaryModule 需要 shopStore 插件支持');
     }
+
+    // 加载当前店铺附加费
     this.getSurchargeList();
   }
   async getSurchargeList() {
-    const surchargeList = await this.request.get("/order/custom-surcharge/available/v2", {
-      channel: "online-store",
+    const surchargeList = await this.request.get('/order/custom-surcharge/available/v2', {
+      channel: 'online-store',
       is_assemble_product_data: 1,
       is_assemble_schedule_data: 1,
-      with: ["relationSchedule"]
+      with: ['relationSchedule']
     });
-    this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+    this.store.surchargeList = surchargeList?.data || [];
   }
   async getSummary(cartItems) {
-    var _a, _b, _c, _d;
-    const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
-    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = (_c = this.store.surchargeList) == null ? void 0 : _c.map((item) => item.available_schedule_ids).flat();
-    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    const shopInfo = this.shopStore.get('core')?.core?.shop || {};
+    const scheduleModule = this.core.getModule('appointmentBooking_schedule');
+    const needScheduleIds = this.store.surchargeList?.map(item => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule?.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
       for (let item of scheduleList) {
         scheduleById[item.id] = item;
       }
     }
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_d = import_Schedule.ScheduleModule) == null ? void 0 : _d.isInScheduleByDate, this.store.surchargeList, scheduleById);
+    const summary = (0, _utils.calculatePriceDetails)(shopInfo, cartItems, _Schedule.ScheduleModule?.isInScheduleByDate, this.store.surchargeList, scheduleById);
     this.store.summary = summary;
     return this.store.summary;
   }
+
   /**
    * 获取协议
    * @param protocolId 协议ID
@@ -103,41 +82,57 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store: this.store,
-        cacheKey: ["summary"]
+        cacheKey: ['summary']
       });
     }
   }
   getTaxforUtils(items, shopInfo, subtotal) {
-    return (0, import_utils.getTax)({ service: items, bookingDetail: null, bookingId: void 0 }, {
+    return (0, _utils.getTax)({
+      service: items,
+      bookingDetail: null,
+      bookingId: undefined
+    }, {
       computed: {
         productExpectAmount: subtotal,
         shopDiscount: 0
       },
       isEdit: false,
-      tax_rate: shopInfo == null ? void 0 : shopInfo.tax_rate,
-      is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
+      tax_rate: shopInfo?.tax_rate,
+      is_price_include_tax: shopInfo?.is_price_include_tax
     });
   }
   getSurchargeforUtils(items) {
-    var _a;
-    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids).flat();
-    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
+    // const surchargeList = this.store.surchargeList;
+    const scheduleModule = this.core.getModule('appointmentBooking_schedule');
+    const needScheduleIds = this.store.surchargeList?.map(item => item.available_schedule_ids).flat();
+    const scheduleList = scheduleModule?.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
       for (let item of scheduleList) {
         scheduleById[item.id] = item;
       }
     }
-    const surchargeList = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: this.store.surchargeList, scheduleById });
-    const surchargeAmount = new import_decimal.default((0, import_utils.getSurchargeAmount)({ bookingDetail: null, bookingId: void 0 }, surchargeList, { isEdit: false }));
+    const surchargeList = (0, _utils.getSurcharge)({
+      service: items,
+      addons: [],
+      bookingDetail: null,
+      bookingId: undefined
+    }, {
+      isEdit: false,
+      isInScheduleByDate: _Schedule.ScheduleModule.isInScheduleByDate,
+      surcharge_list: this.store.surchargeList,
+      scheduleById
+    });
+    const surchargeAmount = new _decimal.default((0, _utils.getSurchargeAmount)({
+      bookingDetail: null,
+      bookingId: undefined
+    }, surchargeList, {
+      isEdit: false
+    }));
     return {
       surchargeList,
       surchargeAmount: surchargeAmount.toFixed(2)
     };
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SummaryModule
-});
+}
+exports.SummaryModule = SummaryModule;

package/lib/modules/Summary/types.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Summary/types.ts
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/Summary/utils.d.ts

@@ -72,7 +72,7 @@ export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组