npm - @pisell/private-materials - Versions diffs - 6.5.26 → 6.6.1 - Mend

@pisell/private-materials 6.5.26 → 6.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (336) hide show

package/es/components/booking/components/footer/utils.js CHANGED Viewed

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 import { flexibleObj, isNowTime, getNowTime } from "../../utils";
 import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
@@ -12,13 +12,13 @@ import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog, getUniqueId } from '@pisell/utils';
-import { PisellToast } from "@pisell/materials";
+import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
 var formatNote = function formatNote(data) {
   var _data$notes;
-  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
+  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || '';
 };
 var formatCustomer = function formatCustomer(data) {
   var _data$client, _data$client2, _data$client3, _data$client4, _data$client5, _data$client6;
@@ -37,7 +37,7 @@ var formatCustomer = function formatCustomer(data) {
 /**
  * @title: 套餐单规格信息
- * @description:
+ * @description:
  * @param {any} option
  * @return {*}
  * @Author: zhiwei.Wang
@@ -49,17 +49,17 @@ export var formatProductOption = function formatProductOption(option) {
   }
   return option.map(function (d) {
     return {
-      "num": d.num,
-      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
-      "option_group_id": d.option_group_id,
-      "custom_add_price": Number(d === null || d === void 0 ? void 0 : d.add_price)
+      num: d.num,
+      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
+      option_group_id: d.option_group_id,
+      custom_add_price: Number(d === null || d === void 0 ? void 0 : d.add_price)
     };
   });
 };
 /**
  * @title: 添加套餐警告
- * @description:
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -80,7 +80,7 @@ var log = function log(data) {
 /**
  * @title: 套餐信息
- * @description:
+ * @description:
  * @param {any} bundle
  * @return {*}
  * @Author: zhiwei.Wang
@@ -117,7 +117,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       // checkout 2.0 新增
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price": Math.abs(new Decimal(d === null || d === void 0 ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option
     };
@@ -200,7 +200,7 @@ var formatResource = function formatResource(service) {
 /**
  * @title: 格式化子预约的holder数据
- * @description:
+ * @description:
  * @param {any} state
  * @param {any} item
  * @param {any} values
@@ -231,7 +231,7 @@ var formatHolders = function formatHolders(state, item, values) {
 /**
  * @title: 格式化商品单价
- * @description:
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -264,8 +264,8 @@ export var formatProductPrice = function formatProductPrice(item) {
 /**
  * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
- * @param item
- * @returns
+ * @param item
+ * @returns
  */
 var formatOriginalPrice = function formatOriginalPrice(item) {
   var _item$_extend8;
@@ -274,8 +274,8 @@ var formatOriginalPrice = function formatOriginalPrice(item) {
 /**
  * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
- * @param item
- * @returns
+ * @param item
+ * @returns
  */
 var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
@@ -339,7 +339,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
 /**
  * @title: 格式化商品数据
- * @description:
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -368,36 +368,36 @@ var formatProducts = function formatProducts(item, quantity) {
     item.product_id = 0;
   }
   return {
-    "name": item.name,
-    "num": quantity || item._extend.quantity,
-    "price": formatProductPrice(item),
-    "source_product_price": getSourceProductPrice(item),
-    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
-    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
-    "product_discount_reason": item._extend.discount_reason || '',
-    "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note) || '',
-    "discountway": item._extend.discountway || "num",
-    "discount_per": item._extend.discount_per,
-    "discount_type": item._extend.discount_type || discount_type,
-    "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
-    "product_variant_id": ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
-    "discount_list": notManualDiscount,
+    name: item.name,
+    num: quantity || item._extend.quantity,
+    price: formatProductPrice(item),
+    source_product_price: getSourceProductPrice(item),
+    product_id: item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
+    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
+    product_discount_reason: item._extend.discount_reason || '',
+    is_charge_tax: item.is_charge_tax,
+    note: ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note) || '',
+    discountway: item._extend.discountway || 'num',
+    discount_per: item._extend.discount_per,
+    discount_type: item._extend.discount_type || discount_type,
+    order_detail_id: item._extend.order_detail_id || 0,
+    product_bundle: formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
+    bundle_edit: item._extend.bundle_edit,
+    product_option_item: formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
+    product_variant_id: ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
+    discount_list: notManualDiscount,
     metadata: formatMetaData(item),
     // checkout 需求新增字段
-    "calculated_original_price": formatOriginalPrice(item),
-    "calculated_selling_price": formatSellingPrice(item),
-    "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data
+    calculated_original_price: formatOriginalPrice(item),
+    calculated_selling_price: formatSellingPrice(item),
+    tax_fee: item._extend.tax_fee,
+    custom_deposit_data: item.custom_deposit_data
   };
 };
 /**
  * @title: 格式化跨日预约下的普通商品
- * @description:
+ * @description:
  * @param {any} data
  * @param {any} booking_item
  * @return {*}
@@ -423,7 +423,7 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 /**
  * @title: 格式化跨日预约商品列表
- * @description:
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -471,9 +471,24 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
   });
 };
+/**
+ * @title: 是否包含跨日预约商品
+ * @description:
+ * @param {any} data
+ * @return {*}
+ */
+export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
+  var list = data.service.value;
+  var isHas = list.some(function (item) {
+    var _item$_extend26;
+    return (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.groupId;
+  });
+  return isHas;
+};
 /**
  * @title: 预约商品信息
- * @description:
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: zhiwei.Wang
@@ -505,7 +520,7 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   list.forEach(function (item) {
-    var _item$_extend30;
+    var _item$_extend27, _item$_extend32;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -513,10 +528,13 @@ var formatBookings = function formatBookings(data, values) {
       }));
       return;
     }
+    // 当前商品是跨日预约商品
+    var isMultiDay = (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
-    var end_time = item._extend.endDate.format("HH:mm");
-    var start_time = item._extend.startDate.format("HH:mm");
+    var end_time = item._extend.endDate.format('HH:mm');
+    var start_time = item._extend.startDate.format('HH:mm');
     // 更新当前时间
     if (isNowTime(item._extend.start_time)) {
@@ -526,9 +544,9 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
-      var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
-      var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
+      var _item$_extend28, _item$_extend29, _item$_extend30, _item$_extend31;
+      var startDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.startDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.start_date);
+      var endDate = ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.endDate) || ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -550,34 +568,36 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (!((_item$_extend30 = item._extend) !== null && _item$_extend30 !== void 0 && _item$_extend30.unique_identification_number)) {
+    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
     var booking = _objectSpread(_objectSpread({
-      "product": formatProducts(item),
-      "metadata": formatMetaData(item),
-      "relation_products": formatRelationDetails(item._extend.relation_details),
-      'id': item.booking_id || 0,
-      "relation_id": item._extend.relation_id || 0,
-      "like_status": item._extend.like_status || 'common',
-      "relation_type": item._extend.relation_type || '',
-      "is_all": false,
-      "schedule_id": item._extend.schedule_id || 0,
-      "end_time": end_time,
-      "sub_type": isDay ? 'days' : getSubType(item),
-      "select_date": start_date,
-      "start_time": start_time,
-      "end_date": end_date,
-      "start_date": start_date,
-      "duration": isDay ? 0 : flexibleObj.getValue(item._extend.duration),
-      "number": item._extend.capacity ? getSumCapacity({
+      product: formatProducts(item),
+      metadata: formatMetaData(item),
+      relation_products: formatRelationDetails(item._extend.relation_details),
+      id: item.booking_id || 0,
+      relation_id: item._extend.relation_id || 0,
+      like_status: item._extend.like_status || 'common',
+      relation_type: item._extend.relation_type || '',
+      is_all: false,
+      schedule_id: item._extend.schedule_id || 0,
+      end_time: end_time,
+      sub_type: isDay ? 'days' : getSubType(item),
+      select_date: start_date,
+      start_time: start_time,
+      end_date: end_date,
+      start_date: start_date,
+      duration: isDay || isMultiDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      number: item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
-      "resources": formatResource(item),
-      "note": item._extend.note
+      resources: formatResource(item),
+      note: item._extend.note
     }, eventOtherParams || {}), dayParams);
-    if (isDay) {
+    // 跨日预约模版或当前是跨日预约商品时
+    if (isDay || isMultiDay) {
       bookings.push(booking);
       return;
     }
@@ -585,12 +605,12 @@ var formatBookings = function formatBookings(data, values) {
       var newItem = cloneDeep(item);
       newItem._extend.unique_identification_number = "".concat(item._extend.unique_identification_number, "_").concat(i);
       bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
-        "product": formatProducts(newItem, 1),
-        "number": item._extend.capacity ? getSumCapacity({
+        product: formatProducts(newItem, 1),
+        number: item._extend.capacity ? getSumCapacity({
           cacheItem: newItem
         }, false) : newItem._extend.number || 1,
-        "holder": getHolderByIndex(booking.holder, i),
-        "metadata": formatMetaData(newItem)
+        holder: getHolderByIndex(booking.holder, i),
+        metadata: formatMetaData(newItem)
       }));
     }
   });
@@ -599,7 +619,7 @@ var formatBookings = function formatBookings(data, values) {
 /**
  * @title: 普通商品
- * @description:
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -610,16 +630,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend31;
+    var _item$_extend33;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend32;
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+    var _item$_extend34;
+    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -638,8 +658,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend33;
-    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
+    var _item$_extend35;
+    if (!((_item$_extend35 = item._extend) !== null && _item$_extend35 !== void 0 && _item$_extend35.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -650,7 +670,7 @@ var formatNormalProducts = function formatNormalProducts(data) {
 /**
  * @title: 预约主体信息
- * @description:
+ * @description:
  * @param {any} state
  * @param {any} values
  * @return {*}
@@ -683,20 +703,24 @@ var formatHolder = function formatHolder(state, values) {
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
-  var _values, _values3;
+  var _values, _values3, _state$contacts_info;
   var values = {
-    type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
-    platform: state.isBookingTicket2 ? "pos" : "shop",
-    sales_channel: "my_pisel",
-    order_sales_channel: state.isBookingTicket2 ? "pos" : "online_store",
+    type: state.renderType === 'eventBooking' ? 'event_booking_v2' : 'appointment_booking',
+    platform: state.isBookingTicket2 ? 'pos' : 'shop',
+    sales_channel: 'my_pisel',
+    order_sales_channel: state.isBookingTicket2 ? 'pos' : 'online_store',
     bookings: [],
     customer_id: 1,
-    customer_name: "",
+    customer_name: '',
     holder: {},
     relation_products: [],
     metadata: {}
   };
+  // 是是跨日预约模版
   var isDay = isDaysBooking(state);
+  // 是否包含跨日预约商品
+  var isHasMultiDay = getHasMultiDayProduct(state);
   var isEvent = isEventBooking(state);
   if (!state.bookingId || isDay) {
     // 备注
@@ -719,8 +743,8 @@ export var formatValues = function formatValues(state) {
   // 主体
   values.holder = formatHolder(state, values);
   // todo
-  if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+  if (isEvent) {
+    values.relation_products = formatRelationProducts(state, 'event');
   } else {
     var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
@@ -741,7 +765,7 @@ export var formatValues = function formatValues(state) {
   }
   // 跨日预约增加多余参数区分
-  if (isDay) {
+  if (isDay || isHasMultiDay) {
     values.metadata.is_multiday_appointment = 1;
     // is_bundle_price_calculated 用于区分商品的price是总价，还是商品的单价
     // values.is_bundle_price_calculated = 1
@@ -749,29 +773,32 @@ export var formatValues = function formatValues(state) {
   if (!((_values3 = values) !== null && _values3 !== void 0 && (_values3 = _values3.bookings) !== null && _values3 !== void 0 && _values3.length)) {
     values.type = 'virtual';
   }
+  // 联系信息
+  values.contacts_info = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || null;
   return values;
 };
 // 检测预约主体是否为空
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
-  var errorRowKey = "";
+  var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend35;
+    var _item$_extend$holder_, _item$_extend37;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
-    if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend34;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.rowKey);
-      return true;
-    }
-    if (item._extend.quantity > 1 && ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.holder_id) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.length) !== item._extend.quantity) {
+    if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_item$_extend$holder_ = item._extend.holder_id) === null || _item$_extend$holder_ === void 0 ? void 0 : _item$_extend$holder_.length) === 0)) {
       var _item$_extend36;
       errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
       return true;
     }
+    if (item._extend.quantity > 1 && ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.holder_id) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.length) !== item._extend.quantity) {
+      var _item$_extend38;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 || (_item$_extend38 = _item$_extend38.other) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.rowKey);
+      return true;
+    }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;

package/es/components/booking/components/voucher/index.js CHANGED Viewed

@@ -2,15 +2,15 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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); }); }; }
+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 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 _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 _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); }
@@ -43,7 +43,7 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value, _state$service2;
+  var _context$appHelper, _state$client$value, _state$service3;
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
@@ -74,6 +74,7 @@ var VoucherCard = function VoucherCard(props) {
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    var _state$service;
     dispatch({
       type: 'setClient',
       payload: {
@@ -81,6 +82,21 @@ var VoucherCard = function VoucherCard(props) {
         edit: true
       }
     });
+    if (state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) {
+      // 还需要清空商品内的 holder 信息
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: state.service.value.map(function (item) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+                holder_id: []
+              })
+            });
+          })
+        }
+      });
+    }
   });
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -158,8 +174,8 @@ var VoucherCard = function VoucherCard(props) {
     return false;
   }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
-      var _state$service;
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
+      var _state$service2;
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length)) {
         return;
       }
       if (isBooking4Shop) {
@@ -169,7 +185,7 @@ var VoucherCard = function VoucherCard(props) {
         productListToValue(val.productList);
       }
     }, {
-      wait: 1000
+      wait: 500
     }),
     run = _useDebounceFn.run;
@@ -327,7 +343,7 @@ var VoucherCard = function VoucherCard(props) {
       width: '100%'
     },
     isInModal: isInModal || false,
-    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    dataSource: (_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.value) !== null && _state$service3 !== void 0 && _state$service3.length ? availableData : [],
     mixedSort: mixedSort,
     onChange: function onChange(val) {
       var detail = shopDiscount.setDiscountSelected({

package/es/components/booking/dashboard/serve.js CHANGED Viewed

@@ -10,12 +10,7 @@ export var getBookingList = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().get("/shop/schedule/booking", params, {
-            cache: {
-              mode: "remote_local",
-              type: "indexDB"
-            }
-          });
+          return request.getRequest().get("/shop/schedule/booking", params);
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;