@pisell/private-materials 3.0.15 → 3.0.17

package/es/components/booking/components/footer/amount.js

@@ -25,7 +25,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var item = _step.value;
-          price += Number(item._extend.price) * (item._extend.quantity || 1);
+          price += Number(item._extend.total);
           duration += flexibleObj.getValue(item._extend.duration);
         }
       } catch (err) {
@@ -38,7 +38,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _item = _step2.value;
-          price += Number(_item.price) * _item.quantity;
+          price += Number(_item._extend.total) * _item._extend.quantity;
         }
       } catch (err) {
         _iterator2.e(err);
@@ -62,7 +62,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
 var getProductItemTax = function getProductItemTax(item, bookingDetail) {
   var price = 0;
   // 折扣后的金额 = 商品金额 - 商品折扣
-  var productDiscountPrice = Number(item.price);
+  var productDiscountPrice = Number(item.total);
   // 店铺税 = 折扣后的金额 * 店铺税率 * 商品是否收税  (is_charge_tax 0 为不收税)
   var shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   // 店铺税率  =  1 + 店铺税率 * 是否含税
@@ -83,10 +83,7 @@ var getProductItemTax = function getProductItemTax(item, bookingDetail) {
  * @Date: 2024-02-28 10:56
  */
 var getTotal = function getTotal(item) {
-  return item._extend.payment_price !== undefined ? item._extend.payment_price : item._extend.price;
-};
-var getAddonsTotal = function getAddonsTotal(item) {
-  return item.payment_price !== undefined ? item.payment_price : item.price;
+  return item._extend.payment_price !== undefined ? item._extend.payment_price : item._extend.total;
 };
 
 /**
@@ -112,7 +109,8 @@ var getTax = function getTax(state, isEdit) {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var item = _step3.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
-          price: getTotal(item),
+          total: getTotal(item),
+          price: item._extend.price,
           quantity: item._extend.quantity
         }), state.bookingDetail);
       }
@@ -127,8 +125,9 @@ var getTax = function getTax(state, isEdit) {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var _item2 = _step4.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, _item2), {}, {
-          price: getAddonsTotal(_item2),
-          quantity: _item2.quantity
+          total: getTotal(_item2),
+          price: _item2._extend.price,
+          quantity: _item2._extend.quantity
         }), state.bookingDetail);
       }
     } catch (err) {

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

@@ -317,8 +317,11 @@ var Footer = function Footer(props) {
             _context4.prev = 30;
             _context4.t1 = _context4["catch"](13);
             console.log(_context4.t1);
+            if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
+              message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
+            }
             _setLoading(false);
-          case 34:
+          case 35:
           case "end":
             return _context4.stop();
         }

package/es/components/booking/components/footer/utils.d.ts

@@ -1 +1,19 @@
+/**
+ * @title: 套餐单规格信息
+ * @description:
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductOption: (option: any) => any;
+/**
+ * @title: 套餐信息
+ * @description:
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductBundle: (bundle: any) => any;
 export declare const formatValues: (state: any) => any;

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

@@ -24,28 +24,90 @@ var formatCustomer = function formatCustomer(data) {
     country_calling_code: (_data$client6 = data.client) === null || _data$client6 === void 0 ? void 0 : (_data$client6$value = _data$client6.value) === null || _data$client6$value === void 0 ? void 0 : _data$client6$value.country_calling_code
   };
 };
+
+/**
+ * @title: 套餐单规格信息
+ * @description: 
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export var formatProductOption = function formatProductOption(option) {
+  if (!option) {
+    return [];
+  }
+  return option.map(function (d) {
+    return {
+      "num": d.num,
+      "option_group_item_id": d.product_option_item_id,
+      "option_group_id": d.option_group_id
+    };
+  });
+};
+
+/**
+ * @title: 套餐信息
+ * @description: 
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export var formatProductBundle = function formatProductBundle(bundle) {
+  if (!bundle) {
+    return;
+  }
+  return bundle.map(function (d) {
+    return {
+      "bundle_group_id": d.group_id,
+      "bundle_id": d.id,
+      "bundle_product_id": d._bundle_product_id,
+      "bundle_variant_id": d.bundle_variant_id,
+      "num": d.num,
+      "extension_id": d.extension_id,
+      "extension_type": d.extension_type,
+      "option": formatProductOption(d.option)
+    };
+  });
+};
+
+/**
+ * @title: 预约商品信息
+ * @description: 
+ * @param {any} data
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
 var formatBookings = function formatBookings(data) {
   var list = data.service.value;
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   bookings = list.map(function (item) {
+    var _item$_extend, _item$_extend$other;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
-    var start_time = item._extend.startDate.format("HH:mm");
     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 total = Number(item._extend.total);
+    var origin_total = Number(item._extend.origin_total);
+    var discount_amount = origin_total - total;
     return _objectSpread({
       "product": {
         "num": item._extend.quantity,
-        "price": item.price,
+        "price": item._extend.price,
         "product_id": item.id,
-        "discount_amount": Number(item.price) - Number(item._extend.price),
+        "discount_amount": discount_amount,
         "product_discount_reason": item._extend.discount_reason || '',
         "is_charge_tax": item.is_charge_tax,
         "note": "",
         "discountway": item._extend.discountway || "num",
         "discount_per": item._extend.discount_per,
         "discount_type": item._extend.discount_type || "discount",
-        "order_detail_id": item._extend.order_detail_id || 0
+        "order_detail_id": item._extend.order_detail_id || 0,
+        "product_bundle": formatProductBundle((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle),
+        "bundle_edit": item._extend.bundle_edit
       },
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id,
@@ -65,6 +127,16 @@ var formatBookings = function formatBookings(data) {
   });
   return bookings;
 };
+
+/**
+ * @title: 预约主体信息
+ * @description: 
+ * @param {any} data
+ * @param {any} values
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
 var formatHolder = function formatHolder(data, values) {
   var _data$bookingConfig, _data$bookingConfig$c, _data$bookingConfig$c2, _data$bookingConfig$c3, _data$pet$value, _data$pet, _data$pet$originValue, _data$pet$originValue2;
   var form_id = (data === null || data === void 0 ? void 0 : (_data$bookingConfig = data.bookingConfig) === null || _data$bookingConfig === void 0 ? void 0 : (_data$bookingConfig$c = _data$bookingConfig.config) === null || _data$bookingConfig$c === void 0 ? void 0 : (_data$bookingConfig$c2 = _data$bookingConfig$c.basic) === null || _data$bookingConfig$c2 === void 0 ? void 0 : (_data$bookingConfig$c3 = _data$bookingConfig$c2.appointment_subject) === null || _data$bookingConfig$c3 === void 0 ? void 0 : _data$bookingConfig$c3.form_id) || 0;

package/es/components/booking/forms/forms.d.ts

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

package/es/components/booking/forms/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

package/es/components/booking/forms/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/forms/single/index.js

@@ -5,19 +5,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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); }
-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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useCallback, useState, useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import FileDownload02 from "@pisell/icon/es/FileDownload02";
 import { image, locales } from "@pisell/utils";
 import { Avatar } from "antd";
 import CustomSelect from "../../components/customSelect";
+import CollapsibleList from "../../components/collapsibleList";
 import "./index.less";
-var MAX_LIMIT = 3;
 
 /**
  * @title: 表单选择器
@@ -39,10 +33,6 @@ var Single = function Single(_ref) {
     addButtonProps = _ref.addButtonProps,
     modalOpen = _ref.modalOpen,
     watch = _ref.watch;
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    maxLimit = _useState2[0],
-    setMaxLimit = _useState2[1];
   // const primaryField = useMemo(() => {
   // 	return field.field[0]?.key || "";
   // }, [field]);
@@ -125,69 +115,20 @@ var Single = function Single(_ref) {
    */
   var renderItem = useCallback(function (fieldData) {
     var _fields = form.field || [];
-
-    // 默认展示3条, 点击更多时展示全部
-    var _maxLimit = maxLimit[fieldData.form_record_id] || MAX_LIMIT;
-    if (_fields.length > _maxLimit) {
-      _fields = _fields.slice(0, _maxLimit);
-    }
-    return _fields.map(function (field) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item",
-        key: field.key
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item-label"
-      }, field.field_column.title), /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item-value"
-      }, renderFieldValue(fieldData, field)));
+    return /*#__PURE__*/React.createElement(CollapsibleList, {
+      list: _fields,
+      renderItem: function renderItem(field) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item",
+          key: field.key
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item-label"
+        }, field.field_column.title), /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item-value"
+        }, renderFieldValue(fieldData, field)));
+      }
     });
-  }, [form, maxLimit]);
-
-  /**
-   * @title: 展开和收起
-   * @description:
-   * @param {any} d
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var handlePreviewAll = function handlePreviewAll(d) {
-    var _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-    if (_maxLimit === MAX_LIMIT) {
-      _maxLimit = 99;
-    } else {
-      _maxLimit = MAX_LIMIT;
-    }
-    setMaxLimit(_objectSpread(_objectSpread({}, maxLimit), {}, _defineProperty({}, d.form_record_id, _maxLimit)));
-  };
-
-  /**
-   * @title: 是否展开全部
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var showAll = useMemo(function () {
-    var _field = form.field || [];
-    return _field.length > MAX_LIMIT;
-  }, [maxLimit, form]);
-
-  /**
-   * @title: 展开文案
-   * @description:
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var viewAllText = useCallback(function (d) {
-    var _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-    if (_maxLimit === MAX_LIMIT) {
-      return locales.getText("pisell2.text.view-all");
-    }
-    return locales.getText("pisell2.text.view-less");
-  }, [maxLimit]);
+  }, [form]);
 
   /**
    * @title: 渲染字段
@@ -259,14 +200,7 @@ var Single = function Single(_ref) {
     mode: _mode,
     previewItemClassName: "pisell-lowcode__booking-pet-card",
     previewItemRender: function previewItemRender(d) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, renderItem(d), showAll ? /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-view-all",
-        onClick: function onClick(e) {
-          e.preventDefault();
-          e.stopPropagation();
-          handlePreviewAll(d);
-        }
-      }, viewAllText(d)) : null);
+      return renderItem(d);
     },
     name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || "-",
     addButtonProps: _addButtonProps,

package/es/components/booking/index.d.ts

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => any;
+declare const Booking: (props: any) => JSX.Element;
 export default Booking;

package/es/components/booking/info/index.d.ts

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => any;
+declare const Info: (props: any) => JSX.Element;
 export default Info;

package/es/components/booking/info/model.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {