@pisell/pisellos 0.0.46 → 0.0.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/Cart/index.d.ts +1 -1
- package/dist/modules/Cart/index.js +21 -3
- package/dist/modules/Cart/types.d.ts +15 -0
- package/dist/modules/Cart/utils.d.ts +37 -12
- package/dist/modules/Cart/utils.js +79 -48
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/lib/modules/Cart/index.d.ts +1 -1
- package/lib/modules/Cart/index.js +19 -2
- package/lib/modules/Cart/types.d.ts +15 -0
- package/lib/modules/Cart/utils.d.ts +37 -12
- package/lib/modules/Cart/utils.js +51 -28
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingByStep/index.js +6 -2
- package/package.json +1 -1
|
@@ -58,7 +58,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
|
|
|
58
58
|
/**
|
|
59
59
|
* 清除购物车商品中的信息
|
|
60
60
|
*/
|
|
61
|
-
deleteCartItemInfo(types: 'resource' | 'time'): void;
|
|
61
|
+
deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
|
|
62
62
|
/**
|
|
63
63
|
* 清除购物车
|
|
64
64
|
*/
|
|
@@ -22,7 +22,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
22
22
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
23
23
|
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); }
|
|
24
24
|
import { BaseModule } from "../BaseModule";
|
|
25
|
-
import { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
|
|
25
|
+
import { createCartItemOrigin, deleteRelationFormsFromCartItem, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDateToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatRelationFormsToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
|
|
26
26
|
import { cloneDeep } from 'lodash-es';
|
|
27
27
|
export * from "./types";
|
|
28
28
|
|
|
@@ -123,6 +123,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
123
123
|
if (product) {
|
|
124
124
|
cartItem._productOrigin = cloneDeep(product);
|
|
125
125
|
cartItem._productInit = cloneDeep(product);
|
|
126
|
+
cartItem._bundleOrigin = cloneDeep(bundle);
|
|
127
|
+
cartItem._optionsOrigin = cloneDeep(options);
|
|
126
128
|
cartItem = formatProductToCartItem({
|
|
127
129
|
cartItem: cartItem,
|
|
128
130
|
product: product,
|
|
@@ -214,10 +216,13 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
214
216
|
cartItem = params.cartItem,
|
|
215
217
|
account = params.account,
|
|
216
218
|
product = params.product,
|
|
219
|
+
bundle = params.bundle,
|
|
220
|
+
options = params.options,
|
|
217
221
|
discounts = params.discounts,
|
|
218
222
|
resources = params.resources,
|
|
219
223
|
note = params.note,
|
|
220
|
-
date = params.date
|
|
224
|
+
date = params.date,
|
|
225
|
+
relationForms = params.relationForms;
|
|
221
226
|
var tempCartItem = this.store.list.find(function (i) {
|
|
222
227
|
return i._id === _id;
|
|
223
228
|
});
|
|
@@ -229,9 +234,13 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
229
234
|
}
|
|
230
235
|
if (product) {
|
|
231
236
|
tempCartItem._productOrigin = cloneDeep(product);
|
|
237
|
+
tempCartItem._bundleOrigin = cloneDeep(bundle);
|
|
238
|
+
tempCartItem._optionsOrigin = cloneDeep(options);
|
|
232
239
|
tempCartItem = formatProductToCartItem({
|
|
233
240
|
cartItem: tempCartItem,
|
|
234
|
-
product: product
|
|
241
|
+
product: product,
|
|
242
|
+
bundle: bundle,
|
|
243
|
+
options: options
|
|
235
244
|
});
|
|
236
245
|
}
|
|
237
246
|
if (discounts) {
|
|
@@ -252,6 +261,12 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
252
261
|
resources: resources
|
|
253
262
|
});
|
|
254
263
|
}
|
|
264
|
+
if (relationForms) {
|
|
265
|
+
tempCartItem = formatRelationFormsToCartItem({
|
|
266
|
+
cartItem: tempCartItem,
|
|
267
|
+
relationForms: relationForms
|
|
268
|
+
});
|
|
269
|
+
}
|
|
255
270
|
if (date) {
|
|
256
271
|
tempCartItem = formatDateToCartItem({
|
|
257
272
|
cartItem: tempCartItem,
|
|
@@ -375,6 +390,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
375
390
|
} else if (types === 'time') {
|
|
376
391
|
// 清除购物车商品中的时间信息
|
|
377
392
|
item = deleteTimeFromCartItem(item);
|
|
393
|
+
} else if (types === 'relationForms') {
|
|
394
|
+
// 清除购物车商品中的关联表单信息
|
|
395
|
+
item = deleteRelationFormsFromCartItem(item);
|
|
378
396
|
}
|
|
379
397
|
return item;
|
|
380
398
|
});
|
|
@@ -106,6 +106,10 @@ export interface CartItem {
|
|
|
106
106
|
_resourceOrigin?: Resource[];
|
|
107
107
|
/** 容量 */
|
|
108
108
|
capacity?: any;
|
|
109
|
+
/** 商品套餐原始数据 */
|
|
110
|
+
_bundleOrigin?: any[];
|
|
111
|
+
/** 商品规格原始数据 */
|
|
112
|
+
_optionsOrigin?: any[];
|
|
109
113
|
}
|
|
110
114
|
/**
|
|
111
115
|
* 购物车状态接口
|
|
@@ -147,6 +151,10 @@ export interface IUpdateItemParams {
|
|
|
147
151
|
account?: Account;
|
|
148
152
|
/** 商品 */
|
|
149
153
|
product?: ProductData;
|
|
154
|
+
/** 商品套餐信息 */
|
|
155
|
+
bundle?: any[];
|
|
156
|
+
/** 商品规格信息 */
|
|
157
|
+
options?: any[];
|
|
150
158
|
/** 折扣列表 */
|
|
151
159
|
discounts?: IDiscount[];
|
|
152
160
|
/** 数量 */
|
|
@@ -162,6 +170,13 @@ export interface IUpdateItemParams {
|
|
|
162
170
|
/** 结束时间 */
|
|
163
171
|
endTime: string;
|
|
164
172
|
};
|
|
173
|
+
/** 关联表单 */
|
|
174
|
+
relationForms?: {
|
|
175
|
+
/** 关联表单ID */
|
|
176
|
+
form_id: number[];
|
|
177
|
+
/** 关联表单记录ID */
|
|
178
|
+
form_record_ids: number[];
|
|
179
|
+
}[];
|
|
165
180
|
}
|
|
166
181
|
/**
|
|
167
182
|
* 折扣
|
|
@@ -90,6 +90,25 @@ export declare const formatResourceToCartItemOrigin: (params: {
|
|
|
90
90
|
cartItem: CartItem;
|
|
91
91
|
resources: Resource[];
|
|
92
92
|
}) => any;
|
|
93
|
+
/**
|
|
94
|
+
* 格式化关联表单到购物车
|
|
95
|
+
* @param params 参数
|
|
96
|
+
* @returns 格式化后的购物车
|
|
97
|
+
*/
|
|
98
|
+
export declare const formatRelationFormsToCartItem: (params: {
|
|
99
|
+
cartItem: CartItem;
|
|
100
|
+
relationForms: {
|
|
101
|
+
form_id: number[];
|
|
102
|
+
form_record_ids: number[];
|
|
103
|
+
}[];
|
|
104
|
+
}) => CartItem;
|
|
105
|
+
export declare const formatRelationFormsToCartItemOrigin: (params: {
|
|
106
|
+
cartItem: CartItem;
|
|
107
|
+
relationForms: {
|
|
108
|
+
form_id: number[];
|
|
109
|
+
form_record_ids: number[];
|
|
110
|
+
}[];
|
|
111
|
+
}) => any;
|
|
93
112
|
/**
|
|
94
113
|
* 格式化日期到购物车
|
|
95
114
|
* @param date 开始时间和结束时间
|
|
@@ -114,18 +133,6 @@ export declare const formatDateToCartItemOrigin: (params: {
|
|
|
114
133
|
endTime: string;
|
|
115
134
|
};
|
|
116
135
|
}) => any;
|
|
117
|
-
/**
|
|
118
|
-
* 从购物车中删除资源相关信息
|
|
119
|
-
* @param cartItem 购物车
|
|
120
|
-
* @returns 删除后的购物车
|
|
121
|
-
*/
|
|
122
|
-
export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
|
|
123
|
-
/**
|
|
124
|
-
* 从购物车中删除时间
|
|
125
|
-
* @param cartItem 购物车
|
|
126
|
-
* @returns 删除后的购物车
|
|
127
|
-
*/
|
|
128
|
-
export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
|
|
129
136
|
/**
|
|
130
137
|
* 格式化备注到购物车
|
|
131
138
|
* @param params 参数
|
|
@@ -226,3 +233,21 @@ export declare const handleProductDeposit: (params: {
|
|
|
226
233
|
depositTotal: Decimal;
|
|
227
234
|
result: boolean;
|
|
228
235
|
};
|
|
236
|
+
/**
|
|
237
|
+
* 从购物车中删除资源相关信息
|
|
238
|
+
* @param cartItem 购物车
|
|
239
|
+
* @returns 删除后的购物车
|
|
240
|
+
*/
|
|
241
|
+
export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
|
|
242
|
+
/**
|
|
243
|
+
* 从购物车中删除时间
|
|
244
|
+
* @param cartItem 购物车
|
|
245
|
+
* @returns 删除后的购物车
|
|
246
|
+
*/
|
|
247
|
+
export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
|
|
248
|
+
/**
|
|
249
|
+
* 从购物车中删除关联表单信息
|
|
250
|
+
* @param cartItem 购物车
|
|
251
|
+
* @returns 删除后的购物车
|
|
252
|
+
*/
|
|
253
|
+
export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;
|
|
@@ -105,6 +105,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
|
|
|
105
105
|
cartItem.isNormalProduct = isNormalProduct(product);
|
|
106
106
|
cartItem.is_charge_tax = product === null || product === void 0 ? void 0 : product.is_charge_tax;
|
|
107
107
|
}
|
|
108
|
+
console.log('cartItem>>>>>>', cartItem);
|
|
108
109
|
if (bundle !== null && bundle !== void 0 && bundle.length) {
|
|
109
110
|
cartItem.bundle = formatBundle(bundle);
|
|
110
111
|
}
|
|
@@ -307,6 +308,25 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
|
|
|
307
308
|
return origin;
|
|
308
309
|
};
|
|
309
310
|
|
|
311
|
+
/**
|
|
312
|
+
* 格式化关联表单到购物车
|
|
313
|
+
* @param params 参数
|
|
314
|
+
* @returns 格式化后的购物车
|
|
315
|
+
*/
|
|
316
|
+
export var formatRelationFormsToCartItem = function formatRelationFormsToCartItem(params) {
|
|
317
|
+
var cartItem = params.cartItem;
|
|
318
|
+
var oringin = formatRelationFormsToCartItemOrigin(params);
|
|
319
|
+
cartItem._origin = oringin;
|
|
320
|
+
return cartItem;
|
|
321
|
+
};
|
|
322
|
+
export var formatRelationFormsToCartItemOrigin = function formatRelationFormsToCartItemOrigin(params) {
|
|
323
|
+
var cartItem = params.cartItem,
|
|
324
|
+
relationForms = params.relationForms;
|
|
325
|
+
var origin = cartItem._origin;
|
|
326
|
+
origin.relation_forms = relationForms;
|
|
327
|
+
return origin;
|
|
328
|
+
};
|
|
329
|
+
|
|
310
330
|
/**
|
|
311
331
|
* 格式化日期到购物车
|
|
312
332
|
* @param date 开始时间和结束时间
|
|
@@ -341,54 +361,6 @@ export var formatDateToCartItemOrigin = function formatDateToCartItemOrigin(para
|
|
|
341
361
|
return origin;
|
|
342
362
|
};
|
|
343
363
|
|
|
344
|
-
/**
|
|
345
|
-
* 从购物车中删除资源相关信息
|
|
346
|
-
* @param cartItem 购物车
|
|
347
|
-
* @returns 删除后的购物车
|
|
348
|
-
*/
|
|
349
|
-
export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
|
|
350
|
-
// 删除UI层的数据
|
|
351
|
-
cartItem.resource_id = undefined;
|
|
352
|
-
cartItem.relation_form_name = undefined;
|
|
353
|
-
cartItem.start_date = undefined;
|
|
354
|
-
cartItem.start_time = undefined;
|
|
355
|
-
cartItem.end_date = undefined;
|
|
356
|
-
cartItem.end_time = undefined;
|
|
357
|
-
|
|
358
|
-
// 删除资源原始数据
|
|
359
|
-
delete cartItem._resourceOrigin;
|
|
360
|
-
|
|
361
|
-
// 删除原始数据
|
|
362
|
-
cartItem._origin.resources = null;
|
|
363
|
-
cartItem._origin.select_date = null;
|
|
364
|
-
cartItem._origin.start_date = null;
|
|
365
|
-
cartItem._origin.start_time = null;
|
|
366
|
-
cartItem._origin.end_date = null;
|
|
367
|
-
cartItem._origin.end_time = null;
|
|
368
|
-
return cartItem;
|
|
369
|
-
};
|
|
370
|
-
|
|
371
|
-
/**
|
|
372
|
-
* 从购物车中删除时间
|
|
373
|
-
* @param cartItem 购物车
|
|
374
|
-
* @returns 删除后的购物车
|
|
375
|
-
*/
|
|
376
|
-
export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
|
|
377
|
-
// 删除UI层的数据
|
|
378
|
-
cartItem.start_date = undefined;
|
|
379
|
-
cartItem.start_time = undefined;
|
|
380
|
-
cartItem.end_date = undefined;
|
|
381
|
-
cartItem.end_time = undefined;
|
|
382
|
-
|
|
383
|
-
// 删除原始数据
|
|
384
|
-
cartItem._origin.select_date = null;
|
|
385
|
-
cartItem._origin.start_date = null;
|
|
386
|
-
cartItem._origin.start_time = null;
|
|
387
|
-
cartItem._origin.end_date = null;
|
|
388
|
-
cartItem._origin.end_time = null;
|
|
389
|
-
return cartItem;
|
|
390
|
-
};
|
|
391
|
-
|
|
392
364
|
/**
|
|
393
365
|
* 格式化备注到购物车
|
|
394
366
|
* @param params 参数
|
|
@@ -642,4 +614,63 @@ export var handleProductDeposit = function handleProductDeposit(params) {
|
|
|
642
614
|
result: false,
|
|
643
615
|
depositTotal: new Decimal(0)
|
|
644
616
|
};
|
|
617
|
+
};
|
|
618
|
+
|
|
619
|
+
/**
|
|
620
|
+
* 从购物车中删除资源相关信息
|
|
621
|
+
* @param cartItem 购物车
|
|
622
|
+
* @returns 删除后的购物车
|
|
623
|
+
*/
|
|
624
|
+
export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cartItem) {
|
|
625
|
+
// 删除UI层的数据
|
|
626
|
+
cartItem.resource_id = undefined;
|
|
627
|
+
cartItem.relation_form_name = undefined;
|
|
628
|
+
cartItem.start_date = undefined;
|
|
629
|
+
cartItem.start_time = undefined;
|
|
630
|
+
cartItem.end_date = undefined;
|
|
631
|
+
cartItem.end_time = undefined;
|
|
632
|
+
|
|
633
|
+
// 删除资源原始数据
|
|
634
|
+
delete cartItem._resourceOrigin;
|
|
635
|
+
|
|
636
|
+
// 删除原始数据
|
|
637
|
+
cartItem._origin.resources = null;
|
|
638
|
+
cartItem._origin.select_date = null;
|
|
639
|
+
cartItem._origin.start_date = null;
|
|
640
|
+
cartItem._origin.start_time = null;
|
|
641
|
+
cartItem._origin.end_date = null;
|
|
642
|
+
cartItem._origin.end_time = null;
|
|
643
|
+
return cartItem;
|
|
644
|
+
};
|
|
645
|
+
|
|
646
|
+
/**
|
|
647
|
+
* 从购物车中删除时间
|
|
648
|
+
* @param cartItem 购物车
|
|
649
|
+
* @returns 删除后的购物车
|
|
650
|
+
*/
|
|
651
|
+
export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
|
|
652
|
+
// 删除UI层的数据
|
|
653
|
+
cartItem.start_date = undefined;
|
|
654
|
+
cartItem.start_time = undefined;
|
|
655
|
+
cartItem.end_date = undefined;
|
|
656
|
+
cartItem.end_time = undefined;
|
|
657
|
+
|
|
658
|
+
// 删除原始数据
|
|
659
|
+
cartItem._origin.select_date = null;
|
|
660
|
+
cartItem._origin.start_date = null;
|
|
661
|
+
cartItem._origin.start_time = null;
|
|
662
|
+
cartItem._origin.end_date = null;
|
|
663
|
+
cartItem._origin.end_time = null;
|
|
664
|
+
return cartItem;
|
|
665
|
+
};
|
|
666
|
+
|
|
667
|
+
/**
|
|
668
|
+
* 从购物车中删除关联表单信息
|
|
669
|
+
* @param cartItem 购物车
|
|
670
|
+
* @returns 删除后的购物车
|
|
671
|
+
*/
|
|
672
|
+
export var deleteRelationFormsFromCartItem = function deleteRelationFormsFromCartItem(cartItem) {
|
|
673
|
+
// 删除原始数据
|
|
674
|
+
cartItem._origin.relation_forms = null;
|
|
675
|
+
return cartItem;
|
|
645
676
|
};
|
|
@@ -127,7 +127,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
127
127
|
/**
|
|
128
128
|
* 从购物车中按类别删除信息
|
|
129
129
|
*/
|
|
130
|
-
deleteCartItemInfo(types: 'resource' | 'time'): void;
|
|
130
|
+
deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
|
|
131
131
|
destroy(): void;
|
|
132
132
|
getResourcesList(): any[];
|
|
133
133
|
getResourcesListByCartItem(id: string | number): {
|
|
@@ -58,7 +58,7 @@ export declare class CartModule extends BaseModule implements Module, CartModule
|
|
|
58
58
|
/**
|
|
59
59
|
* 清除购物车商品中的信息
|
|
60
60
|
*/
|
|
61
|
-
deleteCartItemInfo(types: 'resource' | 'time'): void;
|
|
61
|
+
deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
|
|
62
62
|
/**
|
|
63
63
|
* 清除购物车
|
|
64
64
|
*/
|
|
@@ -77,6 +77,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
|
|
|
77
77
|
if (product) {
|
|
78
78
|
cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
|
|
79
79
|
cartItem._productInit = (0, import_lodash_es.cloneDeep)(product);
|
|
80
|
+
cartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
|
|
81
|
+
cartItem._optionsOrigin = (0, import_lodash_es.cloneDeep)(options);
|
|
80
82
|
cartItem = (0, import_utils.formatProductToCartItem)({
|
|
81
83
|
cartItem,
|
|
82
84
|
product,
|
|
@@ -121,10 +123,13 @@ var CartModule = class extends import_BaseModule.BaseModule {
|
|
|
121
123
|
cartItem,
|
|
122
124
|
account,
|
|
123
125
|
product,
|
|
126
|
+
bundle,
|
|
127
|
+
options,
|
|
124
128
|
discounts,
|
|
125
129
|
resources,
|
|
126
130
|
note,
|
|
127
|
-
date
|
|
131
|
+
date,
|
|
132
|
+
relationForms
|
|
128
133
|
} = params;
|
|
129
134
|
let tempCartItem = this.store.list.find((i) => i._id === _id);
|
|
130
135
|
if (!tempCartItem) {
|
|
@@ -135,9 +140,13 @@ var CartModule = class extends import_BaseModule.BaseModule {
|
|
|
135
140
|
}
|
|
136
141
|
if (product) {
|
|
137
142
|
tempCartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
|
|
143
|
+
tempCartItem._bundleOrigin = (0, import_lodash_es.cloneDeep)(bundle);
|
|
144
|
+
tempCartItem._optionsOrigin = (0, import_lodash_es.cloneDeep)(options);
|
|
138
145
|
tempCartItem = (0, import_utils.formatProductToCartItem)({
|
|
139
146
|
cartItem: tempCartItem,
|
|
140
|
-
product
|
|
147
|
+
product,
|
|
148
|
+
bundle,
|
|
149
|
+
options
|
|
141
150
|
});
|
|
142
151
|
}
|
|
143
152
|
if (discounts) {
|
|
@@ -158,6 +167,12 @@ var CartModule = class extends import_BaseModule.BaseModule {
|
|
|
158
167
|
resources
|
|
159
168
|
});
|
|
160
169
|
}
|
|
170
|
+
if (relationForms) {
|
|
171
|
+
tempCartItem = (0, import_utils.formatRelationFormsToCartItem)({
|
|
172
|
+
cartItem: tempCartItem,
|
|
173
|
+
relationForms
|
|
174
|
+
});
|
|
175
|
+
}
|
|
161
176
|
if (date) {
|
|
162
177
|
tempCartItem = (0, import_utils.formatDateToCartItem)({ cartItem: tempCartItem, date });
|
|
163
178
|
}
|
|
@@ -218,6 +233,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
|
|
|
218
233
|
item = (0, import_utils.deleteResourceFromCartItem)(item);
|
|
219
234
|
} else if (types === "time") {
|
|
220
235
|
item = (0, import_utils.deleteTimeFromCartItem)(item);
|
|
236
|
+
} else if (types === "relationForms") {
|
|
237
|
+
item = (0, import_utils.deleteRelationFormsFromCartItem)(item);
|
|
221
238
|
}
|
|
222
239
|
return item;
|
|
223
240
|
});
|
|
@@ -106,6 +106,10 @@ export interface CartItem {
|
|
|
106
106
|
_resourceOrigin?: Resource[];
|
|
107
107
|
/** 容量 */
|
|
108
108
|
capacity?: any;
|
|
109
|
+
/** 商品套餐原始数据 */
|
|
110
|
+
_bundleOrigin?: any[];
|
|
111
|
+
/** 商品规格原始数据 */
|
|
112
|
+
_optionsOrigin?: any[];
|
|
109
113
|
}
|
|
110
114
|
/**
|
|
111
115
|
* 购物车状态接口
|
|
@@ -147,6 +151,10 @@ export interface IUpdateItemParams {
|
|
|
147
151
|
account?: Account;
|
|
148
152
|
/** 商品 */
|
|
149
153
|
product?: ProductData;
|
|
154
|
+
/** 商品套餐信息 */
|
|
155
|
+
bundle?: any[];
|
|
156
|
+
/** 商品规格信息 */
|
|
157
|
+
options?: any[];
|
|
150
158
|
/** 折扣列表 */
|
|
151
159
|
discounts?: IDiscount[];
|
|
152
160
|
/** 数量 */
|
|
@@ -162,6 +170,13 @@ export interface IUpdateItemParams {
|
|
|
162
170
|
/** 结束时间 */
|
|
163
171
|
endTime: string;
|
|
164
172
|
};
|
|
173
|
+
/** 关联表单 */
|
|
174
|
+
relationForms?: {
|
|
175
|
+
/** 关联表单ID */
|
|
176
|
+
form_id: number[];
|
|
177
|
+
/** 关联表单记录ID */
|
|
178
|
+
form_record_ids: number[];
|
|
179
|
+
}[];
|
|
165
180
|
}
|
|
166
181
|
/**
|
|
167
182
|
* 折扣
|
|
@@ -90,6 +90,25 @@ export declare const formatResourceToCartItemOrigin: (params: {
|
|
|
90
90
|
cartItem: CartItem;
|
|
91
91
|
resources: Resource[];
|
|
92
92
|
}) => any;
|
|
93
|
+
/**
|
|
94
|
+
* 格式化关联表单到购物车
|
|
95
|
+
* @param params 参数
|
|
96
|
+
* @returns 格式化后的购物车
|
|
97
|
+
*/
|
|
98
|
+
export declare const formatRelationFormsToCartItem: (params: {
|
|
99
|
+
cartItem: CartItem;
|
|
100
|
+
relationForms: {
|
|
101
|
+
form_id: number[];
|
|
102
|
+
form_record_ids: number[];
|
|
103
|
+
}[];
|
|
104
|
+
}) => CartItem;
|
|
105
|
+
export declare const formatRelationFormsToCartItemOrigin: (params: {
|
|
106
|
+
cartItem: CartItem;
|
|
107
|
+
relationForms: {
|
|
108
|
+
form_id: number[];
|
|
109
|
+
form_record_ids: number[];
|
|
110
|
+
}[];
|
|
111
|
+
}) => any;
|
|
93
112
|
/**
|
|
94
113
|
* 格式化日期到购物车
|
|
95
114
|
* @param date 开始时间和结束时间
|
|
@@ -114,18 +133,6 @@ export declare const formatDateToCartItemOrigin: (params: {
|
|
|
114
133
|
endTime: string;
|
|
115
134
|
};
|
|
116
135
|
}) => any;
|
|
117
|
-
/**
|
|
118
|
-
* 从购物车中删除资源相关信息
|
|
119
|
-
* @param cartItem 购物车
|
|
120
|
-
* @returns 删除后的购物车
|
|
121
|
-
*/
|
|
122
|
-
export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
|
|
123
|
-
/**
|
|
124
|
-
* 从购物车中删除时间
|
|
125
|
-
* @param cartItem 购物车
|
|
126
|
-
* @returns 删除后的购物车
|
|
127
|
-
*/
|
|
128
|
-
export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
|
|
129
136
|
/**
|
|
130
137
|
* 格式化备注到购物车
|
|
131
138
|
* @param params 参数
|
|
@@ -226,3 +233,21 @@ export declare const handleProductDeposit: (params: {
|
|
|
226
233
|
depositTotal: Decimal;
|
|
227
234
|
result: boolean;
|
|
228
235
|
};
|
|
236
|
+
/**
|
|
237
|
+
* 从购物车中删除资源相关信息
|
|
238
|
+
* @param cartItem 购物车
|
|
239
|
+
* @returns 删除后的购物车
|
|
240
|
+
*/
|
|
241
|
+
export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
|
|
242
|
+
/**
|
|
243
|
+
* 从购物车中删除时间
|
|
244
|
+
* @param cartItem 购物车
|
|
245
|
+
* @returns 删除后的购物车
|
|
246
|
+
*/
|
|
247
|
+
export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
|
|
248
|
+
/**
|
|
249
|
+
* 从购物车中删除关联表单信息
|
|
250
|
+
* @param cartItem 购物车
|
|
251
|
+
* @returns 删除后的购物车
|
|
252
|
+
*/
|
|
253
|
+
export declare const deleteRelationFormsFromCartItem: (cartItem: CartItem) => CartItem;
|
|
@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
30
30
|
var utils_exports = {};
|
|
31
31
|
__export(utils_exports, {
|
|
32
32
|
createCartItemOrigin: () => createCartItemOrigin,
|
|
33
|
+
deleteRelationFormsFromCartItem: () => deleteRelationFormsFromCartItem,
|
|
33
34
|
deleteResourceFromCartItem: () => deleteResourceFromCartItem,
|
|
34
35
|
deleteTimeFromCartItem: () => deleteTimeFromCartItem,
|
|
35
36
|
formatAccountToCartItem: () => formatAccountToCartItem,
|
|
@@ -46,6 +47,8 @@ __export(utils_exports, {
|
|
|
46
47
|
formatOptionsToOrigin: () => formatOptionsToOrigin,
|
|
47
48
|
formatProductToCartItem: () => formatProductToCartItem,
|
|
48
49
|
formatProductToCartItemOrigin: () => formatProductToCartItemOrigin,
|
|
50
|
+
formatRelationFormsToCartItem: () => formatRelationFormsToCartItem,
|
|
51
|
+
formatRelationFormsToCartItemOrigin: () => formatRelationFormsToCartItemOrigin,
|
|
49
52
|
formatResourceToCartItem: () => formatResourceToCartItem,
|
|
50
53
|
formatResourceToCartItemOrigin: () => formatResourceToCartItemOrigin,
|
|
51
54
|
getProductDeposit: () => getProductDeposit,
|
|
@@ -126,6 +129,7 @@ var formatProductToCartItem = (params) => {
|
|
|
126
129
|
cartItem.isNormalProduct = isNormalProduct(product);
|
|
127
130
|
cartItem.is_charge_tax = product == null ? void 0 : product.is_charge_tax;
|
|
128
131
|
}
|
|
132
|
+
console.log("cartItem>>>>>>", cartItem);
|
|
129
133
|
if (bundle == null ? void 0 : bundle.length) {
|
|
130
134
|
cartItem.bundle = formatBundle(bundle);
|
|
131
135
|
}
|
|
@@ -287,6 +291,18 @@ var formatResourceToCartItemOrigin = (params) => {
|
|
|
287
291
|
}
|
|
288
292
|
return origin;
|
|
289
293
|
};
|
|
294
|
+
var formatRelationFormsToCartItem = (params) => {
|
|
295
|
+
const { cartItem } = params;
|
|
296
|
+
const oringin = formatRelationFormsToCartItemOrigin(params);
|
|
297
|
+
cartItem._origin = oringin;
|
|
298
|
+
return cartItem;
|
|
299
|
+
};
|
|
300
|
+
var formatRelationFormsToCartItemOrigin = (params) => {
|
|
301
|
+
const { cartItem, relationForms } = params;
|
|
302
|
+
const origin = cartItem._origin;
|
|
303
|
+
origin.relation_forms = relationForms;
|
|
304
|
+
return origin;
|
|
305
|
+
};
|
|
290
306
|
var formatDateToCartItem = (params) => {
|
|
291
307
|
const { cartItem, date } = params;
|
|
292
308
|
cartItem.start_date = (0, import_dayjs.default)(date.startTime).format("YYYY-MM-DD");
|
|
@@ -307,34 +323,6 @@ var formatDateToCartItemOrigin = (params) => {
|
|
|
307
323
|
origin.end_time = (0, import_dayjs.default)(date.endTime).format("HH:mm");
|
|
308
324
|
return origin;
|
|
309
325
|
};
|
|
310
|
-
var deleteResourceFromCartItem = (cartItem) => {
|
|
311
|
-
cartItem.resource_id = void 0;
|
|
312
|
-
cartItem.relation_form_name = void 0;
|
|
313
|
-
cartItem.start_date = void 0;
|
|
314
|
-
cartItem.start_time = void 0;
|
|
315
|
-
cartItem.end_date = void 0;
|
|
316
|
-
cartItem.end_time = void 0;
|
|
317
|
-
delete cartItem._resourceOrigin;
|
|
318
|
-
cartItem._origin.resources = null;
|
|
319
|
-
cartItem._origin.select_date = null;
|
|
320
|
-
cartItem._origin.start_date = null;
|
|
321
|
-
cartItem._origin.start_time = null;
|
|
322
|
-
cartItem._origin.end_date = null;
|
|
323
|
-
cartItem._origin.end_time = null;
|
|
324
|
-
return cartItem;
|
|
325
|
-
};
|
|
326
|
-
var deleteTimeFromCartItem = (cartItem) => {
|
|
327
|
-
cartItem.start_date = void 0;
|
|
328
|
-
cartItem.start_time = void 0;
|
|
329
|
-
cartItem.end_date = void 0;
|
|
330
|
-
cartItem.end_time = void 0;
|
|
331
|
-
cartItem._origin.select_date = null;
|
|
332
|
-
cartItem._origin.start_date = null;
|
|
333
|
-
cartItem._origin.start_time = null;
|
|
334
|
-
cartItem._origin.end_date = null;
|
|
335
|
-
cartItem._origin.end_time = null;
|
|
336
|
-
return cartItem;
|
|
337
|
-
};
|
|
338
326
|
var formatNoteToCartItem = (params) => {
|
|
339
327
|
const { cartItem, note } = params;
|
|
340
328
|
cartItem.note = note;
|
|
@@ -497,9 +485,42 @@ var handleProductDeposit = (params) => {
|
|
|
497
485
|
}
|
|
498
486
|
return { result: false, depositTotal: new import_decimal.default(0) };
|
|
499
487
|
};
|
|
488
|
+
var deleteResourceFromCartItem = (cartItem) => {
|
|
489
|
+
cartItem.resource_id = void 0;
|
|
490
|
+
cartItem.relation_form_name = void 0;
|
|
491
|
+
cartItem.start_date = void 0;
|
|
492
|
+
cartItem.start_time = void 0;
|
|
493
|
+
cartItem.end_date = void 0;
|
|
494
|
+
cartItem.end_time = void 0;
|
|
495
|
+
delete cartItem._resourceOrigin;
|
|
496
|
+
cartItem._origin.resources = null;
|
|
497
|
+
cartItem._origin.select_date = null;
|
|
498
|
+
cartItem._origin.start_date = null;
|
|
499
|
+
cartItem._origin.start_time = null;
|
|
500
|
+
cartItem._origin.end_date = null;
|
|
501
|
+
cartItem._origin.end_time = null;
|
|
502
|
+
return cartItem;
|
|
503
|
+
};
|
|
504
|
+
var deleteTimeFromCartItem = (cartItem) => {
|
|
505
|
+
cartItem.start_date = void 0;
|
|
506
|
+
cartItem.start_time = void 0;
|
|
507
|
+
cartItem.end_date = void 0;
|
|
508
|
+
cartItem.end_time = void 0;
|
|
509
|
+
cartItem._origin.select_date = null;
|
|
510
|
+
cartItem._origin.start_date = null;
|
|
511
|
+
cartItem._origin.start_time = null;
|
|
512
|
+
cartItem._origin.end_date = null;
|
|
513
|
+
cartItem._origin.end_time = null;
|
|
514
|
+
return cartItem;
|
|
515
|
+
};
|
|
516
|
+
var deleteRelationFormsFromCartItem = (cartItem) => {
|
|
517
|
+
cartItem._origin.relation_forms = null;
|
|
518
|
+
return cartItem;
|
|
519
|
+
};
|
|
500
520
|
// Annotate the CommonJS export names for ESM import in node:
|
|
501
521
|
0 && (module.exports = {
|
|
502
522
|
createCartItemOrigin,
|
|
523
|
+
deleteRelationFormsFromCartItem,
|
|
503
524
|
deleteResourceFromCartItem,
|
|
504
525
|
deleteTimeFromCartItem,
|
|
505
526
|
formatAccountToCartItem,
|
|
@@ -516,6 +537,8 @@ var handleProductDeposit = (params) => {
|
|
|
516
537
|
formatOptionsToOrigin,
|
|
517
538
|
formatProductToCartItem,
|
|
518
539
|
formatProductToCartItemOrigin,
|
|
540
|
+
formatRelationFormsToCartItem,
|
|
541
|
+
formatRelationFormsToCartItemOrigin,
|
|
519
542
|
formatResourceToCartItem,
|
|
520
543
|
formatResourceToCartItemOrigin,
|
|
521
544
|
getProductDeposit,
|
|
@@ -127,7 +127,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
127
127
|
/**
|
|
128
128
|
* 从购物车中按类别删除信息
|
|
129
129
|
*/
|
|
130
|
-
deleteCartItemInfo(types: 'resource' | 'time'): void;
|
|
130
|
+
deleteCartItemInfo(types: 'resource' | 'time' | 'relationForms'): void;
|
|
131
131
|
destroy(): void;
|
|
132
132
|
getResourcesList(): any[];
|
|
133
133
|
getResourcesListByCartItem(id: string | number): {
|
|
@@ -253,7 +253,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
|
|
|
253
253
|
);
|
|
254
254
|
return accountModules[0].getAccount();
|
|
255
255
|
}
|
|
256
|
-
const newAccount = await this.store.accountList.addAccount(
|
|
256
|
+
const newAccount = await this.store.accountList.addAccount(
|
|
257
|
+
account
|
|
258
|
+
);
|
|
257
259
|
return newAccount.getAccount();
|
|
258
260
|
}
|
|
259
261
|
// 添加账户或者 guest
|
|
@@ -267,7 +269,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
|
|
|
267
269
|
}
|
|
268
270
|
const res = [];
|
|
269
271
|
for (const account of accounts) {
|
|
270
|
-
const accountModule = await this.store.accountList.addAccount(
|
|
272
|
+
const accountModule = await this.store.accountList.addAccount(
|
|
273
|
+
account
|
|
274
|
+
);
|
|
271
275
|
const accountData = accountModule.getAccount();
|
|
272
276
|
if (accountData) {
|
|
273
277
|
res.push(accountData);
|