@fonixtree/magic-design 0.0.89 → 0.0.92
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/es/common/LinkModal/FilteredProductModal/index.js +1 -0
- package/es/composite-comp/bol/components/Carousel/mobile/index.js +6 -0
- package/es/composite-comp/bol/components/Carousel/pc/index.js +6 -0
- package/es/composite-comp/common/components/ProductItem/index.js +25 -4
- package/es/composite-comp/dito/components/FlashDeal/mobile/imgs/defImg.png +0 -0
- package/es/composite-comp/dito/components/FlashDeal/mobile/index.js +27 -15
- package/es/composite-comp/dito/components/FlashDeal/pc/imgs/defImg.png +0 -0
- package/es/composite-comp/dito/components/FlashDeal/pc/index.js +58 -14
- package/es/composite-comp/dito/components/PcNavigation/pc/index.js +3 -1
- package/es/core/Designer/AppointmentModal/index.js +2 -1
- package/es/core/Designer/AppointmentModal/index.less +22 -9
- package/es/meta-comp/components/Text/index.js +12 -0
- package/es/meta-comp/config-panels/TextConfig/index.js +1 -1
- package/lib/common/LinkModal/FilteredProductModal/index.js +1 -0
- package/lib/composite-comp/bol/components/Carousel/mobile/index.js +6 -0
- package/lib/composite-comp/bol/components/Carousel/pc/index.js +6 -0
- package/lib/composite-comp/common/components/ProductItem/index.js +25 -4
- package/lib/composite-comp/dito/components/FlashDeal/mobile/imgs/defImg.png +0 -0
- package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js +27 -15
- package/lib/composite-comp/dito/components/FlashDeal/pc/imgs/defImg.png +0 -0
- package/lib/composite-comp/dito/components/FlashDeal/pc/index.js +58 -14
- package/lib/composite-comp/dito/components/PcNavigation/pc/index.js +3 -1
- package/lib/core/Designer/AppointmentModal/index.js +2 -1
- package/lib/core/Designer/AppointmentModal/index.less +22 -9
- package/lib/meta-comp/components/Text/index.js +12 -0
- package/lib/meta-comp/config-panels/TextConfig/index.js +1 -1
- package/package.json +1 -1
|
@@ -166,6 +166,12 @@ function (_super) {
|
|
|
166
166
|
|
|
167
167
|
this.destroy = (0, _mobx.autorun)(function () {
|
|
168
168
|
_this.sliderGoTo(_this.props.data.groupSource);
|
|
169
|
+
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
170
|
+
|
|
171
|
+
|
|
172
|
+
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
173
|
+
_this.sliderRef.slickPause();
|
|
174
|
+
}
|
|
169
175
|
});
|
|
170
176
|
this.listenWidth();
|
|
171
177
|
window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
|
|
@@ -159,6 +159,12 @@ function (_super) {
|
|
|
159
159
|
|
|
160
160
|
this.destroy = (0, _mobx.autorun)(function () {
|
|
161
161
|
_this.sliderGoTo(_this.props.data.groupSource);
|
|
162
|
+
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
166
|
+
_this.sliderRef.slickPause();
|
|
167
|
+
}
|
|
162
168
|
});
|
|
163
169
|
this.listenWidth();
|
|
164
170
|
window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
|
|
@@ -105,16 +105,37 @@ function (_super) {
|
|
|
105
105
|
layout = _a.layout,
|
|
106
106
|
imgHeight = _a.imgHeight,
|
|
107
107
|
imgWidth = _a.imgWidth,
|
|
108
|
-
|
|
108
|
+
unknownPrice = _a.unknownPrice,
|
|
109
|
+
rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
|
|
109
110
|
|
|
110
111
|
var promotions = (0, _businessUtil.getPromotionList)(data);
|
|
111
|
-
var price = (0, _currencyUtil.
|
|
112
|
+
var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
|
|
112
113
|
/** 当是拼团时 显示价格 */
|
|
113
114
|
|
|
114
115
|
if (data.sppType && promotions.length) {
|
|
115
|
-
price = data.specialPrice !== null ? (0, _currencyUtil.
|
|
116
|
+
price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
|
|
116
117
|
}
|
|
117
118
|
|
|
119
|
+
var integerPart = price;
|
|
120
|
+
var decimalPart = null;
|
|
121
|
+
|
|
122
|
+
if (unknownPrice) {
|
|
123
|
+
if (price.length > 5) {
|
|
124
|
+
integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
|
|
125
|
+
} else {
|
|
126
|
+
integerPart = price.replace(/\d/, '? ');
|
|
127
|
+
}
|
|
128
|
+
} else if (Array.isArray(price)) {
|
|
129
|
+
integerPart = price[0];
|
|
130
|
+
decimalPart = price[1];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
var pricePrefix = (0, _commonUtil.ensure)(function () {
|
|
134
|
+
return window.ecommerce.prefix;
|
|
135
|
+
}, 'Rp');
|
|
136
|
+
|
|
137
|
+
var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
|
|
138
|
+
|
|
118
139
|
var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
|
|
119
140
|
var discount = Number(data.discountPercent) || 0;
|
|
120
141
|
var salePercent = Number(data.salePercent) / 100 || 0;
|
|
@@ -164,7 +185,7 @@ function (_super) {
|
|
|
164
185
|
}), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
165
186
|
className: "price",
|
|
166
187
|
data: __assign(__assign({}, panelProps.activityPrice), {
|
|
167
|
-
text:
|
|
188
|
+
text: _price
|
|
168
189
|
}),
|
|
169
190
|
readonly: true
|
|
170
191
|
}), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -9,9 +9,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
require("./index.less");
|
|
11
11
|
|
|
12
|
-
var _defImg = _interopRequireDefault(require("./imgs/
|
|
13
|
-
|
|
14
|
-
var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
|
|
12
|
+
var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
|
|
15
13
|
|
|
16
14
|
var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
|
|
17
15
|
|
|
@@ -220,21 +218,34 @@ var defaultData = [{
|
|
|
220
218
|
imgUrlContent: {
|
|
221
219
|
url: _defImg["default"]
|
|
222
220
|
},
|
|
223
|
-
offerName: '
|
|
224
|
-
salesPrice:
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
221
|
+
offerName: 'Product Name',
|
|
222
|
+
salesPrice: 18000000,
|
|
223
|
+
specialPrice: 18000000,
|
|
224
|
+
marketPrice: 19000000,
|
|
225
|
+
discountPercent: 10,
|
|
226
|
+
salePercent: 500,
|
|
228
227
|
sppType: '2'
|
|
229
228
|
}, {
|
|
230
229
|
imgUrlContent: {
|
|
231
|
-
url:
|
|
230
|
+
url: _defImg["default"]
|
|
231
|
+
},
|
|
232
|
+
offerName: 'Product Name',
|
|
233
|
+
salesPrice: 18000000,
|
|
234
|
+
specialPrice: 18000000,
|
|
235
|
+
marketPrice: 19000000,
|
|
236
|
+
discountPercent: 10,
|
|
237
|
+
salePercent: 500,
|
|
238
|
+
sppType: '2'
|
|
239
|
+
}, {
|
|
240
|
+
imgUrlContent: {
|
|
241
|
+
url: _defImg["default"]
|
|
232
242
|
},
|
|
233
|
-
offerName: '
|
|
234
|
-
salesPrice:
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
243
|
+
offerName: 'Product Name',
|
|
244
|
+
salesPrice: 18000000,
|
|
245
|
+
specialPrice: 18000000,
|
|
246
|
+
marketPrice: 19000000,
|
|
247
|
+
discountPercent: 10,
|
|
248
|
+
salePercent: 500,
|
|
238
249
|
sppType: '2'
|
|
239
250
|
}];
|
|
240
251
|
|
|
@@ -427,7 +438,8 @@ function (_super) {
|
|
|
427
438
|
|
|
428
439
|
return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
|
|
429
440
|
},
|
|
430
|
-
panelProps: panelProps.content
|
|
441
|
+
panelProps: panelProps.content,
|
|
442
|
+
unknownPrice: isWill
|
|
431
443
|
});
|
|
432
444
|
}))));
|
|
433
445
|
};
|
|
Binary file
|
|
@@ -11,9 +11,7 @@ require("./index.less");
|
|
|
11
11
|
|
|
12
12
|
var _lodash = _interopRequireDefault(require("lodash.throttle"));
|
|
13
13
|
|
|
14
|
-
var _defImg = _interopRequireDefault(require("./imgs/
|
|
15
|
-
|
|
16
|
-
var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
|
|
14
|
+
var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
|
|
17
15
|
|
|
18
16
|
var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
|
|
19
17
|
|
|
@@ -224,21 +222,67 @@ var defaultData = [{
|
|
|
224
222
|
imgUrlContent: {
|
|
225
223
|
url: _defImg["default"]
|
|
226
224
|
},
|
|
227
|
-
offerName: '
|
|
228
|
-
salesPrice:
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
225
|
+
offerName: 'Product Name Long text',
|
|
226
|
+
salesPrice: 18000000,
|
|
227
|
+
specialPrice: 18000000,
|
|
228
|
+
marketPrice: 19000000,
|
|
229
|
+
discountPercent: 10,
|
|
230
|
+
salePercent: 500,
|
|
231
|
+
sppType: '2'
|
|
232
|
+
}, {
|
|
233
|
+
imgUrlContent: {
|
|
234
|
+
url: _defImg["default"]
|
|
235
|
+
},
|
|
236
|
+
offerName: 'Product Name Long text',
|
|
237
|
+
salesPrice: 18000000,
|
|
238
|
+
specialPrice: 18000000,
|
|
239
|
+
marketPrice: 19000000,
|
|
240
|
+
discountPercent: 10,
|
|
241
|
+
salePercent: 500,
|
|
242
|
+
sppType: '2'
|
|
243
|
+
}, {
|
|
244
|
+
imgUrlContent: {
|
|
245
|
+
url: _defImg["default"]
|
|
246
|
+
},
|
|
247
|
+
offerName: 'Product Name Long text',
|
|
248
|
+
salesPrice: 18000000,
|
|
249
|
+
specialPrice: 18000000,
|
|
250
|
+
marketPrice: 19000000,
|
|
251
|
+
discountPercent: 10,
|
|
252
|
+
salePercent: 500,
|
|
232
253
|
sppType: '2'
|
|
233
254
|
}, {
|
|
234
255
|
imgUrlContent: {
|
|
235
|
-
url:
|
|
256
|
+
url: _defImg["default"]
|
|
257
|
+
},
|
|
258
|
+
offerName: 'Product Name Long text',
|
|
259
|
+
salesPrice: 18000000,
|
|
260
|
+
specialPrice: 18000000,
|
|
261
|
+
marketPrice: 19000000,
|
|
262
|
+
discountPercent: 10,
|
|
263
|
+
salePercent: 500,
|
|
264
|
+
sppType: '2'
|
|
265
|
+
}, {
|
|
266
|
+
imgUrlContent: {
|
|
267
|
+
url: _defImg["default"]
|
|
268
|
+
},
|
|
269
|
+
offerName: 'Product Name Long text',
|
|
270
|
+
salesPrice: 18000000,
|
|
271
|
+
specialPrice: 18000000,
|
|
272
|
+
marketPrice: 19000000,
|
|
273
|
+
discountPercent: 10,
|
|
274
|
+
salePercent: 500,
|
|
275
|
+
sppType: '2'
|
|
276
|
+
}, {
|
|
277
|
+
imgUrlContent: {
|
|
278
|
+
url: _defImg["default"]
|
|
236
279
|
},
|
|
237
|
-
offerName: '
|
|
238
|
-
salesPrice:
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
280
|
+
offerName: 'Product Name Long text',
|
|
281
|
+
salesPrice: 18000000,
|
|
282
|
+
specialPrice: 18000000,
|
|
283
|
+
marketPrice: 19000000,
|
|
284
|
+
discountPercent: 10,
|
|
285
|
+
salePercent: 500,
|
|
242
286
|
sppType: '2'
|
|
243
287
|
}];
|
|
244
288
|
|
|
@@ -304,7 +304,9 @@ function (_super) {
|
|
|
304
304
|
|
|
305
305
|
return [4
|
|
306
306
|
/*yield*/
|
|
307
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
|
|
307
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
|
|
308
|
+
terminalType: 'PC'
|
|
309
|
+
}, 'GET')];
|
|
308
310
|
|
|
309
311
|
case 1:
|
|
310
312
|
res = _a.sent();
|
|
@@ -57,7 +57,8 @@ function AppointmentModal(props) {
|
|
|
57
57
|
onCancel: onClose,
|
|
58
58
|
title: (0, _locale.i18n)('PUBLISH_LATER'),
|
|
59
59
|
visible: visible,
|
|
60
|
-
width: 500
|
|
60
|
+
width: 500,
|
|
61
|
+
wrapClassName: "m-appointment-modal"
|
|
61
62
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
|
|
62
63
|
autoComplete: "off",
|
|
63
64
|
form: form,
|
|
@@ -1,10 +1,23 @@
|
|
|
1
|
-
.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
[magic_design] .m-appointment-modal {
|
|
2
|
+
|
|
3
|
+
.footer {
|
|
4
|
+
display: flex;
|
|
5
|
+
justify-content: flex-end;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
.tips {
|
|
9
|
+
font-size: 13px;
|
|
10
|
+
line-height: 18px;
|
|
11
|
+
color: #A3AEC3;
|
|
12
|
+
margin-bottom: 40px;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
.ant-modal-body {
|
|
16
|
+
overflow: unset;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.ant-picker-ok button {
|
|
20
|
+
color: #fff;
|
|
21
|
+
}
|
|
22
|
+
|
|
10
23
|
}
|
|
@@ -343,6 +343,15 @@ function (_super) {
|
|
|
343
343
|
var node = document.createElement('span');
|
|
344
344
|
node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
|
|
345
345
|
node.innerText = (_a = data.text).slice.apply(_a, c.range);
|
|
346
|
+
|
|
347
|
+
node.onclick = function (e) {
|
|
348
|
+
if (c.content.clickUrl) {
|
|
349
|
+
e.stopPropagation();
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
(0, _coreUtil.clickUrl)(c.content.clickUrl);
|
|
353
|
+
};
|
|
354
|
+
|
|
346
355
|
_this.selectionRefMap[JSON.stringify(c.range)] = node;
|
|
347
356
|
|
|
348
357
|
_this.textRef.current.appendChild(node);
|
|
@@ -460,6 +469,9 @@ function (_super) {
|
|
|
460
469
|
ref: this.textRef,
|
|
461
470
|
className: (0, _classnames["default"])('m-meta-text', className),
|
|
462
471
|
contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
|
|
472
|
+
onClick: function onClick() {
|
|
473
|
+
(0, _coreUtil.clickUrl)(data.content.clickUrl);
|
|
474
|
+
},
|
|
463
475
|
onInput: function onInput(e) {
|
|
464
476
|
var text = e.target.textContent;
|
|
465
477
|
data.text = text;
|
|
@@ -274,7 +274,7 @@ function (_super) {
|
|
|
274
274
|
|
|
275
275
|
_this.selfRender();
|
|
276
276
|
},
|
|
277
|
-
value:
|
|
277
|
+
value: textData.clickUrl
|
|
278
278
|
})), /*#__PURE__*/_react["default"].createElement(_common.Field, {
|
|
279
279
|
title: (0, _locale.i18n)('CONTENT_WIDTH')
|
|
280
280
|
}, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
|
|
@@ -166,6 +166,12 @@ function (_super) {
|
|
|
166
166
|
|
|
167
167
|
this.destroy = (0, _mobx.autorun)(function () {
|
|
168
168
|
_this.sliderGoTo(_this.props.data.groupSource);
|
|
169
|
+
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
170
|
+
|
|
171
|
+
|
|
172
|
+
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
173
|
+
_this.sliderRef.slickPause();
|
|
174
|
+
}
|
|
169
175
|
});
|
|
170
176
|
this.listenWidth();
|
|
171
177
|
window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
|
|
@@ -159,6 +159,12 @@ function (_super) {
|
|
|
159
159
|
|
|
160
160
|
this.destroy = (0, _mobx.autorun)(function () {
|
|
161
161
|
_this.sliderGoTo(_this.props.data.groupSource);
|
|
162
|
+
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
166
|
+
_this.sliderRef.slickPause();
|
|
167
|
+
}
|
|
162
168
|
});
|
|
163
169
|
this.listenWidth();
|
|
164
170
|
window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
|
|
@@ -105,16 +105,37 @@ function (_super) {
|
|
|
105
105
|
layout = _a.layout,
|
|
106
106
|
imgHeight = _a.imgHeight,
|
|
107
107
|
imgWidth = _a.imgWidth,
|
|
108
|
-
|
|
108
|
+
unknownPrice = _a.unknownPrice,
|
|
109
|
+
rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
|
|
109
110
|
|
|
110
111
|
var promotions = (0, _businessUtil.getPromotionList)(data);
|
|
111
|
-
var price = (0, _currencyUtil.
|
|
112
|
+
var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
|
|
112
113
|
/** 当是拼团时 显示价格 */
|
|
113
114
|
|
|
114
115
|
if (data.sppType && promotions.length) {
|
|
115
|
-
price = data.specialPrice !== null ? (0, _currencyUtil.
|
|
116
|
+
price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
|
|
116
117
|
}
|
|
117
118
|
|
|
119
|
+
var integerPart = price;
|
|
120
|
+
var decimalPart = null;
|
|
121
|
+
|
|
122
|
+
if (unknownPrice) {
|
|
123
|
+
if (price.length > 5) {
|
|
124
|
+
integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
|
|
125
|
+
} else {
|
|
126
|
+
integerPart = price.replace(/\d/, '? ');
|
|
127
|
+
}
|
|
128
|
+
} else if (Array.isArray(price)) {
|
|
129
|
+
integerPart = price[0];
|
|
130
|
+
decimalPart = price[1];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
var pricePrefix = (0, _commonUtil.ensure)(function () {
|
|
134
|
+
return window.ecommerce.prefix;
|
|
135
|
+
}, 'Rp');
|
|
136
|
+
|
|
137
|
+
var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
|
|
138
|
+
|
|
118
139
|
var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
|
|
119
140
|
var discount = Number(data.discountPercent) || 0;
|
|
120
141
|
var salePercent = Number(data.salePercent) / 100 || 0;
|
|
@@ -164,7 +185,7 @@ function (_super) {
|
|
|
164
185
|
}), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
165
186
|
className: "price",
|
|
166
187
|
data: __assign(__assign({}, panelProps.activityPrice), {
|
|
167
|
-
text:
|
|
188
|
+
text: _price
|
|
168
189
|
}),
|
|
169
190
|
readonly: true
|
|
170
191
|
}), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -9,9 +9,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
require("./index.less");
|
|
11
11
|
|
|
12
|
-
var _defImg = _interopRequireDefault(require("./imgs/
|
|
13
|
-
|
|
14
|
-
var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
|
|
12
|
+
var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
|
|
15
13
|
|
|
16
14
|
var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
|
|
17
15
|
|
|
@@ -220,21 +218,34 @@ var defaultData = [{
|
|
|
220
218
|
imgUrlContent: {
|
|
221
219
|
url: _defImg["default"]
|
|
222
220
|
},
|
|
223
|
-
offerName: '
|
|
224
|
-
salesPrice:
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
221
|
+
offerName: 'Product Name',
|
|
222
|
+
salesPrice: 18000000,
|
|
223
|
+
specialPrice: 18000000,
|
|
224
|
+
marketPrice: 19000000,
|
|
225
|
+
discountPercent: 10,
|
|
226
|
+
salePercent: 500,
|
|
228
227
|
sppType: '2'
|
|
229
228
|
}, {
|
|
230
229
|
imgUrlContent: {
|
|
231
|
-
url:
|
|
230
|
+
url: _defImg["default"]
|
|
231
|
+
},
|
|
232
|
+
offerName: 'Product Name',
|
|
233
|
+
salesPrice: 18000000,
|
|
234
|
+
specialPrice: 18000000,
|
|
235
|
+
marketPrice: 19000000,
|
|
236
|
+
discountPercent: 10,
|
|
237
|
+
salePercent: 500,
|
|
238
|
+
sppType: '2'
|
|
239
|
+
}, {
|
|
240
|
+
imgUrlContent: {
|
|
241
|
+
url: _defImg["default"]
|
|
232
242
|
},
|
|
233
|
-
offerName: '
|
|
234
|
-
salesPrice:
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
243
|
+
offerName: 'Product Name',
|
|
244
|
+
salesPrice: 18000000,
|
|
245
|
+
specialPrice: 18000000,
|
|
246
|
+
marketPrice: 19000000,
|
|
247
|
+
discountPercent: 10,
|
|
248
|
+
salePercent: 500,
|
|
238
249
|
sppType: '2'
|
|
239
250
|
}];
|
|
240
251
|
|
|
@@ -427,7 +438,8 @@ function (_super) {
|
|
|
427
438
|
|
|
428
439
|
return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
|
|
429
440
|
},
|
|
430
|
-
panelProps: panelProps.content
|
|
441
|
+
panelProps: panelProps.content,
|
|
442
|
+
unknownPrice: isWill
|
|
431
443
|
});
|
|
432
444
|
}))));
|
|
433
445
|
};
|
|
Binary file
|
|
@@ -11,9 +11,7 @@ require("./index.less");
|
|
|
11
11
|
|
|
12
12
|
var _lodash = _interopRequireDefault(require("lodash.throttle"));
|
|
13
13
|
|
|
14
|
-
var _defImg = _interopRequireDefault(require("./imgs/
|
|
15
|
-
|
|
16
|
-
var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
|
|
14
|
+
var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
|
|
17
15
|
|
|
18
16
|
var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
|
|
19
17
|
|
|
@@ -224,21 +222,67 @@ var defaultData = [{
|
|
|
224
222
|
imgUrlContent: {
|
|
225
223
|
url: _defImg["default"]
|
|
226
224
|
},
|
|
227
|
-
offerName: '
|
|
228
|
-
salesPrice:
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
225
|
+
offerName: 'Product Name Long text',
|
|
226
|
+
salesPrice: 18000000,
|
|
227
|
+
specialPrice: 18000000,
|
|
228
|
+
marketPrice: 19000000,
|
|
229
|
+
discountPercent: 10,
|
|
230
|
+
salePercent: 500,
|
|
231
|
+
sppType: '2'
|
|
232
|
+
}, {
|
|
233
|
+
imgUrlContent: {
|
|
234
|
+
url: _defImg["default"]
|
|
235
|
+
},
|
|
236
|
+
offerName: 'Product Name Long text',
|
|
237
|
+
salesPrice: 18000000,
|
|
238
|
+
specialPrice: 18000000,
|
|
239
|
+
marketPrice: 19000000,
|
|
240
|
+
discountPercent: 10,
|
|
241
|
+
salePercent: 500,
|
|
242
|
+
sppType: '2'
|
|
243
|
+
}, {
|
|
244
|
+
imgUrlContent: {
|
|
245
|
+
url: _defImg["default"]
|
|
246
|
+
},
|
|
247
|
+
offerName: 'Product Name Long text',
|
|
248
|
+
salesPrice: 18000000,
|
|
249
|
+
specialPrice: 18000000,
|
|
250
|
+
marketPrice: 19000000,
|
|
251
|
+
discountPercent: 10,
|
|
252
|
+
salePercent: 500,
|
|
232
253
|
sppType: '2'
|
|
233
254
|
}, {
|
|
234
255
|
imgUrlContent: {
|
|
235
|
-
url:
|
|
256
|
+
url: _defImg["default"]
|
|
257
|
+
},
|
|
258
|
+
offerName: 'Product Name Long text',
|
|
259
|
+
salesPrice: 18000000,
|
|
260
|
+
specialPrice: 18000000,
|
|
261
|
+
marketPrice: 19000000,
|
|
262
|
+
discountPercent: 10,
|
|
263
|
+
salePercent: 500,
|
|
264
|
+
sppType: '2'
|
|
265
|
+
}, {
|
|
266
|
+
imgUrlContent: {
|
|
267
|
+
url: _defImg["default"]
|
|
268
|
+
},
|
|
269
|
+
offerName: 'Product Name Long text',
|
|
270
|
+
salesPrice: 18000000,
|
|
271
|
+
specialPrice: 18000000,
|
|
272
|
+
marketPrice: 19000000,
|
|
273
|
+
discountPercent: 10,
|
|
274
|
+
salePercent: 500,
|
|
275
|
+
sppType: '2'
|
|
276
|
+
}, {
|
|
277
|
+
imgUrlContent: {
|
|
278
|
+
url: _defImg["default"]
|
|
236
279
|
},
|
|
237
|
-
offerName: '
|
|
238
|
-
salesPrice:
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
280
|
+
offerName: 'Product Name Long text',
|
|
281
|
+
salesPrice: 18000000,
|
|
282
|
+
specialPrice: 18000000,
|
|
283
|
+
marketPrice: 19000000,
|
|
284
|
+
discountPercent: 10,
|
|
285
|
+
salePercent: 500,
|
|
242
286
|
sppType: '2'
|
|
243
287
|
}];
|
|
244
288
|
|
|
@@ -304,7 +304,9 @@ function (_super) {
|
|
|
304
304
|
|
|
305
305
|
return [4
|
|
306
306
|
/*yield*/
|
|
307
|
-
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
|
|
307
|
+
, (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
|
|
308
|
+
terminalType: 'PC'
|
|
309
|
+
}, 'GET')];
|
|
308
310
|
|
|
309
311
|
case 1:
|
|
310
312
|
res = _a.sent();
|
|
@@ -57,7 +57,8 @@ function AppointmentModal(props) {
|
|
|
57
57
|
onCancel: onClose,
|
|
58
58
|
title: (0, _locale.i18n)('PUBLISH_LATER'),
|
|
59
59
|
visible: visible,
|
|
60
|
-
width: 500
|
|
60
|
+
width: 500,
|
|
61
|
+
wrapClassName: "m-appointment-modal"
|
|
61
62
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
|
|
62
63
|
autoComplete: "off",
|
|
63
64
|
form: form,
|
|
@@ -1,10 +1,23 @@
|
|
|
1
|
-
.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
[magic_design] .m-appointment-modal {
|
|
2
|
+
|
|
3
|
+
.footer {
|
|
4
|
+
display: flex;
|
|
5
|
+
justify-content: flex-end;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
.tips {
|
|
9
|
+
font-size: 13px;
|
|
10
|
+
line-height: 18px;
|
|
11
|
+
color: #A3AEC3;
|
|
12
|
+
margin-bottom: 40px;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
.ant-modal-body {
|
|
16
|
+
overflow: unset;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.ant-picker-ok button {
|
|
20
|
+
color: #fff;
|
|
21
|
+
}
|
|
22
|
+
|
|
10
23
|
}
|
|
@@ -343,6 +343,15 @@ function (_super) {
|
|
|
343
343
|
var node = document.createElement('span');
|
|
344
344
|
node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
|
|
345
345
|
node.innerText = (_a = data.text).slice.apply(_a, c.range);
|
|
346
|
+
|
|
347
|
+
node.onclick = function (e) {
|
|
348
|
+
if (c.content.clickUrl) {
|
|
349
|
+
e.stopPropagation();
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
(0, _coreUtil.clickUrl)(c.content.clickUrl);
|
|
353
|
+
};
|
|
354
|
+
|
|
346
355
|
_this.selectionRefMap[JSON.stringify(c.range)] = node;
|
|
347
356
|
|
|
348
357
|
_this.textRef.current.appendChild(node);
|
|
@@ -460,6 +469,9 @@ function (_super) {
|
|
|
460
469
|
ref: this.textRef,
|
|
461
470
|
className: (0, _classnames["default"])('m-meta-text', className),
|
|
462
471
|
contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
|
|
472
|
+
onClick: function onClick() {
|
|
473
|
+
(0, _coreUtil.clickUrl)(data.content.clickUrl);
|
|
474
|
+
},
|
|
463
475
|
onInput: function onInput(e) {
|
|
464
476
|
var text = e.target.textContent;
|
|
465
477
|
data.text = text;
|
|
@@ -274,7 +274,7 @@ function (_super) {
|
|
|
274
274
|
|
|
275
275
|
_this.selfRender();
|
|
276
276
|
},
|
|
277
|
-
value:
|
|
277
|
+
value: textData.clickUrl
|
|
278
278
|
})), /*#__PURE__*/_react["default"].createElement(_common.Field, {
|
|
279
279
|
title: (0, _locale.i18n)('CONTENT_WIDTH')
|
|
280
280
|
}, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
|