@pisell/materials 1.0.466 → 1.0.467

package/es/components/productCard/utils.js

@@ -145,7 +145,7 @@ export var getServeStartTime = function getServeStartTime(start_time) {
  * @Date: 2024-04-26 14:04
  */
 export var getServiceTime = function getServiceTime(item, currentDate) {
-  var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend5, _item$_extend6;
+  var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend6, _item$_extend7;
   if (!currentDate || !(item !== null && item !== void 0 && (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.start_time) || !dayjs(currentDate).isValid()) return '';
   var locale = (item === null || item === void 0 ? void 0 : item.locale) || 'en-US';
   var isEn = locale === 'en-US' || locale === 'en';
@@ -155,19 +155,17 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
 
   // 跨日
   if ((item === null || item === void 0 ? void 0 : (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.sub_type) === 'days') {
-    var _item$_extend4;
-    // 结束日期 + 1 分钟计算天数
-    var endDate = dayjs(item === null || item === void 0 ? void 0 : (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date);
-    var newEndDate = endDate.add(1, 'minute');
-    var _endTime = endDate.format('HH:mm');
-    var diffInDays = newEndDate.diff(startDate, 'day');
+    var _item$_extend4, _item$_extend5;
+    var _startDate = dayjs(item === null || item === void 0 ? void 0 : (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_date);
+    var endDate = dayjs(item === null || item === void 0 ? void 0 : (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.end_date);
+    var diffInDays = endDate.diff(_startDate, 'day');
     var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
-    var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
+    var date = "".concat(_startDate.format(_format), " ~ ").concat(endDate.format(_format));
     var _duration = "".concat(diffInDays, " ").concat(locales.getText('pisell2.product.card.day')(diffInDays));
     return "".concat(date, " (").concat(_duration, ")");
   }
-  var endTime = startDate.add(flexibleObj.getValue(item === null || item === void 0 ? void 0 : (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration), 'minute').format('HH:mm');
-  var duration = getDiscountTime(flexibleObj.getValue(item === null || item === void 0 ? void 0 : (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.duration));
+  var endTime = startDate.add(flexibleObj.getValue(item === null || item === void 0 ? void 0 : (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.duration), 'minute').format('HH:mm');
+  var duration = getDiscountTime(flexibleObj.getValue(item === null || item === void 0 ? void 0 : (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.duration));
   return "".concat(startTime, " - ").concat(endTime, " ( ").concat(duration, " )");
 };
 export var findNextSlice = function findNextSlice(_ref) {
@@ -623,10 +621,10 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
 
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend7;
+  var _item$_extend8;
   var price = 0;
   price += Number(item._extend.price);
-  var other = (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.other;
+  var other = (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.other;
   if (other !== null && other !== void 0 && other.bundle) {
     // bundle
     price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {

package/lib/components/productCard/utils.js

@@ -137,7 +137,7 @@ var getServeStartTime = (start_time) => {
   return start_time;
 };
 var getServiceTime = (item, currentDate) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (!currentDate || !((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.start_time) || !(0, import_dayjs.default)(currentDate).isValid())
     return "";
   const locale = (item == null ? void 0 : item.locale) || "en-US";
@@ -148,17 +148,16 @@ var getServiceTime = (item, currentDate) => {
   );
   const startTime = startDate.format("HH:mm");
   if (((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.sub_type) === "days") {
-    const endDate = (0, import_dayjs.default)((_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.end_date);
-    const newEndDate = endDate.add(1, "minute");
-    const endTime2 = endDate.format("HH:mm");
-    const diffInDays = newEndDate.diff(startDate, "day");
+    const startDate2 = (0, import_dayjs.default)((_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.start_date);
+    const endDate = (0, import_dayjs.default)((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.end_date);
+    const diffInDays = endDate.diff(startDate2, "day");
     const _format = isEn ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
-    const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
+    const date = `${startDate2.format(_format)} ~ ${endDate.format(_format)}`;
     const duration2 = `${diffInDays} ${import_utils.locales.getText("pisell2.product.card.day")(diffInDays)}`;
     return `${date} (${duration2})`;
   }
-  const endTime = startDate.add(flexibleObj.getValue((_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.duration), "minute").format("HH:mm");
-  const duration = getDiscountTime(flexibleObj.getValue((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.duration));
+  const endTime = startDate.add(flexibleObj.getValue((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.duration), "minute").format("HH:mm");
+  const duration = getDiscountTime(flexibleObj.getValue((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.duration));
   return `${startTime} - ${endTime} ( ${duration} )`;
 };
 var findNextSlice = ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.466",
+  "version": "1.0.467",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",