@pisell/private-materials 3.3.38 → 3.3.39

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

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

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

package/es/components/booking/info2/service/addTimeModal/index.d.ts

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

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts

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

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -148,7 +148,7 @@ var ContinueButton = function ContinueButton() {
         var _ref3 = item._originData || {},
           product = _ref3.product;
         var newProduct = productById[product.product_id];
-        // 目前默认按单件商品计算
+        // 目前默认按单件商品计算，即 价格 * 1
         var _totalPrice = Number(newProduct.price);
         if (!(item !== null && item !== void 0 && item._productDetail)) {
           // 没有 _productDetail 说明可能是普通商品 则直接替换价格
@@ -162,19 +162,8 @@ var ContinueButton = function ContinueButton() {
           _item$_productDetail$ = _item$_productDetail.bundle,
           bundle = _item$_productDetail$ === void 0 ? [] : _item$_productDetail$,
           options = _item$_productDetail.options;
-
-        // 1. 组合规格商品
-        if (product !== null && product !== void 0 && product.product_variant_id) {
-          var _newProduct$variant = newProduct.variant,
-            variant = _newProduct$variant === void 0 ? [] : _newProduct$variant;
-          var _variant = variant.find(function (v) {
-            return v.id === product.product_variant_id;
-          });
-          if (_variant) {
-            _totalPrice = Number(_variant.price);
-          }
-        } else if (
-        // 2. 套餐商品
+        if (
+        // 1. 套餐商品
         Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle) && product.product_bundle.length > 0) {
           // 登录后的最新商品分组信息
           var _newProduct$bundle_gr = newProduct.bundle_group,
@@ -201,7 +190,7 @@ var ContinueButton = function ContinueButton() {
               if ((_originBundleItemInfo === null || _originBundleItemInfo === void 0 ? void 0 : _originBundleItemInfo._bundle_product_id) === (_newBundleItemInfo === null || _newBundleItemInfo === void 0 ? void 0 : _newBundleItemInfo.bundle_product_id)) {
                 var price_type = _originBundleItemInfo.price_type,
                   _originBundleItemInfo2 = _originBundleItemInfo.num,
-                  num = _originBundleItemInfo2 === void 0 ? 0 : _originBundleItemInfo2,
+                  num = _originBundleItemInfo2 === void 0 ? 1 : _originBundleItemInfo2,
                   _originBundleItemOptions = _originBundleItemInfo.option;
                 var _bundleItemPrice = Number(_newBundleItemInfo.price);
                 if (price_type === 'markup') {
@@ -221,7 +210,7 @@ var ContinueButton = function ContinueButton() {
                     if (_originOptionItem) {
                       var price = _originOptionItem.price,
                         _originOptionItem$num = _originOptionItem.num,
-                        _optionNum = _originOptionItem$num === void 0 ? 0 : _originOptionItem$num;
+                        _optionNum = _originOptionItem$num === void 0 ? 1 : _originOptionItem$num;
                       _totalPrice += Number(price) * _optionNum;
                     }
                   };
@@ -235,23 +224,35 @@ var ContinueButton = function ContinueButton() {
           for (var i = 0; i < product.product_bundle.length; i++) {
             _loop();
           }
-        } else if (
-        // 3. 单规格商品
-        Array.isArray(product === null || product === void 0 ? void 0 : product.product_option_item) && product.product_option_item.length > 0) {
-          var _loop3 = function _loop3() {
-            var option_group_item_id = product.product_option_item[_i].option_group_item_id;
-            var _originOptionItem = options.find(function (op) {
-              return op.product_option_item_id === option_group_item_id;
+        } else {
+          // 2. 组合商品
+          if (product !== null && product !== void 0 && product.product_variant_id) {
+            var _newProduct$variant = newProduct.variant,
+              variant = _newProduct$variant === void 0 ? [] : _newProduct$variant;
+            var _variant = variant.find(function (v) {
+              return v.id === product.product_variant_id;
             });
-            if (_originOptionItem) {
-              var price = _originOptionItem.price,
-                _originOptionItem$num2 = _originOptionItem.num,
-                num = _originOptionItem$num2 === void 0 ? 0 : _originOptionItem$num2;
-              _totalPrice += Number(price) * num;
+            if (_variant) {
+              _totalPrice = Number(_variant.price);
+            }
+          }
+          // 3. 单规格商品
+          if (Array.isArray(product === null || product === void 0 ? void 0 : product.product_option_item) && product.product_option_item.length > 0) {
+            var _loop3 = function _loop3() {
+              var option_group_item_id = product.product_option_item[_i].option_group_item_id;
+              var _originOptionItem = options.find(function (op) {
+                return op.product_option_item_id === option_group_item_id;
+              });
+              if (_originOptionItem) {
+                var price = _originOptionItem.price,
+                  _originOptionItem$num2 = _originOptionItem.num,
+                  num = _originOptionItem$num2 === void 0 ? 1 : _originOptionItem$num2;
+                _totalPrice += Number(price) * num;
+              }
+            };
+            for (var _i = 0; _i < product.product_option_item.length; _i++) {
+              _loop3();
             }
-          };
-          for (var _i = 0; _i < product.product_option_item.length; _i++) {
-            _loop3();
           }
         }
         item.price = _totalPrice;

package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts

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

package/es/components/eventBooking/components/Provider/Cart/index.d.ts

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

package/es/components/eventBooking/components/Provider/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/eventBooking/components/Provider/Event/index.d.ts

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

package/es/components/eventBooking/components/Provider/Event/index.js

@@ -55,7 +55,7 @@ var Event = function Event() {
       customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
       open_quotation: 1
     });
-  }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer]);
+  }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer === null || customer === void 0 ? void 0 : customer.id]);
 
   /**
    * @title: 点击选择event

package/es/components/eventBooking/components/Provider/Footer/index.d.ts

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];

package/lib/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

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

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -103,16 +103,8 @@ var ContinueButton = () => {
           return item;
         }
         const { bundle = [], options } = item._productDetail;
-        if (product == null ? void 0 : product.product_variant_id) {
-          const { variant = [] } = newProduct;
-          const _variant = variant.find(
-            (v) => v.id === product.product_variant_id
-          );
-          if (_variant) {
-            _totalPrice = Number(_variant.price);
-          }
-        } else if (
-          // 2. 套餐商品
+        if (
+          // 1. 套餐商品
           Array.isArray(product == null ? void 0 : product.product_bundle) && product.product_bundle.length > 0
         ) {
           const { bundle_group = [] } = newProduct;
@@ -132,7 +124,7 @@ var ContinueButton = () => {
               if ((_originBundleItemInfo == null ? void 0 : _originBundleItemInfo._bundle_product_id) === (_newBundleItemInfo == null ? void 0 : _newBundleItemInfo.bundle_product_id)) {
                 const {
                   price_type,
-                  num = 0,
+                  num = 1,
                   option: _originBundleItemOptions
                 } = _originBundleItemInfo;
                 const _bundleItemPrice = Number(_newBundleItemInfo.price);
@@ -150,7 +142,7 @@ var ContinueButton = () => {
                       (op) => op.product_option_item_id === option_group_item_id
                     );
                     if (_originOptionItem) {
-                      const { price, num: _optionNum = 0 } = _originOptionItem;
+                      const { price, num: _optionNum = 1 } = _originOptionItem;
                       _totalPrice += Number(price) * _optionNum;
                     }
                   }
@@ -158,18 +150,26 @@ var ContinueButton = () => {
               }
             }
           }
-        } else if (
-          // 3. 单规格商品
-          Array.isArray(product == null ? void 0 : product.product_option_item) && product.product_option_item.length > 0
-        ) {
-          for (let i = 0; i < product.product_option_item.length; i++) {
-            const { option_group_item_id } = product.product_option_item[i];
-            const _originOptionItem = options.find(
-              (op) => op.product_option_item_id === option_group_item_id
+        } else {
+          if (product == null ? void 0 : product.product_variant_id) {
+            const { variant = [] } = newProduct;
+            const _variant = variant.find(
+              (v) => v.id === product.product_variant_id
             );
-            if (_originOptionItem) {
-              const { price, num = 0 } = _originOptionItem;
-              _totalPrice += Number(price) * num;
+            if (_variant) {
+              _totalPrice = Number(_variant.price);
+            }
+          }
+          if (Array.isArray(product == null ? void 0 : product.product_option_item) && product.product_option_item.length > 0) {
+            for (let i = 0; i < product.product_option_item.length; i++) {
+              const { option_group_item_id } = product.product_option_item[i];
+              const _originOptionItem = options.find(
+                (op) => op.product_option_item_id === option_group_item_id
+              );
+              if (_originOptionItem) {
+                const { price, num = 1 } = _originOptionItem;
+                _totalPrice += Number(price) * num;
+              }
             }
           }
         }

package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Content/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Event/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Event/index.js

@@ -69,7 +69,7 @@ var Event = () => {
       customer_id: customer == null ? void 0 : customer.id,
       open_quotation: 1
     });
-  }, [(_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.currentResourceItem) == null ? void 0 : _b.id, customer]);
+  }, [(_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.currentResourceItem) == null ? void 0 : _b.id, customer == null ? void 0 : customer.id]);
   const handleClick = (item) => {
     selectEvent(item);
     onOpenEventDetail(item);

package/lib/components/eventBooking/components/Provider/Footer/index.d.ts

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

package/lib/components/eventBooking/index.d.ts

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

package/lib/components/ticketBooking/components/ticketBooking/index.d.ts

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

package/lib/components/ticketBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.38",
+  "version": "3.3.39",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.3.14",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/materials": "3.3.14"
+    "@pisell/utils": "1.0.42",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",