@pisell/pisellos 0.0.177 → 0.0.179

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/dist/modules/Cart/utils/cartProduct.js

@@ -71,7 +71,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       product: product,
       bundle: bundle,
       options: options,
-      num: num
+      num: num,
+      discounts: discounts
     });
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
@@ -206,19 +207,11 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
 export var getProductOriginTotalPrice = function getProductOriginTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    discounts = params.discounts;
   var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
   var price = Number(product.original_price);
-
-  // if (product.discount_list?.length) {
-  //   price = product.discount_list.reduce((accumulator: any, currentValue: any) => {
-  //     return (
-  //       accumulator + Number(currentValue.price) * Number(currentValue.num)
-  //     );
-  //   }, price);
-  // }
-
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts !== null && discounts !== void 0 && discounts.length)) {
     return undefined;
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {

package/dist/modules/Date/index.js

@@ -154,7 +154,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource;
+          var _item$resource, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
           var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
@@ -163,6 +163,16 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               return m.id === n.id;
             }));
           });
+          // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
+          (_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
+            var _item$resource2;
+            var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
+              return m.id === n.id;
+            });
+            if (newResource) {
+              n.times = newResource.times;
+            }
+          });
           currentItem.resource = [].concat(_toConsumableArray(currentItem.resource || []), _toConsumableArray(newResource || []));
           currentDateList[currentItemIndex] = currentItem;
         } else {

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -82,7 +82,8 @@ var formatProductToCartItem = (params) => {
       product,
       bundle,
       options,
-      num
+      num,
+      discounts
     });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
@@ -189,10 +190,10 @@ var getProductTotalPrice = (params) => {
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts == null ? void 0 : discounts.length)) {
     return void 0;
   }
   if (bundle == null ? void 0 : bundle.length) {

package/lib/modules/Date/index.js

@@ -95,7 +95,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
   setDateList(dateList) {
     const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
     dateList.forEach((item) => {
-      var _a;
+      var _a, _b;
       const currentItemIndex = currentDateList.findIndex(
         (n) => n.date === item.date
       );
@@ -107,6 +107,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
             return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
           }
         );
+        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
+          var _a2;
+          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
+          if (newResource2) {
+            n.times = newResource2.times;
+          }
+        });
         currentItem.resource = [
           ...currentItem.resource || [],
           ...newResource || []

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.177",
+  "version": "0.0.179",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",