@pisell/private-materials 3.2.22 → 3.2.25

package/es/components/appointmentBooking/components/Services/index.js

@@ -11,14 +11,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useRef, useState, useMemo, useEffect } from 'react';
+import { Input } from 'antd';
 import SearchLg from '@pisell/icon/es/SearchLg';
 import { locales } from '@pisell/utils';
-import { PisellEmpty } from '@pisell/materials';
-import { Input } from 'antd';
+import { PisellEmpty, PisellToast } from '@pisell/materials';
 import TabProduct from "../../../booking/components/TabProduct";
 import { formatProductListByCategory } from "../../../booking/utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBooking } from "../../hooks";
 import "./index.less";
 var Services = function Services() {
   var searchRef = useRef();
@@ -29,8 +30,8 @@ var Services = function Services() {
   var context = useEngineContext();
   var _ref = context.appHelper || {},
     utils = _ref.utils;
+  var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
     products = _useAppointmentBookin.products,
     setProducts = _useAppointmentBookin.setProducts;
   useEffect(function () {
@@ -53,12 +54,9 @@ var Services = function Services() {
           return item.status === 1;
         });
         if (!activeStatus) {
-          // console.log(PisellToast, 'PisellToast');
-          // return PisellToast({
-          //   content: locales.getText(
-          //     'pisell2.appointment.no.available.service'
-          //   ),
-          // });
+          return PisellToast({
+            content: locales.getText('pisell2.appointment.no.available.service')
+          });
         }
         var product = _objectSpread(_objectSpread({}, data), {}, {
           options: (data === null || data === void 0 ? void 0 : data.option) || []

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

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Resource: ({ params }: any) => JSX.Element;
+declare const Resource: () => JSX.Element;
 export default Resource;

package/es/components/appointmentBooking/components/TimeSlicing/index.js

@@ -8,63 +8,81 @@ 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 } from 'react';
-import { Iconfont } from '@pisell/materials';
+import React, { useEffect, useState } from 'react';
+import { Iconfont, PisellEmpty } from '@pisell/materials';
+import { locales } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBookingResource } from "../../hooks";
 import "./index.less";
-var Resource = function Resource(_ref) {
-  var params = _ref.params;
+var Resource = function Resource() {
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     selectedResource = _useState2[0],
     setSelectedResource = _useState2[1];
   var _useAppointmentBookin = useAppointmentBookingContext(),
     times = _useAppointmentBookin.times,
-    resources = _useAppointmentBookin.resources,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    carts = _useAppointmentBookin.carts;
-  console.log(params, resources, times, 'wh8765');
-  var _onClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-      var _resources$;
-      var data, _resources$2, _resources$3, _resources, aa;
+    setSelectedTime = _useAppointmentBookin.setSelectedTime,
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+  var _useAppointmentBookin2 = useAppointmentBookingResource(),
+    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot,
+    getResourceList = _useAppointmentBookin2.getResourceList;
+  useEffect(function () {
+    getResourceTimeSlot();
+  }, []);
+  var getAutoSelect = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
+      var _getResourceList, resourceCodes, _yield$appointmentBoo, errorList, result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setSelectedResource(e === null || e === void 0 ? void 0 : e.start_time);
-            _context.next = 3;
-            return appointmentBooking.autoSelectResource({
-              resourceProductData: resources === null || resources === void 0 ? void 0 : resources[0],
-              resources: resources === null || resources === void 0 || (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[1]) === null || _resources$ === void 0 ? void 0 : _resources$.renderList,
-              timeSlots: e
-            });
-          case 3:
-            data = _context.sent;
-            if (!data) {
-              _context.next = 10;
-              break;
-            }
-            _resources = [resources === null || resources === void 0 || (_resources$2 = resources[0]) === null || _resources$2 === void 0 || (_resources$2 = _resources$2.resources) === null || _resources$2 === void 0 || (_resources$2 = _resources$2[0]) === null || _resources$2 === void 0 || (_resources$2 = _resources$2.renderList) === null || _resources$2 === void 0 ? void 0 : _resources$2[0], resources === null || resources === void 0 || (_resources$3 = resources[0]) === null || _resources$3 === void 0 || (_resources$3 = _resources$3.resources) === null || _resources$3 === void 0 || (_resources$3 = _resources$3[1]) === null || _resources$3 === void 0 || (_resources$3 = _resources$3.renderList) === null || _resources$3 === void 0 ? void 0 : _resources$3[0]];
+            setSelectedTime(val);
+            _getResourceList = getResourceList(), resourceCodes = _getResourceList.resourceCodes;
+            _context.next = 4;
+            return appointmentBooking.autoSelectAllProductResources(resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[1], val);
+          case 4:
+            _yield$appointmentBoo = _context.sent;
+            errorList = _yield$appointmentBoo.errorList;
             _context.next = 8;
-            return appointmentBooking.submitTimeSlot({
-              resourceProductData: resources === null || resources === void 0 ? void 0 : resources[0],
-              selectedResources: _resources,
-              timeSlots: e
-            });
+            return appointmentBooking.submitTimeSlot(val);
           case 8:
-            aa = _context.sent;
-            console.log(data, _resources, aa, 'wh9879676');
+            result = _context.sent;
+            console.log(errorList, result, 'wh9896788');
           case 10:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onClick(_x) {
+    return function getAutoSelect(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    if ((times === null || times === void 0 ? void 0 : times.length) > 0) {
+      var _times$;
+      setSelectedResource(times === null || times === void 0 || (_times$ = times[0]) === null || _times$ === void 0 ? void 0 : _times$.start_time);
+      getAutoSelect(times === null || times === void 0 ? void 0 : times[0]);
+    }
+  }, [times]);
+  var _onClick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            setSelectedResource(e === null || e === void 0 ? void 0 : e.start_time);
+            getAutoSelect(e);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onClick(_x2) {
       return _ref2.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/React.createElement("div", {
+  return (times === null || times === void 0 ? void 0 : times.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: 'appointment-time-slicing-wrap'
   }, times.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -77,6 +95,8 @@ var Resource = function Resource(_ref) {
       type: "pisell2-chevron-right",
       className: "icon"
     }));
-  }));
+  })) : /*#__PURE__*/React.createElement(PisellEmpty, {
+    description: locales.getText('pisell2.appointment.booking.empty.time')
+  });
 };
 export default Resource;

package/es/components/appointmentBooking/components/TimeSlicing/index.less

@@ -1,4 +1,5 @@
 .appointment-time-slicing-wrap {
+  padding-top: 20px;
   .item {
     cursor: pointer;
     padding: 25px 20px;
@@ -18,6 +19,10 @@
 
     &:hover {
       background-color: #f1f1f1;
+      cursor: pointer;
+    }
+    &.active {
+      background-color: #f1f1f1;
     }
   }
 }

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -20,9 +20,9 @@ import classNames from 'classnames';
 import { Button } from 'antd';
 import { locales } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { PisellInput, PisellTooltip, PisellGoodPassCard, PisellText, PisellToast } from '@pisell/materials';
-import { QuestionCircleOutlined } from '@ant-design/icons';
-import { useAppointmentBooking, useShopDiscount } from "../../hooks";
+import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisell/materials';
+import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
+import { formatCustomer } from "../../utils";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
 var ShopDiscountHooks = {
@@ -62,6 +62,10 @@ var VoucherCard = function VoucherCard(props) {
     discountList = _useState6[0],
     setDisCountList = _useState6[1];
   var productRef = useRef(products);
+  var _useAppointmentBookin = useAppointmentBookingLogin(),
+    openLoginModal = _useAppointmentBookin.openLoginModal;
+  var _useAppointmentBookin2 = useAppointmentBookingAccount(),
+    accountLists = _useAppointmentBookin2.accountLists;
   var cart = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.cart;
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
@@ -77,32 +81,31 @@ var VoucherCard = function VoucherCard(props) {
     });
   }, [discountList]);
   useEffect(function () {
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    shopDiscount.setCustomer(currentUser);
-  }, [currentUser.id]);
+    if (isUserLoggedIn) {
+      var _shopDiscount = pisellos.getModule('shopDiscount');
+      _shopDiscount.setCustomer(currentUser);
+    }
+  }, [currentUser.id, isUserLoggedIn]);
 
   // // 设置productList
   useEffect(function () {
     shopDiscount.setProductList(products);
   }, [products]);
-
-  // // 更新productList
-  useEffect(function () {
-    if (productRef.current === products) {
-      return;
-    }
+  var onCartChange = function onCartChange() {
+    var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
     var val = shopDiscount.calcDiscount(products);
-    console.log('input: ', products);
-    console.log('output: ', val);
-    productRef.current = val.productList;
     cart === null || cart === void 0 || cart.batchSetItems(val.productList);
-  }, [products]);
+  };
 
   // // 监听customer变化
   useEffect(function () {
+    var val = shopDiscount.getDiscountList();
+    setDisCountList(val);
     pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, function (result) {
       cart === null || cart === void 0 || cart.batchSetItems(result.productList);
     });
+    pisellos.effects.on('appointmentBooking_cart:onAddItem', onCartChange);
+    pisellos.effects.on('appointmentBooking_cart:onRemoveItem', onCartChange);
     pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
       console.log(discount, 'discountChange');
       setDisCountList(discount);
@@ -122,6 +125,7 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             if (val !== null && val !== void 0 && val.isAvailable) {
               cart === null || cart === void 0 || cart.batchSetItems(val.productList);
+              setCode('');
             } else {
               PisellToast({
                 content: locales.getText('pisell2.text.goodpass.code-invalid')
@@ -150,11 +154,17 @@ var VoucherCard = function VoucherCard(props) {
       className: "login-btn",
       onClick: function onClick() {
         if (!action) return;
-        action({
-          type: 'pisell1.login',
-          data: {},
+        openLoginModal({
           callback: function callback(status) {
-            if (status === 'success') {}
+            var _utils$store;
+            var user = (_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store = _utils$store.getState()) === null || _utils$store === void 0 || (_utils$store = _utils$store.global) === null || _utils$store === void 0 ? void 0 : _utils$store.userInfo;
+            var currentUser = formatCustomer(user);
+            var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
+              return !(d !== null && d !== void 0 && d.isGuest);
+            });
+            if (status === 'success') {
+              appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
+            }
           }
         });
       }
@@ -207,14 +217,14 @@ var VoucherCard = function VoucherCard(props) {
         setCode((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
       },
       size: "small",
-      placeholder: locales.getText('pisell2.text.goodpass.enter-code'),
-      suffix: /*#__PURE__*/React.createElement(PisellTooltip, {
-        title: ""
-      }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
-        style: {
-          color: 'rgba(0,0,0,.45)'
-        }
-      }))
+      placeholder: locales.getText('pisell2.text.goodpass.enter-code')
+      // suffix={
+      //   <PisellTooltip title="">
+      //     <QuestionCircleOutlined
+      //       style={{ color: 'rgba(0,0,0,.45)' }}
+      //     />
+      //   </PisellTooltip>
+      // }
     })), /*#__PURE__*/React.createElement(Button, {
       size: "small",
       onClick: onScanCode,

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

@@ -19,6 +19,8 @@ interface AppointmentBookingContextType {
     symbolic?: any;
     resourceOtherParams?: any;
     setResourceOtherParams: (val: any) => void;
+    selectedTime: any;
+    setSelectedTime: (val: any) => void;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;

package/es/components/appointmentBooking/context.js

@@ -46,6 +46,10 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     _useState16 = _slicedToArray(_useState15, 2),
     resourceOtherParams = _useState16[0],
     setResourceOtherParams = _useState16[1];
+  var _useState17 = useState(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    selectedTime = _useState18[0],
+    setSelectedTime = _useState18[1];
   var _useEngineContext = useEngineContext(),
     appHelper = _useEngineContext.appHelper;
   var symbolic = appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.getSymbolic();
@@ -69,7 +73,9 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     appHelper: appHelper,
     symbolic: symbolic,
     resourceOtherParams: resourceOtherParams,
-    setResourceOtherParams: setResourceOtherParams
+    setResourceOtherParams: setResourceOtherParams,
+    selectedTime: selectedTime,
+    setSelectedTime: setSelectedTime
   };
   return /*#__PURE__*/React.createElement(AppointmentBookingContext.Provider, {
     value: value

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

@@ -1,25 +1,64 @@
 export declare const useAppointmentBooking: () => any;
 export declare const useShopDiscount: () => any;
+/**
+ * @title: 监听步骤发生变化
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:11
+ */
 export declare const useAppointmentBookingStep: () => void;
+/**
+ * @title: 获取商品数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:12
+ */
 export declare const useAppointmentBookingProduct: () => void;
-export declare const useAppointmentBookingCart: () => {
-    cart: any;
-};
+/**
+ * @title: 更新购物车数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:12
+ */
+export declare const useAppointmentBookingCart: () => void;
+/**
+ * @title: 获取登录状态
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:14
+ */
 export declare const useAppointmentBookingLogin: () => {
     isLogin: boolean;
     openLoginModal: (params: {
         callback: any;
     }) => void;
 };
+/**
+ * @title: 获取账户
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:15
+ */
 export declare const useAppointmentBookingAccount: () => {
-    currentUser: {
-        id: any;
-        username: string;
-    };
     accountLists: any;
 };
+/**
+ * @title: 获取资源数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:29
+ */
 export declare const useAppointmentBookingResource: () => {
-    getResourceTimeSlot: (params: any) => Promise<void>;
-    getResourceList: () => Promise<any>;
-    autoSelectAllProductResources: (code: string) => Promise<void>;
+    getResourceTimeSlot: (index?: number) => Promise<void>;
+    getResourceList: () => {
+        resources: any;
+        resourceCodes: any;
+    };
+    autoSelectAllProductResources: (index?: number) => Promise<any>;
 };