@fonixtree/magic-design 2.0.41 → 2.0.43
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/GroupList/index.less +3 -0
- package/es/composite-comp/bol/components/Wallet/mobile/index.js +20 -18
- package/es/composite-comp/common/components/AffiliateProductItem/index.less +2 -4
- package/es/composite-comp/dito/components/AffiliateRecommend/mobile/index.js +3 -1
- package/es/composite-comp/dito/components/AffiliateRecommend/pc/index.js +3 -1
- package/es/composite-comp/dito/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js +5 -2
- package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigGroup/index.js +5 -2
- package/es/utils/businessUtil.js +6 -1
- package/lib/common/GroupList/index.less +3 -0
- package/lib/composite-comp/bol/components/Wallet/mobile/index.js +20 -18
- package/lib/composite-comp/common/components/AffiliateProductItem/index.less +2 -4
- package/lib/composite-comp/dito/components/AffiliateRecommend/mobile/index.js +3 -1
- package/lib/composite-comp/dito/components/AffiliateRecommend/pc/index.js +3 -1
- package/lib/composite-comp/dito/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js +5 -2
- package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigGroup/index.js +5 -2
- package/lib/utils/businessUtil.js +6 -1
- package/package.json +1 -1
|
@@ -338,7 +338,7 @@ function (_super) {
|
|
|
338
338
|
amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userBalance),
|
|
339
339
|
btnText: 'Social Commerce'
|
|
340
340
|
}, _b[_constants.walletType.CENDUIT] = {
|
|
341
|
-
amount:
|
|
341
|
+
amount: userPoint === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
|
|
342
342
|
btnText: 'Cenduit Mall'
|
|
343
343
|
}, _b)
|
|
344
344
|
});
|
|
@@ -423,10 +423,12 @@ function (_super) {
|
|
|
423
423
|
WalletMobile.prototype.render = function () {
|
|
424
424
|
var _this = this;
|
|
425
425
|
|
|
426
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
427
|
+
|
|
426
428
|
var data = this.props.data;
|
|
427
429
|
var sliderIndex = this.state.sliderIndex;
|
|
428
430
|
var colNum = data.customize.rowNum;
|
|
429
|
-
var autoplay = data.setting.autoplay.open;
|
|
431
|
+
var autoplay = (_b = (_a = data.setting) === null || _a === void 0 ? void 0 : _a.autoplay) === null || _b === void 0 ? void 0 : _b.open;
|
|
430
432
|
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
431
433
|
|
|
432
434
|
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
@@ -438,7 +440,7 @@ function (_super) {
|
|
|
438
440
|
arrows: false,
|
|
439
441
|
dots: false,
|
|
440
442
|
autoplay: autoplay,
|
|
441
|
-
autoplaySpeed: data.setting.autoplay.interval * 1000,
|
|
443
|
+
autoplaySpeed: ((_d = (_c = data.setting) === null || _c === void 0 ? void 0 : _c.autoplay) === null || _d === void 0 ? void 0 : _d.interval) * 1000,
|
|
442
444
|
speed: 500,
|
|
443
445
|
draggable: window.magicDesign.mode === 'renderer',
|
|
444
446
|
slidesToShow: 1,
|
|
@@ -450,12 +452,12 @@ function (_super) {
|
|
|
450
452
|
}
|
|
451
453
|
};
|
|
452
454
|
var navStyle = {
|
|
453
|
-
fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
|
|
454
|
-
color: data.setting.navigation.color
|
|
455
|
+
fontSize: (0, _commonUtil.convertToRem)((_f = (_e = data.setting) === null || _e === void 0 ? void 0 : _e.navigation) === null || _f === void 0 ? void 0 : _f.size),
|
|
456
|
+
color: (_h = (_g = data.setting) === null || _g === void 0 ? void 0 : _g.navigation) === null || _h === void 0 ? void 0 : _h.color
|
|
455
457
|
};
|
|
456
458
|
|
|
457
459
|
var getItemContent = function getItemContent(item, preItem, nextItem) {
|
|
458
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
460
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
459
461
|
|
|
460
462
|
var data = _this.props.data;
|
|
461
463
|
var userWalletData = _this.state.userWalletData;
|
|
@@ -476,47 +478,47 @@ function (_super) {
|
|
|
476
478
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
477
479
|
className: "text-content",
|
|
478
480
|
style: _bgStyle
|
|
479
|
-
}, item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
481
|
+
}, ((_a = item.title) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
480
482
|
className: "title",
|
|
481
483
|
data: item.title,
|
|
482
484
|
GAData: __assign(__assign({}, GAData), {
|
|
483
485
|
groupId: item.id,
|
|
484
486
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
485
487
|
})
|
|
486
|
-
}), item.amount.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
488
|
+
}), ((_b = item.amount) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
487
489
|
className: "amount",
|
|
488
490
|
data: __assign(__assign({}, item.amount), {
|
|
489
|
-
text: (
|
|
491
|
+
text: (_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.amount
|
|
490
492
|
}),
|
|
491
493
|
GAData: __assign(__assign({}, GAData), {
|
|
492
494
|
groupId: item.id,
|
|
493
495
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
494
496
|
}),
|
|
495
497
|
readonly: true
|
|
496
|
-
}), item.text.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
498
|
+
}), ((_d = item.text) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
497
499
|
className: "text",
|
|
498
500
|
data: __assign(__assign({}, item.text), {
|
|
499
|
-
text: ((
|
|
501
|
+
text: ((_e = userWalletData[item.sourceType]) === null || _e === void 0 ? void 0 : _e.text) || 'Make money and shop on Cendol!'
|
|
500
502
|
}),
|
|
501
503
|
GAData: __assign(__assign({}, GAData), {
|
|
502
504
|
groupId: item.id,
|
|
503
505
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
504
506
|
}),
|
|
505
507
|
readonly: true
|
|
506
|
-
}), item.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
508
|
+
}), ((_f = item.button) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
507
509
|
className: "wallet-btn",
|
|
508
510
|
data: __assign(__assign({}, item.button), {
|
|
509
|
-
text: ((
|
|
511
|
+
text: ((_g = userWalletData[item.sourceType]) === null || _g === void 0 ? void 0 : _g.btnText) || 'Lets Go!'
|
|
510
512
|
}),
|
|
511
513
|
GAData: __assign(__assign({}, GAData), {
|
|
512
514
|
groupId: item.id,
|
|
513
515
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
514
516
|
})
|
|
515
|
-
}), data.customize.layout === 'layout2' && item.peek.open && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
517
|
+
}), data.customize.layout === 'layout2' && ((_h = item.peek) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
516
518
|
className: "peek left"
|
|
517
519
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
518
520
|
data: __assign(__assign({}, item.peek), {
|
|
519
|
-
text: "" + (((
|
|
521
|
+
text: "" + (((_j = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _j === void 0 ? void 0 : _j.text) || '')
|
|
520
522
|
}),
|
|
521
523
|
GAData: __assign(__assign({}, GAData), {
|
|
522
524
|
groupId: item.id,
|
|
@@ -525,7 +527,7 @@ function (_super) {
|
|
|
525
527
|
readonly: true
|
|
526
528
|
}), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
527
529
|
data: __assign(__assign({}, item.peek), {
|
|
528
|
-
text: "" + (((
|
|
530
|
+
text: "" + (((_k = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _k === void 0 ? void 0 : _k.amount) || '')
|
|
529
531
|
}),
|
|
530
532
|
GAData: __assign(__assign({}, GAData), {
|
|
531
533
|
groupId: item.id,
|
|
@@ -536,7 +538,7 @@ function (_super) {
|
|
|
536
538
|
className: "peek right"
|
|
537
539
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
538
540
|
data: __assign(__assign({}, item.peek), {
|
|
539
|
-
text: "" + (((
|
|
541
|
+
text: "" + (((_l = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _l === void 0 ? void 0 : _l.text) || '')
|
|
540
542
|
}),
|
|
541
543
|
GAData: __assign(__assign({}, GAData), {
|
|
542
544
|
groupId: item.id,
|
|
@@ -545,7 +547,7 @@ function (_super) {
|
|
|
545
547
|
readonly: true
|
|
546
548
|
}), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
547
549
|
data: __assign(__assign({}, item.peek), {
|
|
548
|
-
text: "" + (((
|
|
550
|
+
text: "" + (((_m = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _m === void 0 ? void 0 : _m.amount) || '')
|
|
549
551
|
}),
|
|
550
552
|
GAData: __assign(__assign({}, GAData), {
|
|
551
553
|
groupId: item.id,
|
|
@@ -358,7 +358,9 @@ function (_super) {
|
|
|
358
358
|
return [4
|
|
359
359
|
/*yield*/
|
|
360
360
|
, (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
|
|
361
|
-
affiliateProductIds: prodIds
|
|
361
|
+
affiliateProductIds: prodIds,
|
|
362
|
+
pageIndex: 1,
|
|
363
|
+
pageSize: prodIds.split(',').length || 20
|
|
362
364
|
}, 'GET')];
|
|
363
365
|
|
|
364
366
|
case 2:
|
|
@@ -353,7 +353,9 @@ function (_super) {
|
|
|
353
353
|
return [4
|
|
354
354
|
/*yield*/
|
|
355
355
|
, (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
|
|
356
|
-
affiliateProductIds: prodIds
|
|
356
|
+
affiliateProductIds: prodIds,
|
|
357
|
+
pageIndex: 1,
|
|
358
|
+
pageSize: prodIds.split(',').length || 20
|
|
357
359
|
}, 'GET')];
|
|
358
360
|
|
|
359
361
|
case 2:
|
package/es/composite-comp/dito/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js
CHANGED
|
@@ -108,8 +108,11 @@ function (_super) {
|
|
|
108
108
|
alt: "",
|
|
109
109
|
src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
|
|
110
110
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
|
-
className: "name"
|
|
112
|
-
|
|
111
|
+
className: "name",
|
|
112
|
+
dangerouslySetInnerHTML: {
|
|
113
|
+
__html: src.groupName.text
|
|
114
|
+
}
|
|
115
|
+
}));
|
|
113
116
|
};
|
|
114
117
|
|
|
115
118
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -108,8 +108,11 @@ function (_super) {
|
|
|
108
108
|
alt: "",
|
|
109
109
|
src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
|
|
110
110
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
|
-
className: "name"
|
|
112
|
-
|
|
111
|
+
className: "name",
|
|
112
|
+
dangerouslySetInnerHTML: {
|
|
113
|
+
__html: src.groupName.text
|
|
114
|
+
}
|
|
115
|
+
}));
|
|
113
116
|
}; // console.log('00 reacommend source', JSON.stringify(source));
|
|
114
117
|
|
|
115
118
|
|
package/es/utils/businessUtil.js
CHANGED
|
@@ -219,7 +219,12 @@ var parseUrl = function parseUrl(url) {
|
|
|
219
219
|
switch (type) {
|
|
220
220
|
// 商品详情
|
|
221
221
|
case _constants.urlType.PRODUCT_DETAIL:
|
|
222
|
-
|
|
222
|
+
if (arg1 && arg1 !== 'undefined') {
|
|
223
|
+
link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
|
|
224
|
+
} else {
|
|
225
|
+
link = "/product/detail/" + arg2;
|
|
226
|
+
}
|
|
227
|
+
|
|
223
228
|
params = {
|
|
224
229
|
action: 'jump',
|
|
225
230
|
params: {
|
|
@@ -338,7 +338,7 @@ function (_super) {
|
|
|
338
338
|
amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userBalance),
|
|
339
339
|
btnText: 'Social Commerce'
|
|
340
340
|
}, _b[_constants.walletType.CENDUIT] = {
|
|
341
|
-
amount:
|
|
341
|
+
amount: userPoint === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
|
|
342
342
|
btnText: 'Cenduit Mall'
|
|
343
343
|
}, _b)
|
|
344
344
|
});
|
|
@@ -423,10 +423,12 @@ function (_super) {
|
|
|
423
423
|
WalletMobile.prototype.render = function () {
|
|
424
424
|
var _this = this;
|
|
425
425
|
|
|
426
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
427
|
+
|
|
426
428
|
var data = this.props.data;
|
|
427
429
|
var sliderIndex = this.state.sliderIndex;
|
|
428
430
|
var colNum = data.customize.rowNum;
|
|
429
|
-
var autoplay = data.setting.autoplay.open;
|
|
431
|
+
var autoplay = (_b = (_a = data.setting) === null || _a === void 0 ? void 0 : _a.autoplay) === null || _b === void 0 ? void 0 : _b.open;
|
|
430
432
|
/** 设计器模式下 如果选中特定group 自动播放关闭 */
|
|
431
433
|
|
|
432
434
|
if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
|
|
@@ -438,7 +440,7 @@ function (_super) {
|
|
|
438
440
|
arrows: false,
|
|
439
441
|
dots: false,
|
|
440
442
|
autoplay: autoplay,
|
|
441
|
-
autoplaySpeed: data.setting.autoplay.interval * 1000,
|
|
443
|
+
autoplaySpeed: ((_d = (_c = data.setting) === null || _c === void 0 ? void 0 : _c.autoplay) === null || _d === void 0 ? void 0 : _d.interval) * 1000,
|
|
442
444
|
speed: 500,
|
|
443
445
|
draggable: window.magicDesign.mode === 'renderer',
|
|
444
446
|
slidesToShow: 1,
|
|
@@ -450,12 +452,12 @@ function (_super) {
|
|
|
450
452
|
}
|
|
451
453
|
};
|
|
452
454
|
var navStyle = {
|
|
453
|
-
fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
|
|
454
|
-
color: data.setting.navigation.color
|
|
455
|
+
fontSize: (0, _commonUtil.convertToRem)((_f = (_e = data.setting) === null || _e === void 0 ? void 0 : _e.navigation) === null || _f === void 0 ? void 0 : _f.size),
|
|
456
|
+
color: (_h = (_g = data.setting) === null || _g === void 0 ? void 0 : _g.navigation) === null || _h === void 0 ? void 0 : _h.color
|
|
455
457
|
};
|
|
456
458
|
|
|
457
459
|
var getItemContent = function getItemContent(item, preItem, nextItem) {
|
|
458
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
460
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
459
461
|
|
|
460
462
|
var data = _this.props.data;
|
|
461
463
|
var userWalletData = _this.state.userWalletData;
|
|
@@ -476,47 +478,47 @@ function (_super) {
|
|
|
476
478
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
477
479
|
className: "text-content",
|
|
478
480
|
style: _bgStyle
|
|
479
|
-
}, item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
481
|
+
}, ((_a = item.title) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
480
482
|
className: "title",
|
|
481
483
|
data: item.title,
|
|
482
484
|
GAData: __assign(__assign({}, GAData), {
|
|
483
485
|
groupId: item.id,
|
|
484
486
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
485
487
|
})
|
|
486
|
-
}), item.amount.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
488
|
+
}), ((_b = item.amount) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
487
489
|
className: "amount",
|
|
488
490
|
data: __assign(__assign({}, item.amount), {
|
|
489
|
-
text: (
|
|
491
|
+
text: (_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.amount
|
|
490
492
|
}),
|
|
491
493
|
GAData: __assign(__assign({}, GAData), {
|
|
492
494
|
groupId: item.id,
|
|
493
495
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
494
496
|
}),
|
|
495
497
|
readonly: true
|
|
496
|
-
}), item.text.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
498
|
+
}), ((_d = item.text) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
497
499
|
className: "text",
|
|
498
500
|
data: __assign(__assign({}, item.text), {
|
|
499
|
-
text: ((
|
|
501
|
+
text: ((_e = userWalletData[item.sourceType]) === null || _e === void 0 ? void 0 : _e.text) || 'Make money and shop on Cendol!'
|
|
500
502
|
}),
|
|
501
503
|
GAData: __assign(__assign({}, GAData), {
|
|
502
504
|
groupId: item.id,
|
|
503
505
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
504
506
|
}),
|
|
505
507
|
readonly: true
|
|
506
|
-
}), item.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
508
|
+
}), ((_f = item.button) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
507
509
|
className: "wallet-btn",
|
|
508
510
|
data: __assign(__assign({}, item.button), {
|
|
509
|
-
text: ((
|
|
511
|
+
text: ((_g = userWalletData[item.sourceType]) === null || _g === void 0 ? void 0 : _g.btnText) || 'Lets Go!'
|
|
510
512
|
}),
|
|
511
513
|
GAData: __assign(__assign({}, GAData), {
|
|
512
514
|
groupId: item.id,
|
|
513
515
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
514
516
|
})
|
|
515
|
-
}), data.customize.layout === 'layout2' && item.peek.open && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
517
|
+
}), data.customize.layout === 'layout2' && ((_h = item.peek) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
516
518
|
className: "peek left"
|
|
517
519
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
518
520
|
data: __assign(__assign({}, item.peek), {
|
|
519
|
-
text: "" + (((
|
|
521
|
+
text: "" + (((_j = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _j === void 0 ? void 0 : _j.text) || '')
|
|
520
522
|
}),
|
|
521
523
|
GAData: __assign(__assign({}, GAData), {
|
|
522
524
|
groupId: item.id,
|
|
@@ -525,7 +527,7 @@ function (_super) {
|
|
|
525
527
|
readonly: true
|
|
526
528
|
}), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
527
529
|
data: __assign(__assign({}, item.peek), {
|
|
528
|
-
text: "" + (((
|
|
530
|
+
text: "" + (((_k = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _k === void 0 ? void 0 : _k.amount) || '')
|
|
529
531
|
}),
|
|
530
532
|
GAData: __assign(__assign({}, GAData), {
|
|
531
533
|
groupId: item.id,
|
|
@@ -536,7 +538,7 @@ function (_super) {
|
|
|
536
538
|
className: "peek right"
|
|
537
539
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
538
540
|
data: __assign(__assign({}, item.peek), {
|
|
539
|
-
text: "" + (((
|
|
541
|
+
text: "" + (((_l = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _l === void 0 ? void 0 : _l.text) || '')
|
|
540
542
|
}),
|
|
541
543
|
GAData: __assign(__assign({}, GAData), {
|
|
542
544
|
groupId: item.id,
|
|
@@ -545,7 +547,7 @@ function (_super) {
|
|
|
545
547
|
readonly: true
|
|
546
548
|
}), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
547
549
|
data: __assign(__assign({}, item.peek), {
|
|
548
|
-
text: "" + (((
|
|
550
|
+
text: "" + (((_m = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _m === void 0 ? void 0 : _m.amount) || '')
|
|
549
551
|
}),
|
|
550
552
|
GAData: __assign(__assign({}, GAData), {
|
|
551
553
|
groupId: item.id,
|
|
@@ -358,7 +358,9 @@ function (_super) {
|
|
|
358
358
|
return [4
|
|
359
359
|
/*yield*/
|
|
360
360
|
, (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
|
|
361
|
-
affiliateProductIds: prodIds
|
|
361
|
+
affiliateProductIds: prodIds,
|
|
362
|
+
pageIndex: 1,
|
|
363
|
+
pageSize: prodIds.split(',').length || 20
|
|
362
364
|
}, 'GET')];
|
|
363
365
|
|
|
364
366
|
case 2:
|
|
@@ -353,7 +353,9 @@ function (_super) {
|
|
|
353
353
|
return [4
|
|
354
354
|
/*yield*/
|
|
355
355
|
, (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
|
|
356
|
-
affiliateProductIds: prodIds
|
|
356
|
+
affiliateProductIds: prodIds,
|
|
357
|
+
pageIndex: 1,
|
|
358
|
+
pageSize: prodIds.split(',').length || 20
|
|
357
359
|
}, 'GET')];
|
|
358
360
|
|
|
359
361
|
case 2:
|
package/lib/composite-comp/dito/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js
CHANGED
|
@@ -108,8 +108,11 @@ function (_super) {
|
|
|
108
108
|
alt: "",
|
|
109
109
|
src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
|
|
110
110
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
|
-
className: "name"
|
|
112
|
-
|
|
111
|
+
className: "name",
|
|
112
|
+
dangerouslySetInnerHTML: {
|
|
113
|
+
__html: src.groupName.text
|
|
114
|
+
}
|
|
115
|
+
}));
|
|
113
116
|
};
|
|
114
117
|
|
|
115
118
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -108,8 +108,11 @@ function (_super) {
|
|
|
108
108
|
alt: "",
|
|
109
109
|
src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
|
|
110
110
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
111
|
-
className: "name"
|
|
112
|
-
|
|
111
|
+
className: "name",
|
|
112
|
+
dangerouslySetInnerHTML: {
|
|
113
|
+
__html: src.groupName.text
|
|
114
|
+
}
|
|
115
|
+
}));
|
|
113
116
|
}; // console.log('00 reacommend source', JSON.stringify(source));
|
|
114
117
|
|
|
115
118
|
|
|
@@ -219,7 +219,12 @@ var parseUrl = function parseUrl(url) {
|
|
|
219
219
|
switch (type) {
|
|
220
220
|
// 商品详情
|
|
221
221
|
case _constants.urlType.PRODUCT_DETAIL:
|
|
222
|
-
|
|
222
|
+
if (arg1 && arg1 !== 'undefined') {
|
|
223
|
+
link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
|
|
224
|
+
} else {
|
|
225
|
+
link = "/product/detail/" + arg2;
|
|
226
|
+
}
|
|
227
|
+
|
|
223
228
|
params = {
|
|
224
229
|
action: 'jump',
|
|
225
230
|
params: {
|