@pisell/private-materials 6.6.56 → 6.6.57

package/es/components/booking/dashboard/index.js

@@ -169,7 +169,7 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   var calcBookingDataCount = function calcBookingDataCount() {
-    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2;
+    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2, _statisticData$comple, _statisticData$comple2;
     // 当前在场团体
     var groupsOnSiteNow = statisticData.groups_today_num || 0;
     // 当前在场人数
@@ -189,9 +189,9 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     // 超时的游客
     var overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : '-');
     // 已完成的游客
-    var completed = statisticData.completed_visitors.num || 0;
+    var completed = ((_statisticData$comple = statisticData.completed_visitors) === null || _statisticData$comple === void 0 ? void 0 : _statisticData$comple.num) || 0;
     // 已完成的游客二级数据
-    var completedChildren = statisticData.completed_visitors.statistics || [];
+    var completedChildren = ((_statisticData$comple2 = statisticData.completed_visitors) === null || _statisticData$comple2 === void 0 ? void 0 : _statisticData$comple2.statistics) || [];
     // 已离场的游客
     var departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : '-');
     onDataChange === null || onDataChange === void 0 || onDataChange({

package/es/components/checkout/hooks/useWalletPass.js

@@ -29,6 +29,8 @@ import usePaymentLogger from "./usePaymentLogger";
 import { isWalkIn } from "../../booking/utils";
 import { useActiveExecute } from "../../ticketBooking/hooks/pisellos";
 import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import { useOsKey } from "../../ticketBooking/context";
+import { getShopDiscountKey } from "../../ticketBooking/utils";
 
 /**
  * 自定义Hook：使用WalletPass功能
@@ -40,6 +42,10 @@ export var useWalletPass = function useWalletPass(props) {
   var logger = usePaymentLogger();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
+  var osKey = useOsKey();
+
+  // 根据 osKey 生成模块名称
+  var moduleKey = getShopDiscountKey(osKey || 'ticket');
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -673,7 +679,7 @@ export var useWalletPass = function useWalletPass(props) {
       // 保持初始顺序设置折扣列表
       var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
       setDiscountList(sortedDiscountList);
-      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.emit('shopDiscount:onSelectedDiscountListChange', detail);
+      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.emit("".concat(moduleKey, ":onSelectedDiscountListChange"), detail);
       return;
     }
     setWalletSelect([]);
@@ -773,23 +779,25 @@ export var useWalletPass = function useWalletPass(props) {
     }
   });
   var handleSelectDiscount = useMemoizedFn(function (value, option) {
-    var _detail$discountList, _pisellos$effects2;
     setLoading(true);
-    var isSelected = value.includes(option.id);
-    var detail = shopDiscount.setDiscountSelected({
-      discountId: option.id,
-      isSelected: isSelected
-    });
-    if (!(detail !== null && detail !== void 0 && (_detail$discountList = detail.discountList) !== null && _detail$discountList !== void 0 && (_detail$discountList = _detail$discountList.find(function (item) {
-      return item.id === option.id;
-    })) !== null && _detail$discountList !== void 0 && _detail$discountList.isSelected)) {
+    try {
+      var _pisellos$effects2;
+      var isSelected = value.includes(option.id);
+      var detail = shopDiscount.setDiscountSelected({
+        discountId: option.id,
+        isSelected: isSelected
+      });
+
+      // 保持初始顺序设置折扣列表
+      var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
+      setDiscountList(sortedDiscountList);
+      pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.emit("".concat(moduleKey, ":onSelectedDiscountListChange"), detail);
+    } catch (err) {
+      console.log(err, '1234err');
+    } finally {
+      // 商品券选择流程结束后统一回收loading，避免出现转圈不停止
       setLoading(false);
     }
-
-    // 保持初始顺序设置折扣列表
-    var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);
-    setDiscountList(sortedDiscountList);
-    pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.emit('shopDiscount:onSelectedDiscountListChange', detail);
   });
 
   // 清空不可用钱包数据

package/lib/components/booking/dashboard/index.js

@@ -144,7 +144,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     calcBookingDataCount();
   };
   const calcBookingDataCount = () => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
     let groupsOnSiteNow = statisticData.groups_today_num || 0;
     let peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : "-");
     let totalVisitorsToday = ((_a2 = statisticData.total_visitors_today) == null ? void 0 : _a2.num) || 0;
@@ -154,8 +154,8 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     let upcoming = ((_e = statisticData.upcoming_visitors) == null ? void 0 : _e.num) || 0;
     let upcomingChildren = ((_f = statisticData.upcoming_visitors) == null ? void 0 : _f.statistics) || [];
     let overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : "-");
-    let completed = statisticData.completed_visitors.num || 0;
-    let completedChildren = statisticData.completed_visitors.statistics || [];
+    let completed = ((_g = statisticData.completed_visitors) == null ? void 0 : _g.num) || 0;
+    let completedChildren = ((_h = statisticData.completed_visitors) == null ? void 0 : _h.statistics) || [];
     let departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : "-");
     onDataChange == null ? void 0 : onDataChange(
       {

package/lib/components/checkout/hooks/useWalletPass.js

@@ -43,10 +43,14 @@ var import_usePaymentLogger = __toESM(require("./usePaymentLogger"));
 var import_utils3 = require("../../booking/utils");
 var import_pisellos = require("../../ticketBooking/hooks/pisellos");
 var import_useShopDiscountModule = require("../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_context = require("../../ticketBooking/context");
+var import_utils4 = require("../../ticketBooking/utils");
 var useWalletPass = (props) => {
   const { onSelectChange, customAmount, clientId } = props;
   const logger = (0, import_usePaymentLogger.default)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const osKey = (0, import_context.useOsKey)();
+  const moduleKey = (0, import_utils4.getShopDiscountKey)(osKey || "ticket");
   const [walletRecommendList, setWalletRecommendList] = (0, import_react.useState)([]);
   const [userIdentificationCodes, setUserIdentificationCodes] = (0, import_react.useState)(
     []
@@ -506,7 +510,7 @@ var useWalletPass = (props) => {
       );
       setDiscountList(sortedDiscountList);
       (_a = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a.emit(
-        "shopDiscount:onSelectedDiscountListChange",
+        `${moduleKey}:onSelectedDiscountListChange`,
         detail
       );
       return;
@@ -603,24 +607,27 @@ var useWalletPass = (props) => {
     }
   });
   const handleSelectDiscount = (0, import_ahooks.useMemoizedFn)((value, option) => {
-    var _a, _b, _c;
+    var _a;
     setLoading(true);
-    const isSelected = value.includes(option.id);
-    const detail = shopDiscount.setDiscountSelected({
-      discountId: option.id,
-      isSelected
-    });
-    if (!((_b = (_a = detail == null ? void 0 : detail.discountList) == null ? void 0 : _a.find((item) => item.id === option.id)) == null ? void 0 : _b.isSelected)) {
+    try {
+      const isSelected = value.includes(option.id);
+      const detail = shopDiscount.setDiscountSelected({
+        discountId: option.id,
+        isSelected
+      });
+      const sortedDiscountList = sortDiscountListWithInitialOrder(
+        detail.discountList
+      );
+      setDiscountList(sortedDiscountList);
+      (_a = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a.emit(
+        `${moduleKey}:onSelectedDiscountListChange`,
+        detail
+      );
+    } catch (err) {
+      console.log(err, "1234err");
+    } finally {
       setLoading(false);
     }
-    const sortedDiscountList = sortDiscountListWithInitialOrder(
-      detail.discountList
-    );
-    setDiscountList(sortedDiscountList);
-    (_c = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _c.emit(
-      "shopDiscount:onSelectedDiscountListChange",
-      detail
-    );
   });
   const clearDisabledWalletData = (0, import_ahooks.useMemoizedFn)(() => {
     setDisabledWalletData([]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.56",
+  "version": "6.6.57",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,9 +61,9 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/icon": "0.0.11",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.14",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {