@pisell/private-materials 3.0.67 → 3.0.68

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

@@ -30,7 +30,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, localStorage.getItem("umi_locale") || "en");
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _context$appHelper3, _context$appHelper3$u, _modal$state5, _React$createElement;
+  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _context$appHelper4, _context$appHelper4$u, _modal$state5, _React$createElement;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -61,7 +61,7 @@ var Info = Provider(function (props) {
     }
   }, []);
   useEffect(function () {
-    var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2;
+    var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2, _context$appHelper3, _context$appHelper3$u, _context$appHelper3$u2, _context$appHelper3$u3, _context$appHelper3$u4, _context$appHelper3$u5;
     var isFranchisee = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.businessUtils) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.getAppByModal) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -69,7 +69,8 @@ var Info = Provider(function (props) {
         setGlobalState: props.setGlobalState
       }, globalState), {}, {
         isTerminal: context === null || context === void 0 ? void 0 : (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : (_context$appHelper2$u = _context$appHelper2.utils) === null || _context$appHelper2$u === void 0 ? void 0 : (_context$appHelper2$u2 = _context$appHelper2$u.isTerminal) === null || _context$appHelper2$u2 === void 0 ? void 0 : _context$appHelper2$u2.call(_context$appHelper2$u),
-        isFranchisee: isFranchisee
+        isFranchisee: isFranchisee,
+        timezone: context === null || context === void 0 ? void 0 : (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : (_context$appHelper3$u = _context$appHelper3.utils) === null || _context$appHelper3$u === void 0 ? void 0 : (_context$appHelper3$u2 = _context$appHelper3$u.store) === null || _context$appHelper3$u2 === void 0 ? void 0 : (_context$appHelper3$u3 = _context$appHelper3$u2.getState()) === null || _context$appHelper3$u3 === void 0 ? void 0 : (_context$appHelper3$u4 = _context$appHelper3$u3.global) === null || _context$appHelper3$u4 === void 0 ? void 0 : (_context$appHelper3$u5 = _context$appHelper3$u4.globalConfig) === null || _context$appHelper3$u5 === void 0 ? void 0 : _context$appHelper3$u5.timezone
       })
     });
   }, [globalState]);
@@ -115,7 +116,7 @@ var Info = Provider(function (props) {
       source: "info"
     })
   }, _defineProperty(_React$createElement, "style", {
-    height: context !== null && context !== void 0 && (_context$appHelper3 = context.appHelper) !== null && _context$appHelper3 !== void 0 && (_context$appHelper3$u = _context$appHelper3.utils) !== null && _context$appHelper3$u !== void 0 && _context$appHelper3$u.isMobile ? "100%" : "100vh"
+    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? "100%" : "100vh"
   }), _defineProperty(_React$createElement, "bodyClassName", "booking-info-warp"), _React$createElement), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
   }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && _modal$state5.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === "form" ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null)) : null);

package/es/components/booking/info/service/editService/index.js

@@ -29,12 +29,13 @@ import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn } from "ahooks";
+// import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getErrorList, getServiceTimes, deleteCacheParams } from "../../../utils";
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7, _state$bookingConfig8;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -540,6 +541,7 @@ var Info = function Info() {
   useEffect(function () {
     getResourcesData();
   }, [state.date.value]);
+  var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     zIndex: 1000,
     forceRender: true,
@@ -642,9 +644,22 @@ var Info = function Info() {
     rules: [{
       required: true
     }]
-  }, /*#__PURE__*/React.createElement(Select, {
-    size: "large"
-  }, renderOptions(timeObj.timeSlices)))), /*#__PURE__*/React.createElement(Col, {
+  }, SelectTime ? /*#__PURE__*/React.createElement(SelectTime, {
+    slice: (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 ? void 0 : (_state$bookingConfig6 = _state$bookingConfig5.config) === null || _state$bookingConfig6 === void 0 ? void 0 : (_state$bookingConfig7 = _state$bookingConfig6.basic) === null || _state$bookingConfig7 === void 0 ? void 0 : (_state$bookingConfig8 = _state$bookingConfig7.service_time) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.value,
+    onChange: function onChange(e) {
+      console.log("eeee", e);
+    },
+    timePickerProps: {
+      style: {
+        width: "100%"
+      }
+    },
+    timeProps: {
+      style: {
+        zoom: 0.8
+      }
+    }
+  }) : null)), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText("pisell2.text.duration"),

package/es/components/booking/utils.js

@@ -576,7 +576,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
       // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
-      _extend.start_time = 'now';
+      _extend.start_time = dayjs().format('HH:mm');
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);

package/lib/components/booking/info/index.js

@@ -83,7 +83,7 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -91,7 +91,8 @@ var Info = (0, import_model.Provider)((props) => {
         setGlobalState: props.setGlobalState,
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
-        isFranchisee
+        isFranchisee,
+        timezone: (_m = (_l = (_k = (_j = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone
       }
     });
   }, [globalState]);

package/lib/components/booking/info/service/editService/index.js

@@ -48,7 +48,7 @@ var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
 var import_utils4 = require("../addService/utils");
 var Info = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useLikeStatus = import_antd.Form.useWatch("like_status", form);
@@ -331,12 +331,13 @@ var Info = () => {
   (0, import_react.useEffect)(() => {
     getResourcesData();
   }, [state.date.value]);
+  const SelectTime = (_j = window.BaseMaterials) == null ? void 0 : _j.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       zIndex: 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_j = state.service.cacheItem) == null ? void 0 : _j.autoClose),
+      open: state.service.editModal && !((_k = state.service.cacheItem) == null ? void 0 : _k.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -365,7 +366,7 @@ var Info = () => {
           });
         }
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_m = (_l = (_k = state.service) == null ? void 0 : _k.cacheItem) == null ? void 0 : _l._extend) == null ? void 0 : _m.product_name) || "-"),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.product_name) || "-"),
       /* @__PURE__ */ import_react.default.createElement(
         import_collapsibleList.default,
         {
@@ -390,8 +391,8 @@ var Info = () => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_o = (_n = state.service.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.origin_total) || 0,
-          placeholder: ((_q = (_p = state.service.cacheItem) == null ? void 0 : _p._extend) == null ? void 0 : _q.origin_total) || "0"
+          max: ((_p = (_o = state.service.cacheItem) == null ? void 0 : _o._extend) == null ? void 0 : _p.origin_total) || 0,
+          placeholder: ((_r = (_q = state.service.cacheItem) == null ? void 0 : _q._extend) == null ? void 0 : _r.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
@@ -428,7 +429,21 @@ var Info = () => {
         name: "start_time",
         rules: [{ required: true }]
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { size: "large" }, renderOptions(timeObj.timeSlices))
+      SelectTime ? /* @__PURE__ */ import_react.default.createElement(
+        SelectTime,
+        {
+          slice: (_v = (_u = (_t = (_s = state.bookingConfig) == null ? void 0 : _s.config) == null ? void 0 : _t.basic) == null ? void 0 : _u.service_time) == null ? void 0 : _v.value,
+          onChange: (e) => {
+            console.log("eeee", e);
+          },
+          timePickerProps: {
+            style: { width: "100%" }
+          },
+          timeProps: {
+            style: { zoom: 0.8 }
+          }
+        }
+      ) : null
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {

package/lib/components/booking/utils.js

@@ -440,7 +440,7 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
     if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
-      _extend.start_time = "now";
+      _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
     }
   }
   _extend = {

package/package.json

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