@pisell/pisellos 0.0.44 → 0.0.45

package/dist/modules/Cart/index.js

@@ -21,9 +21,9 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { cloneDeep } from "lodash-es";
 import { BaseModule } from "../BaseModule";
-import { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { cloneDeep } from 'lodash-es';
 export * from "./types";
 
 /**
@@ -37,8 +37,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     _classCallCheck(this, CartModule);
     _this = _super.call(this, name, version);
     // 提供给 baseModule 用的默认名称 和 默认版本
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "cart");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'cart');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
@@ -76,22 +76,22 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 获取依赖的插件
-              this.request = core.getPlugin("request");
-              this.window = core.getPlugin("window");
+              this.request = core.getPlugin('request');
+              this.window = core.getPlugin('window');
               if (this.request) {
                 _context.next = 9;
                 break;
               }
-              throw new Error("购物车模块需要 request 插件支持");
+              throw new Error('购物车模块需要 request 插件支持');
             case 9:
               if (this.window) {
                 _context.next = 11;
                 break;
               }
-              throw new Error("购物车模块需要 window 插件支持");
+              throw new Error('购物车模块需要 window 插件支持');
             case 11:
               // this.store.temp = {};
-              console.log("[CartModule] 初始化完成");
+              console.log('[CartModule] 初始化完成');
             case 12:
             case "end":
               return _context.stop();
@@ -111,11 +111,11 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     key: "addItem",
     value: (function () {
       var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var account, product, bundle, options, cartItem, items;
+        var account, product, bundle, options, date, cartItem, items;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              account = params.account, product = params.product, bundle = params.bundle, options = params.options; // 生成一个唯一的 ID
+              account = params.account, product = params.product, bundle = params.bundle, options = params.options, date = params.date; // 生成一个唯一的 ID
               cartItem = {
                 _id: getUniqueId(),
                 _origin: createCartItemOrigin()
@@ -135,15 +135,21 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
                   account: account
                 });
               }
+              if (date) {
+                cartItem = formatDateToCartItem({
+                  cartItem: cartItem,
+                  date: date
+                });
+              }
 
               // 更新购物车数据
               items = [].concat(_toConsumableArray(this.store.list), [cartItem]);
               this.store.list = items;
 
               // 触发事件
-              _context2.next = 8;
+              _context2.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onAddItem"), cartItem);
-            case 8:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -184,7 +190,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
             case 8:
               _context3.prev = 8;
               _context3.t0 = _context3["catch"](0);
-              console.error("[CartModule] 更新购物车商品失败", _context3.t0);
+              console.error('[CartModule] 更新购物车商品失败', _context3.t0);
             case 11:
             case "end":
               return _context3.stop();
@@ -209,12 +215,13 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         product = params.product,
         discounts = params.discounts,
         resources = params.resources,
-        note = params.note;
+        note = params.note,
+        date = params.date;
       var tempCartItem = this.store.list.find(function (i) {
         return i._id === _id;
       });
       if (!tempCartItem) {
-        throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
+        throw new Error('[CartModule] 格式化数据到购物车失败，商品不存在');
       }
       if (cartItem) {
         tempCartItem = cartItem;
@@ -244,6 +251,12 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           resources: resources
         });
       }
+      if (date) {
+        tempCartItem = formatDateToCartItem({
+          cartItem: tempCartItem,
+          date: date
+        });
+      }
       if (note) {
         tempCartItem = formatNoteToCartItem({
           cartItem: tempCartItem,
@@ -356,9 +369,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     value: function deleteCartItemInfo(types) {
       var list = this.store.list.map(function (item) {
         // 清除购物车商品中的资源信息
-        if (types === "resource") {
+        if (types === 'resource') {
           item = deleteResourceFromCartItem(item);
-        } else if (types === "time") {
+        } else if (types === 'time') {
           // 清除购物车商品中的时间信息
           item = deleteTimeFromCartItem(item);
         }
@@ -390,7 +403,7 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: store,
-          cacheKey: ["list"]
+          cacheKey: ['list']
         });
       }
     }

package/dist/modules/Cart/types.d.ts

@@ -1,6 +1,6 @@
-import { ProductData } from "../Product/types";
-import { Account } from "../Account/types";
-import { Resource } from "../Resource/types";
+import { ProductData } from '../Product/types';
+import { Account } from '../Account/types';
+import { Resource } from '../Resource/types';
 export declare enum CartHooks {
     OnAddItem = "card:onAddItem",
     OnCartChange = "card:onCartChange",
@@ -57,7 +57,7 @@ export interface CartItem {
     /** 备注 */
     note?: string;
     /** 点赞状态 */
-    like_status?: "like" | "common";
+    like_status?: 'like' | 'common';
     /** 用户名称 */
     holder_title?: string;
     /** 用户ID */
@@ -127,6 +127,13 @@ export interface IAddItemParams {
     bundle?: any[];
     /** 商品规格信息 */
     options?: any[];
+    /** 日期 */
+    date?: {
+        /** 开始时间 */
+        startTime: string;
+        /** 结束时间 */
+        endTime: string;
+    };
 }
 /**
  * 更新购物车信息参数
@@ -148,6 +155,13 @@ export interface IUpdateItemParams {
     resources?: Resource[];
     /** 备注 */
     note?: string;
+    /** 日期 */
+    date?: {
+        /** 开始时间 */
+        startTime: string;
+        /** 结束时间 */
+        endTime: string;
+    };
 }
 /**
  * 折扣

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

@@ -1,8 +1,8 @@
-import { Account } from "../Account";
-import { ProductData } from "../Product/types";
-import { Resource } from "../Resource/types";
-import { CartItem, IDiscount } from "./types";
-import Decimal from "decimal.js";
+import { Account } from '../Account';
+import { ProductData } from '../Product/types';
+import { Resource } from '../Resource/types';
+import { CartItem, IDiscount } from './types';
+import Decimal from 'decimal.js';
 /**
  * 生成一个唯一的 ID
  */
@@ -90,6 +90,30 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 格式化日期到购物车
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期
+ */
+export declare const formatDateToCartItem: (params: {
+    cartItem: CartItem;
+    date: {
+        startTime: string;
+        endTime: string;
+    };
+}) => CartItem;
+/**
+ * 格式化日期到购物车原始数据
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期原始数据
+ */
+export declare const formatDateToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    date: {
+        startTime: string;
+        endTime: string;
+    };
+}) => any;
 /**
  * 从购物车中删除资源相关信息
  * @param cartItem 购物车

package/dist/modules/Cart/utils.js

@@ -10,16 +10,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from "dayjs";
-import Decimal from "decimal.js";
+import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
 
 /**
  * 生成一个唯一的 ID
  */
 export var getUniqueId = function getUniqueId() {
-  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
-  return prefix + (Math.random() + "").replace(/\D/g, "").substring(0, maxLength);
+  return prefix + (Math.random() + '').replace(/\D/g, '').substring(0, maxLength);
 };
 
 /**
@@ -32,7 +32,7 @@ export var createCartItemOrigin = function createCartItemOrigin() {
     // 数量 固定为1
     number: 1,
     // 客户端报名所有活动;
-    registration_type: "all",
+    registration_type: 'all',
     // 暂时不用
     relation_products: [],
     // 固定
@@ -45,7 +45,7 @@ export var createCartItemOrigin = function createCartItemOrigin() {
     duration: null,
     // 资源相关
     // 资源状态 -固定
-    like_status: "common",
+    like_status: 'common',
     // 资源类型 - 固定--谭景琳备注：马天宇说现在平行资源是不传这个的
     // relation_type: "form",
     // 所选资源
@@ -100,7 +100,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       num: num
     });
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
-    cartItem.like_status = "common";
+    cartItem.like_status = 'common';
     cartItem.duration = product === null || product === void 0 ? void 0 : product.duration;
     cartItem.isNormalProduct = isNormalProduct(product);
     cartItem.is_charge_tax = product === null || product === void 0 ? void 0 : product.is_charge_tax;
@@ -206,7 +206,19 @@ export var formatAccountToCartItemOrigin = function formatAccountToCartItemOrigi
     account = params.account;
   var origin = cartItem._origin;
   if (account) {
-    origin.metadata.account = account;
+    if ((account === null || account === void 0 ? void 0 : account.type) === 'holder') {
+      var _ref = (account === null || account === void 0 ? void 0 : account._origin) || {},
+        customer_id = _ref.customer_id,
+        form_id = _ref.form_id,
+        form_record_id = _ref.form_record_id;
+      origin.holder = {
+        customer_id: customer_id,
+        form_id: form_id,
+        form_record: form_record_id ? [form_record_id] : null
+      };
+    } else {
+      origin.metadata.account = account;
+    }
   }
   return origin;
 };
@@ -224,10 +236,10 @@ export var formatResourceToCartItem = function formatResourceToCartItem(params)
     cartItem.resource_id = firstResource === null || firstResource === void 0 ? void 0 : firstResource.id;
     cartItem.relation_form_name = firstResource === null || firstResource === void 0 ? void 0 : firstResource.main_field;
     if (firstResource.startTime && firstResource.endTime) {
-      cartItem.start_date = dayjs(firstResource.startTime).format("YYYY-MM-DD");
-      cartItem.start_time = dayjs(firstResource.startTime).format("HH:mm");
-      cartItem.end_date = dayjs(firstResource.endTime).format("YYYY-MM-DD");
-      cartItem.end_time = dayjs(firstResource.endTime).format("HH:mm");
+      cartItem.start_date = dayjs(firstResource.startTime).format('YYYY-MM-DD');
+      cartItem.start_time = dayjs(firstResource.startTime).format('HH:mm');
+      cartItem.end_date = dayjs(firstResource.endTime).format('YYYY-MM-DD');
+      cartItem.end_time = dayjs(firstResource.endTime).format('HH:mm');
     }
   } else {
     cartItem.resource_id = undefined;
@@ -257,8 +269,8 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
           checkResourcesFormat(resource.children, childArr);
         }
         var obj = {
-          relation_type: "form",
-          like_status: "common",
+          relation_type: 'form',
+          like_status: 'common',
           id: resource.id,
           main_field: resource.main_field,
           resourceType: resource.resourceType,
@@ -278,11 +290,11 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
       startTime = _resources$.startTime,
       endTime = _resources$.endTime;
     if (startTime && endTime) {
-      origin.select_date = dayjs(startTime).format("YYYY-MM-DD");
-      origin.start_date = dayjs(startTime).format("YYYY-MM-DD");
-      origin.start_time = dayjs(startTime).format("HH:mm");
-      origin.end_date = dayjs(endTime).format("YYYY-MM-DD");
-      origin.end_time = dayjs(endTime).format("HH:mm");
+      origin.select_date = dayjs(startTime).format('YYYY-MM-DD');
+      origin.start_date = dayjs(startTime).format('YYYY-MM-DD');
+      origin.start_time = dayjs(startTime).format('HH:mm');
+      origin.end_date = dayjs(endTime).format('YYYY-MM-DD');
+      origin.end_time = dayjs(endTime).format('HH:mm');
     }
   } else if ((resources === null || resources === void 0 ? void 0 : resources.length) === 0) {
     origin.resources = [];
@@ -295,6 +307,40 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
   return origin;
 };
 
+/**
+ * 格式化日期到购物车
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期
+ */
+export var formatDateToCartItem = function formatDateToCartItem(params) {
+  var cartItem = params.cartItem,
+    date = params.date;
+  cartItem.start_date = dayjs(date.startTime).format('YYYY-MM-DD');
+  cartItem.start_time = dayjs(date.startTime).format('HH:mm');
+  cartItem.end_date = dayjs(date.endTime).format('YYYY-MM-DD');
+  cartItem.end_time = dayjs(date.endTime).format('HH:mm');
+  var oringin = formatDateToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+
+/**
+ * 格式化日期到购物车原始数据
+ * @param date 开始时间和结束时间
+ * @returns 格式化后的日期原始数据
+ */
+export var formatDateToCartItemOrigin = function formatDateToCartItemOrigin(params) {
+  var cartItem = params.cartItem,
+    date = params.date;
+  var origin = cartItem._origin;
+  origin.select_date = dayjs(date.startTime).format('YYYY-MM-DD');
+  origin.start_date = dayjs(date.startTime).format('YYYY-MM-DD');
+  origin.start_time = dayjs(date.startTime).format('HH:mm');
+  origin.end_date = dayjs(date.endTime).format('YYYY-MM-DD');
+  origin.end_time = dayjs(date.endTime).format('HH:mm');
+  return origin;
+};
+
 /**
  * 从购物车中删除资源相关信息
  * @param cartItem 购物车
@@ -447,7 +493,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
  * @returns 是否是普通商品
  */
 export var isNormalProduct = function isNormalProduct(product) {
-  return (product === null || product === void 0 ? void 0 : product.extension_type) !== "product_appointment";
+  return (product === null || product === void 0 ? void 0 : product.extension_type) !== 'product_appointment';
 };
 
 /**
@@ -528,14 +574,14 @@ export var getProductDeposit = function getProductDeposit(params) {
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
     var protocols = [];
     var total = new Decimal(0);
-    var _ref = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
-      deposit_fixed = _ref.deposit_fixed,
-      deposit_percentage = _ref.deposit_percentage,
-      deposit_policy_data = _ref.deposit_policy_data;
+    var _ref2 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref2.deposit_fixed,
+      deposit_percentage = _ref2.deposit_percentage,
+      deposit_policy_data = _ref2.deposit_policy_data;
     // 协议数据
     protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
     // 判断主商品是否有定金规则
-    if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+    if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
       var _handleProductDeposit = handleProductDeposit({
           depositData: product === null || product === void 0 ? void 0 : product.custom_deposit_data,
           total: cartItem.total || 0,
@@ -582,7 +628,7 @@ export var handleProductDeposit = function handleProductDeposit(params) {
     num = params.num;
   var deposit_fixed = depositData.deposit_fixed,
     deposit_percentage = depositData.deposit_percentage;
-  if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+  if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);
     var productTotalPrice = Decimal(total || 0);

package/dist/modules/Date/index.d.ts

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { DateModuleAPI, IGetAvailableTimeListParams, ITime } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { DateModuleAPI, IGetAvailableTimeListParams, ITime } from './types';
 export declare class DateModule extends BaseModule implements Module, DateModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -13,9 +13,9 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     setDateRange(dateRange: ITime[]): void;
     getDateRange(): ITime[];
-    getMonthDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
-    getDateList(): Promise<ITime[]>;
-    getAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    getResourceDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    getDateList(): ITime[];
+    getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;
 }

package/dist/modules/Date/index.js

@@ -15,7 +15,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 import { BaseModule } from "../BaseModule";
 import { disableAllDates, generateMonthDates, handleAvailableDateByResource, handleAvailableDatesByRules } from "./utils";
 export var DateModule = /*#__PURE__*/function (_BaseModule) {
@@ -25,8 +25,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     var _this;
     _classCallCheck(this, DateModule);
     _this = _super.call(this, name, version);
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "date");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'date');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
@@ -44,7 +44,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
-              this.request = this.core.getPlugin("request");
+              this.request = this.core.getPlugin('request');
               if (options.initialState) {
                 this.store.dateRange = options.initialState.dateRange;
                 this.store.dateList = options.initialState.dateList;
@@ -53,7 +53,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 _context.next = 6;
                 break;
               }
-              throw new Error("DateModule 需要 request 插件支持");
+              throw new Error('DateModule 需要 request 插件支持');
             case 6:
               if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
@@ -84,15 +84,15 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.dateRange;
     }
   }, {
-    key: "getMonthDates",
+    key: "getResourceDates",
     value: function () {
-      var _getMonthDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var _getResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
         var dates;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.getAvailableTimeList(params);
+              return this.getResourceAvailableTimeList(params);
             case 2:
               dates = _context2.sent;
               this.store.dateList = dates;
@@ -103,57 +103,43 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee2, this);
       }));
-      function getMonthDates(_x3) {
-        return _getMonthDates.apply(this, arguments);
+      function getResourceDates(_x3) {
+        return _getResourceDates.apply(this, arguments);
       }
-      return getMonthDates;
+      return getResourceDates;
     }()
   }, {
     key: "getDateList",
+    value: function getDateList() {
+      return this.store.dateList;
+    }
+  }, {
+    key: "getResourceAvailableTimeList",
     value: function () {
-      var _getDateList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _getResourceAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var url, query, rules, type, fetchUrl, _ref, start_date, end_date, resource_ids, dates, _res$data, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context3.abrupt("return", this.store.dateList);
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function getDateList() {
-        return _getDateList.apply(this, arguments);
-      }
-      return getDateList;
-    }()
-  }, {
-    key: "getAvailableTimeList",
-    value: function () {
-      var _getAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var url, query, rules, fetchUrl, _ref, start_date, end_date, resource_ids, dates, _res$data, res;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              url = params.url, query = params.query, rules = params.rules;
-              fetchUrl = url || "/schedule/resource/list";
+              url = params.url, query = params.query, rules = params.rules, type = params.type;
+              fetchUrl = url || '/schedule/resource/list';
               _ref = query || {}, start_date = _ref.start_date, end_date = _ref.end_date, resource_ids = _ref.resource_ids;
               if (!(!start_date || !end_date)) {
-                _context4.next = 5;
+                _context3.next = 5;
                 break;
               }
-              return _context4.abrupt("return", []);
+              return _context3.abrupt("return", []);
             case 5:
               // 1.生成当前月份的所有日期，默认都是可用的
-              dates = generateMonthDates(start_date, end_date); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
+              dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
               if (!(!(resource_ids !== null && resource_ids !== void 0 && resource_ids.length) || dayjs(end_date).isBefore(dayjs()))) {
-                _context4.next = 8;
+                _context3.next = 8;
                 break;
               }
-              return _context4.abrupt("return", disableAllDates(dates));
+              return _context3.abrupt("return", disableAllDates(dates));
             case 8:
-              _context4.prev = 8;
-              _context4.next = 11;
+              _context3.prev = 8;
+              _context3.next = 11;
               return this.request.get(fetchUrl, {
                 start_date: start_date,
                 end_date: end_date,
@@ -163,12 +149,12 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 11:
-              res = _context4.sent;
+              res = _context3.sent;
               if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.length) {
-                _context4.next = 14;
+                _context3.next = 14;
                 break;
               }
-              return _context4.abrupt("return", disableAllDates(dates));
+              return _context3.abrupt("return", disableAllDates(dates));
             case 14:
               // 2.根据资源times判定哪些日期内存在可用资源
               dates = handleAvailableDateByResource(res.data, dates);
@@ -177,22 +163,22 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               if (rules !== null && rules !== void 0 && rules.length) {
                 dates = handleAvailableDatesByRules(dates, rules);
               }
-              return _context4.abrupt("return", dates);
+              return _context3.abrupt("return", dates);
             case 19:
-              _context4.prev = 19;
-              _context4.t0 = _context4["catch"](8);
-              console.log("getAvailableTimeList_error", _context4.t0);
-              return _context4.abrupt("return", disableAllDates(dates));
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](8);
+              console.log('getAvailableTimeList_error', _context3.t0);
+              return _context3.abrupt("return", disableAllDates(dates));
             case 23:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this, [[8, 19]]);
+        }, _callee3, this, [[8, 19]]);
       }));
-      function getAvailableTimeList(_x4) {
-        return _getAvailableTimeList.apply(this, arguments);
+      function getResourceAvailableTimeList(_x4) {
+        return _getResourceAvailableTimeList.apply(this, arguments);
       }
-      return getAvailableTimeList;
+      return getResourceAvailableTimeList;
     }()
   }, {
     key: "clearDateRange",
@@ -207,7 +193,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: this.store,
-          cacheKey: ["dateRange", "dateList"]
+          cacheKey: ['dateRange', 'dateList']
         });
       }
     }