@pisell/private-materials 6.3.99 → 6.3.101

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

@@ -427,7 +427,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
+      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -452,27 +452,31 @@ var Footer = function Footer(props) {
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
+            // 超时保护: 超过20秒自动关闭loading
+            loadingTimer = setTimeout(function () {
+              _setLoading(false);
+            }, 20000);
             _getApis = getApis(), createBooking = _getApis.createBooking, editBooking = _getApis.editBooking;
             editApi = state.renderType === 'eventBooking' ? editEventBooking : editBooking;
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context4.next = 20;
+              _context4.next = 21;
               break;
             }
-            _context4.next = 16;
+            _context4.next = 17;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 16:
+          case 17:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 19;
+              _context4.next = 20;
               break;
             }
             _context4.t0 = {};
-          case 19:
-            saveOtherValue = _context4.t0;
           case 20:
-            _context4.prev = 20;
+            saveOtherValue = _context4.t0;
+          case 21:
+            _context4.prev = 21;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
@@ -528,43 +532,45 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 28;
+              _context4.next = 29;
               break;
             }
-            _context4.next = 28;
+            _context4.next = 29;
             return handleSaveAddons();
-          case 28:
+          case 29:
             if (!infoEdit) {
-              _context4.next = 33;
+              _context4.next = 34;
               break;
             }
-            _context4.next = 31;
+            _context4.next = 32;
             return api(values, state.bookingId);
-          case 31:
+          case 32:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 33:
+          case 34:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
+            clearTimeout(loadingTimer);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 38:
-            _context4.prev = 38;
-            _context4.t1 = _context4["catch"](20);
+          case 40:
+            _context4.prev = 40;
+            _context4.t1 = _context4["catch"](21);
             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);
             }
+            clearTimeout(loadingTimer);
             _setLoading(false);
-          case 43:
+          case 46:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[20, 38]]);
+      }, _callee4, null, [[21, 40]]);
     }));
     return function handleSave(_x2) {
       return _ref5.apply(this, arguments);

package/es/components/booking/info/header/index.js

@@ -52,19 +52,19 @@ var header = function header(_ref) {
   var statusList = [{
     label: locales.getText('pisell2.text.status.new'),
     key: 'new',
-    color: '#079455'
+    color: '#91caff'
   }, {
     label: locales.getText('pisell2.text.status.confirmed'),
     key: 'confirmed',
-    color: '#7F56D9'
+    color: '#b7eb8f'
   }, {
     label: locales.getText('pisell2.text.status.arrived'),
     key: 'arrived',
-    color: '#088AB2'
+    color: '#d3adf7'
   }, {
     label: locales.getText('pisell2.text.status.started'),
     key: 'started',
-    color: '#155EEF'
+    color: '#fffb8f'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -72,7 +72,7 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.cancelled')),
     key: 'cancelled',
-    color: '#DC6803'
+    color: '#bfbfbf'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -80,11 +80,11 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.no_show')),
     key: 'no_show',
-    color: '#D92D20'
+    color: '#ffa39e'
   }, {
     label: locales.getText('pisell2.text.status.completed'),
     key: 'completed',
-    color: '#4A5578'
+    color: '#ffd591'
   }];
 
   // 销售渠道

package/es/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

package/es/components/ecocup/components/AddCustomerModal/index.js

@@ -200,10 +200,10 @@ var AddCustomerModal = function AddCustomerModal(props) {
     renderMode: "edit",
     name: "membership",
     label: locales.getText('pisell2.text.ecocup.add-customer-modal.membership'),
-    defaultValue: "normal",
+    defaultValue: "regular",
     options: [{
-      label: 'Normal',
-      value: 'normal'
+      label: 'Regular',
+      value: 'regular'
     }, {
       label: 'Business',
       value: 'business'

package/es/components/ecocup/components/CupInfoCard/index.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import './index.less';
 interface IProps {
-    type: 'rentInfo' | 'markInfo' | 'belongInfo';
+    type: 'rentInfo' | 'markInfo' | 'belongInfo' | 'otherBelongInfo';
     data: Record<string, any>;
+    isMultipleShop?: boolean;
+    isMultipleTime?: boolean;
 }
 declare const CupInfoCard: (props: IProps) => React.JSX.Element;
 export default CupInfoCard;

package/es/components/ecocup/components/CupInfoCard/index.js

@@ -4,9 +4,11 @@ import dayjs from 'dayjs';
 import "./index.less";
 var CupInfoCard = function CupInfoCard(props) {
   var type = props.type,
-    data = props.data;
+    data = props.data,
+    isMultipleShop = props.isMultipleShop,
+    isMultipleTime = props.isMultipleTime;
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell2-ecocup-cup-info-card"
-  }, /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.ecocup.cup-info-card.title.".concat(type))), /*#__PURE__*/React.createElement("div", null, (data === null || data === void 0 ? void 0 : data.shop) || '-'), /*#__PURE__*/React.createElement("div", null, data !== null && data !== void 0 && data.time ? dayjs(data === null || data === void 0 ? void 0 : data.time).format('HH:mm DD/MM/YYYY') : '-'));
+  }, /*#__PURE__*/React.createElement("div", null, locales.getText("pisell2.text.ecocup.cup-info-card.title.".concat(type))), isMultipleShop ? locales.getText('pisell2.text.ecocup.cup-info-card.title.multiple-shop') : /*#__PURE__*/React.createElement("div", null, (data === null || data === void 0 ? void 0 : data.shop) || '-'), isMultipleTime ? locales.getText('pisell2.text.ecocup.cup-info-card.title.multiple-time') : /*#__PURE__*/React.createElement("div", null, data !== null && data !== void 0 && data.time ? dayjs(data === null || data === void 0 ? void 0 : data.time).format('HH:mm DD/MM/YYYY') : '-'));
 };
 export default CupInfoCard;

package/es/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -1,5 +1,36 @@
-import { ECupActionType } from '../../types';
+import { ECupActionType, ICup } from '../../types';
 export declare const useCupAction: () => {
     run: (this: unknown, cupId: string, action: ECupActionType) => Promise<boolean>;
     loading: boolean;
 };
+/**
+ * @description: 批量归还杯子
+ * @return {*}
+ */
+export declare const useBatchCupAction: () => {
+    run: (this: unknown, eco_cup_ids: number[] | string[]) => Promise<boolean>;
+    loading: boolean;
+};
+/**
+ * @description: 统计杯子列表中的客户、店铺、时间数量
+ * @param {ICup[]} cupList - 杯子列表
+ * @return {object} 返回统计信息和是否为多个的标识
+ */
+export declare const useCupListStatistics: (cupList: ICup[]) => {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: import("../../types").ICustomer | undefined;
+    uniqueShop: {
+        id: string;
+        name: string;
+    } | undefined;
+    uniqueTime: string | undefined;
+} | {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: null;
+    uniqueShop: null;
+    uniqueTime: null;
+};

package/es/components/ecocup/components/CupStatusModal/hooks.js

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState } from 'react';
+import { useState, useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import { useGetGoalShopInfo, useRequest } from "../../hooks";
 export var useCupAction = function useCupAction() {
@@ -65,4 +65,112 @@ export var useCupAction = function useCupAction() {
     run: run,
     loading: loading
   };
+};
+
+/**
+ * @description: 批量归还杯子
+ * @return {*}
+ */
+export var useBatchCupAction = function useBatchCupAction() {
+  var _useRequest2 = useRequest(),
+    post = _useRequest2.post;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var run = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eco_cup_ids) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            setLoading(true);
+            _context2.next = 4;
+            return post('/shop/wallet/eco/cups-return', {
+              eco_cup_ids: eco_cup_ids
+            });
+          case 4:
+            res = _context2.sent;
+            if (!((res === null || res === void 0 ? void 0 : res.code) == 200)) {
+              _context2.next = 7;
+              break;
+            }
+            return _context2.abrupt("return", true);
+          case 7:
+            return _context2.abrupt("return", false);
+          case 10:
+            _context2.prev = 10;
+            _context2.t0 = _context2["catch"](0);
+            console.error(_context2.t0);
+            return _context2.abrupt("return", false);
+          case 14:
+            _context2.prev = 14;
+            setLoading(false);
+            return _context2.finish(14);
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[0, 10, 14, 17]]);
+    }));
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
+  return {
+    run: run,
+    loading: loading
+  };
+};
+
+/**
+ * @description: 统计杯子列表中的客户、店铺、时间数量
+ * @param {ICup[]} cupList - 杯子列表
+ * @return {object} 返回统计信息和是否为多个的标识
+ */
+export var useCupListStatistics = function useCupListStatistics(cupList) {
+  return useMemo(function () {
+    var _cupList$, _cupList$2, _cupList$3;
+    if (cupList.length === 0) {
+      return {
+        hasMultipleCustomers: false,
+        hasMultipleShops: false,
+        hasMultipleTimes: false,
+        uniqueCustomer: null,
+        uniqueShop: null,
+        uniqueTime: null
+      };
+    }
+
+    // 收集所有唯一的客户ID
+    var customerIds = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.customer_id;
+    }).filter(function (id) {
+      return id;
+    }));
+
+    // 收集所有唯一的店铺ID（current_shop）
+    var shopIds = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.current_shop_id;
+    }).filter(function (id) {
+      return id;
+    }));
+
+    // 收集所有唯一的时间（operated_at）
+    var times = new Set(cupList.map(function (cup) {
+      return cup === null || cup === void 0 ? void 0 : cup.operated_at;
+    }).filter(function (time) {
+      return time;
+    }));
+    var result = {
+      hasMultipleCustomers: customerIds.size > 1,
+      hasMultipleShops: shopIds.size > 1,
+      hasMultipleTimes: times.size > 1,
+      uniqueCustomer: (_cupList$ = cupList[0]) === null || _cupList$ === void 0 ? void 0 : _cupList$.customer,
+      uniqueShop: (_cupList$2 = cupList[0]) === null || _cupList$2 === void 0 ? void 0 : _cupList$2.current_shop,
+      uniqueTime: (_cupList$3 = cupList[0]) === null || _cupList$3 === void 0 ? void 0 : _cupList$3.operated_at
+    };
+    return result;
+  }, [cupList]);
 };