@pisell/private-materials 3.3.80 → 3.3.82

package/es/businessModel/SalesModel/Sales/index.js

@@ -11,6 +11,7 @@ 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, { createContext, useRef, useState } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = 'shop_h5_sales_model_data';
 export var SalesContext = /*#__PURE__*/createContext({});
@@ -26,23 +27,55 @@ export var SalesProvider = function SalesProvider(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     hooks = _useState4[0],
     setHooks = _useState4[1];
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
   var _setData = function _setData(newData) {
     dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), newData);
     console.log('sales_model_newData', dataRef.current);
     if (config !== null && config !== void 0 && config.useSessionStorage) {
-      sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
+      setSessionStorage();
     }
     setData(_objectSpread({}, dataRef.current));
   };
   var getCurrentData = function getCurrentData() {
     return dataRef.current;
   };
+
+  /**
+   * @title 设置sessionStorage
+   * @description 获取路由参数中的cacheId，并设置到sessionStorage中
+   */
   var setSessionStorage = function setSessionStorage() {
-    sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
+    var _utils$getHistory, _history$location;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
+    var cacheId = (history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 || (_history$location = _history$location.query) === null || _history$location === void 0 ? void 0 : _history$location.cacheId) || '';
+    var sessionData = _objectSpread(_objectSpread({}, dataRef.current || {}), {}, {
+      cacheId: cacheId
+    });
+    sessionStorage.setItem("".concat(SALES_MODEL_SESSION_STORAGE_KEY), JSON.stringify(sessionData || {}));
   };
+
+  /**
+   * @title 获取sessionStorage
+   * @description 获取路由参数中的cacheId并与sessionStorage中的cacheId进行匹配，如果匹配成功，则返回sessionStorage中的数据
+   */
   var getSessionStorage = function getSessionStorage() {
-    var result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    return JSON.parse(result || '{}');
+    var _utils$getHistory2, _history$location2;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory2 = utils.getHistory) === null || _utils$getHistory2 === void 0 ? void 0 : _utils$getHistory2.call(utils)) || {};
+    var strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    var result = strResult ? JSON.parse(strResult || '{}') : {};
+    var cacheId = (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 || (_history$location2 = _history$location2.query) === null || _history$location2 === void 0 ? void 0 : _history$location2.cacheId) || '';
+
+    // cacheId 为空，且sessionStorage中cacheId也为空，则返回sessionStorage中的数据
+    if (!cacheId && !(result !== null && result !== void 0 && result.cacheId)) {
+      return result;
+    }
+
+    // cacheId 不为空，需要比对sessionStorage中的cacheId与路由参数中的cacheId是否一致
+    if (cacheId && (result === null || result === void 0 ? void 0 : result.cacheId) === cacheId) {
+      return result;
+    }
+    return {};
   };
   var removeSessionStorage = function removeSessionStorage() {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Resource/index.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import React, { createContext } from 'react';
 import { useSales } from "../../../businessModel/SalesModel";
-import { getResourceListApi } from "./serve";
+import { getSpecialResourceListApi } from "./serve";
 import { useRequest } from 'ahooks';
 import { useCart } from "../Cart";
 import { getIamgeFromMedia } from "../utils";
@@ -73,7 +73,7 @@ export var ResourceProvider = function ResourceProvider(_ref) {
     });
     return renderData;
   };
-  var getResourceList = useRequest(getResourceListApi, {
+  var getResourceList = useRequest(getSpecialResourceListApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
       var formatData = formatResourceList(res);

package/es/components/Sales/Resource/serve.d.ts

@@ -3,3 +3,10 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export declare const getSpecialResourceListApi: (params: {
+    event_item_ids?: string | number[];
+}) => Promise<any>;

package/es/components/Sales/Resource/serve.js

@@ -5,4 +5,14 @@ export var getResourceListApi = function getResourceListApi(params) {
   return request.getRequest().get('/h5/form/data/v1', params, {
     useCache: true
   });
+};
+
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export var getSpecialResourceListApi = function getSpecialResourceListApi(params) {
+  return request.getRequest().get('/h5/eventbookingv2/item/specify-resources', params, {
+    useCache: true
+  });
 };

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -21,7 +21,7 @@ import Deposit from "../../Deposit";
 import { handleAddHolder } from "../utils";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
-  var _businessUtils$getApp, _currentStep$step, _currentStep$step2;
+  var _businessUtils$getApp, _businessUtils$getApp2, _currentStep$step, _currentStep$step2;
   var onNext = _ref.onNext;
   var appointmentBooking = useAppointmentBooking();
   var _ref2 = useAppointmentBookingContext(),
@@ -83,6 +83,8 @@ var CartItem = function CartItem(_ref) {
 
   // 是否安装商品券应用
   var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  // 是否安装折扣卡应用
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
   var handleClickCard = function handleClickCard(e, type, val) {
     console.log(e, type, val, 'handleClickCard');
     // 更改备注
@@ -249,7 +251,7 @@ var CartItem = function CartItem(_ref) {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "appointment-footer"
-  }, hasGoodPassApp ? /*#__PURE__*/React.createElement(VoucherCard, {
+  }, hasGoodPassApp || hasDiscountCardApp ? /*#__PURE__*/React.createElement(VoucherCard, {
     currentUser: currentUser,
     products: carts
   }) : null, /*#__PURE__*/React.createElement(Total, null), (carts === null || carts === void 0 ? void 0 : carts.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? /*#__PURE__*/React.createElement(Deposit, null) : null, /*#__PURE__*/React.createElement(ContinueButton, {

package/es/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(100vh - 100px);
+  height: calc(var(--vh, 1vh) * 100 - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

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

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(100vh - 16px) !important;
+      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
     }
   }
 }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Deposit: () => JSX.Element;
 export default Deposit;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const GuestOptionsModal: (props: any) => JSX.Element;
 export default GuestOptionsModal;

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

@@ -71,7 +71,7 @@ var Header = function Header() {
   var handleBack = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step4;
-      var key, types, _carts$, type, form_key, booking_form, prevStepData, currentStepData, _key;
+      var key, types, form_key, booking_form, prevStepData, currentStepData, _key;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -91,19 +91,13 @@ var Header = function Header() {
             }
 
             // 3. 清空商品
-            if (!(key === 'select-service')) {
-              _context.next = 10;
-              break;
-            }
-            appointmentBooking.clearCart();
-            _context.next = 8;
-            return checkProductType(carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$.id);
-          case 8:
-            type = _context.sent;
-            if (type === 'duration') {
-              appointmentBooking.deleteCartItemInfo('time');
+            if (key === 'select-service') {
+              appointmentBooking.clearCart();
+              if (appointmentBooking.isCartHasDurationProduct()) {
+                appointmentBooking.deleteCartItemInfo('time');
+              }
             }
-          case 10:
+
             // 4. 清理本地状态
             if (key === 'select-time') {
               setTimes([]);
@@ -165,7 +159,7 @@ var Header = function Header() {
             //     isSkip: false,
             //   });
             // }
-          case 18:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -85,9 +85,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
             return checkProductType(item === null || item === void 0 ? void 0 : item.id);
           case 4:
             type = _context2.sent;
-            if (type === 'session') {
-              appointmentBooking.openProductDetail(item.id);
-            }
+            appointmentBooking.openProductDetail(item.id);
           case 6:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
@@ -101,10 +99,17 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, description;
+                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, _useAppointmentBookin4, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
+                        if (!data.isCancel) {
+                          _context.next = 3;
+                          break;
+                        }
+                        appointmentBooking.closeProductDetail();
+                        return _context.abrupt("return");
+                      case 3:
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -112,31 +117,21 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 7;
+                          _context.next = 10;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 5;
+                          _context.next = 8;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 5:
+                      case 8:
                         appointmentBooking.storeProduct(product);
                         return _context.abrupt("return");
-                      case 7:
-                        if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 10;
-                          break;
-                        }
-                        if (type === 'session') {
-                          appointmentBooking.closeProductDetail();
-                          appointmentBooking.getAvailableDate();
-                        }
-                        return _context.abrupt("return");
                       case 10:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 20;
+                          _context.next = 19;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -148,45 +143,52 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        appointmentBooking.closeProductDetail();
-                        _context.next = 18;
+                        _context.next = 17;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 18:
-                        _context.next = 28;
+                      case 17:
+                        _context.next = 27;
                         break;
-                      case 20:
+                      case 19:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 24;
+                          _context.next = 23;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 24:
+                      case 23:
                         appointmentBooking.storeProduct(product);
-                        // duration 类型的商品，要获取一下资源
+                        // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
                         if (!(type === 'duration')) {
-                          _context.next = 28;
+                          _context.next = 27;
                           break;
                         }
-                        _context.next = 28;
+                        _context.next = 27;
                         return appointmentBooking.getAvailableDate();
-                      case 28:
+                      case 27:
+                        appointmentBooking.closeProductDetail();
+
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤
-                          if (type === 'duration') {
-                            description = locales.getText('pisell2.appointment.select.time');
-                            appointmentBooking.addStep({
-                              index: index,
-                              key: 'select-time',
-                              description: description
-                            }, 'select-resource');
+                          if (type === 'duration' || appointmentBooking.isCartHasDurationProduct()) {
+                            _useAppointmentBookin4 = useAppointmentBookingStep(), stepList = _useAppointmentBookin4.stepList;
+                            hasResourceStep = stepList === null || stepList === void 0 ? void 0 : stepList.find(function (item) {
+                              return (item === null || item === void 0 ? void 0 : item.key) === "select-resource";
+                            });
+                            if (hasResourceStep) {
+                              description = locales.getText('pisell2.appointment.select.time');
+                              appointmentBooking.addStep({
+                                index: index,
+                                key: 'select-time',
+                                description: description
+                              }, 'select-resource');
+                            }
                           } else {
                             removeStep('select-time');
                           }

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

@@ -1,4 +1,8 @@
 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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 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); }); }; }
@@ -76,6 +80,7 @@ var VoucherCard = function VoucherCard(props) {
       return !!item.isAvailable;
     }).map(function (discount) {
       return _objectSpread(_objectSpread({}, discount), {}, {
+        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       });
     });
@@ -121,6 +126,7 @@ var VoucherCard = function VoucherCard(props) {
     });
     pisellos.effects.on('appointmentBooking_cart:onAddItem', onCartChange);
     pisellos.effects.on('appointmentBooking_cart:onUpdateQuotationPrice', onCartChange);
+    pisellos.effects.on('appointmentBooking_cart:onUpdateCartItemNums', onCartChange);
     pisellos.effects.on('appointmentBooking_cart:onRemoveItem', onCartChange);
     pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
       console.log(discount, 'discountChange');
@@ -187,6 +193,11 @@ var VoucherCard = function VoucherCard(props) {
       }
     }, locales.getText('pisell2.text.goodpass.login')), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.goodpass.login-tip'))));
   };
+  var mixedSort = function mixedSort(val) {
+    return _toConsumableArray(val).sort(function (a, b) {
+      return Number(b === null || b === void 0 ? void 0 : b.isSelected) - Number(a === null || a === void 0 ? void 0 : a.isSelected);
+    });
+  };
   var renderVoucherInfo = function renderVoucherInfo() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "voucher-title"
@@ -211,6 +222,7 @@ var VoucherCard = function VoucherCard(props) {
         width: '100%'
       },
       dataSource: availableData,
+      mixedSort: mixedSort,
       onChange: function onChange(val) {
         var detail = shopDiscount.setDiscountSelected({
           discountId: val.id,
@@ -228,6 +240,7 @@ var VoucherCard = function VoucherCard(props) {
       }
     }, locales.getText('pisell2.text.goodpass.code'), ":"), /*#__PURE__*/React.createElement(PisellInput, {
       value: code,
+      allowClear: true,
       onChange: function onChange(e) {
         var _e$target;
         setCode((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -63,23 +63,22 @@ var DepositModal = function DepositModal(props) {
             data = _yield$appointmentBoo.data;
             setPolicy(data);
             onChange && onChange(data);
-            _context.next = 15;
+            _context.next = 14;
             break;
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](1);
             console.log(_context.t0);
             onChange && onChange(_context.t0);
-            debugger;
-          case 15:
-            _context.prev = 15;
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(15);
-          case 18:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 15, 18]]);
+      }, _callee, null, [[1, 10, 14, 17]]);
     }));
     return function getPolicy(_x) {
       return _ref.apply(this, arguments);

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/appointmentBooking/index.js

@@ -27,6 +27,20 @@ var AppointmentBooking = function AppointmentBooking() {
       }
     });
   }, []);
+  useEffect(function () {
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    setRealVH();
+    window.addEventListener('resize', setRealVH);
+    return function () {
+      window.removeEventListener('resize', setRealVH);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "parallel-booking-wrap ".concat(isMobile() ? 'parallel-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(AppointmentBookingProvider, null, /*#__PURE__*/React.createElement(Content, null)));

package/es/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {

package/es/components/appointmentBooking/locales.js

@@ -126,7 +126,7 @@ export default {
       return "Tip: Change ".concat(val || 'resource', " using the dropdown in the cart.");
     },
     'pisell2.text.apply': 'Apply',
-    'pisell2.text.goodpass': 'GoodPass',
+    'pisell2.text.goodpass': 'Promotion',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
     'pisell2.text.goodpass.view-more': 'View More',
     'pisell2.text.goodpass.code': 'Code',
@@ -262,7 +262,7 @@ export default {
       return "\u63D0\u793A\uFF1A\u5728\u53F3\u4FA7\u8D2D\u7269\u8F66\u4E2D\uFF0C\u901A\u8FC7\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '资源', "\u201D");
     },
     'pisell2.text.apply': '应用',
-    'pisell2.text.goodpass': '商品券',
+    'pisell2.text.goodpass': '促销',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
     'pisell2.text.goodpass.view-more': '查看更多',
     'pisell2.text.goodpass.code': '券码',
@@ -398,7 +398,7 @@ export default {
       return "\u63D0\u793A\uFF1A\u5728\u53F3\u5074\u8CFC\u7269\u8ECA\u4E2D\uFF0C\u900F\u904E\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '資源', "\u201D");
     },
     'pisell2.text.apply': '應用',
-    'pisell2.text.goodpass': '商品券',
+    'pisell2.text.goodpass': '促銷',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',
     'pisell2.text.goodpass.view-more': '查看更多',
     'pisell2.text.goodpass.code': '券碼',

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

@@ -97,11 +97,13 @@ var formatProductValues = function formatProductValues(data) {
     return _objectSpread(_objectSpread({}, d), {}, {
       id: d.product_id,
       title: d.product_title,
+      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
+        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -309,6 +311,7 @@ var Addons = Provider(function (props) {
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread({}, _detail), {}, {
           _id: getUniqueId(),
+          isAddons: true,
           _key: e.key,
           _extend: {
             price: _detail.price,
@@ -319,8 +322,11 @@ var Addons = Provider(function (props) {
         });
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
+        // 已经加入购物车的折扣商品 不叠加
         var _item = _list.find(function (d) {
-          return d._extend.other.rowKey === e.rowKey;
+          var _d$discount_list;
+          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_d$discount_list = d.discount_list) !== null && _d$discount_list !== void 0 && _d$discount_list.length);
         });
 
         // 如果已添加, 则数量+1
@@ -513,6 +519,7 @@ var Addons = Provider(function (props) {
         var _product$_extend;
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
+          isAddons: true,
           // 编辑商品时清除折扣信息
           discount_list: [],
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
@@ -525,8 +532,8 @@ var Addons = Provider(function (props) {
         }
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
         var _list = _toConsumableArray(state.addons.value);
-        console.log('cacheItem', product);
         _list = _list.map(function (d) {
           return d._id === product._id ? product : d;
         });

package/es/components/booking/addons/model.js

@@ -17,6 +17,11 @@ var _miniRedux = miniRedux({
         state.setGlobalState({
           addons: _objectSpread(_objectSpread({}, state.addons), payload)
         });
+      },
+      setService: function setService(state, payload) {
+        state.setGlobalState({
+          service: _objectSpread(_objectSpread({}, state.service), payload)
+        });
       }
     }
   }),