@fonixtree/magic-design 0.1.7 → 0.1.8
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/assets/images/layout-icon/carouselLayout3.png +0 -0
- package/es/common/LinkModal/BundleCampaign/index.js +22 -5
- package/es/common/LinkModal/BundleCampaign/index.less +6 -4
- package/es/common/LinkModal/CatgTable/index.js +11 -4
- package/es/common/LinkModal/CouponTable/index.js +7 -2
- package/es/common/LinkModal/CustomTable/index.js +11 -4
- package/es/common/LinkModal/FilteredProductModal/index.js +5 -1
- package/es/common/LinkModal/FilteredProductModal/index.less +1 -0
- package/es/common/LinkModal/FunctionTable/index.js +10 -3
- package/es/common/LinkModal/ProductDetailPage/index.js +6 -3
- package/es/common/LinkModal/ProductDetailPage/index.less +1 -3
- package/es/common/LinkModal/SelectVideoModal/index.js +10 -3
- package/es/common/LinkModal/SelectVideoModal/index.less +3 -3
- package/es/common/LinkModal/ShareUrl/index.js +33 -0
- package/es/common/LinkModal/ShareUrl/index.less +3 -0
- package/es/common/LinkModal/index.js +79 -79
- package/es/common/LinkModal/index.less +31 -30
- package/es/common/UrlPicker/index.js +14 -4
- package/es/common/UrlPicker/index.less +3 -0
- package/es/common/VideoUpload/index.js +1 -1
- package/es/common/VideoUpload/index.less +1 -0
- package/es/composite-comp/bol/components/Carousel/mobile/index.js +17 -6
- package/es/composite-comp/bol/components/Carousel/mobile/index.less +2 -2
- package/es/composite-comp/bol/components/Carousel/pc/index.js +20 -9
- package/es/constants/index.js +13 -1
- package/es/constants/layout.js +6 -0
- package/es/utils/businessUtil.js +133 -1
- package/es/utils/commonUtil.js +3 -1
- package/es/utils/coreUtil.js +10 -1
- package/lib/assets/images/layout-icon/carouselLayout3.png +0 -0
- package/lib/common/LinkModal/BundleCampaign/index.js +22 -5
- package/lib/common/LinkModal/BundleCampaign/index.less +6 -4
- package/lib/common/LinkModal/CatgTable/index.js +11 -4
- package/lib/common/LinkModal/CouponTable/index.js +7 -2
- package/lib/common/LinkModal/CustomTable/index.js +11 -4
- package/lib/common/LinkModal/FilteredProductModal/index.js +5 -1
- package/lib/common/LinkModal/FilteredProductModal/index.less +1 -0
- package/lib/common/LinkModal/FunctionTable/index.js +10 -3
- package/lib/common/LinkModal/ProductDetailPage/index.js +6 -3
- package/lib/common/LinkModal/ProductDetailPage/index.less +1 -3
- package/lib/common/LinkModal/SelectVideoModal/index.js +10 -3
- package/lib/common/LinkModal/SelectVideoModal/index.less +3 -3
- package/lib/common/LinkModal/ShareUrl/index.js +33 -0
- package/lib/common/LinkModal/ShareUrl/index.less +3 -0
- package/lib/common/LinkModal/index.js +79 -79
- package/lib/common/LinkModal/index.less +31 -30
- package/lib/common/UrlPicker/index.js +14 -4
- package/lib/common/UrlPicker/index.less +3 -0
- package/lib/common/VideoUpload/index.js +1 -1
- package/lib/common/VideoUpload/index.less +1 -0
- package/lib/composite-comp/bol/components/Carousel/mobile/index.js +17 -6
- package/lib/composite-comp/bol/components/Carousel/mobile/index.less +2 -2
- package/lib/composite-comp/bol/components/Carousel/pc/index.js +20 -9
- package/lib/constants/index.js +13 -1
- package/lib/constants/layout.js +6 -0
- package/lib/utils/businessUtil.js +133 -1
- package/lib/utils/commonUtil.js +3 -1
- package/lib/utils/coreUtil.js +10 -1
- package/package.json +1 -1
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
.linkModal {
|
|
2
|
-
width: 1300px;
|
|
1
|
+
[magic_design] .linkModal {
|
|
2
|
+
// width: 1300px;
|
|
3
3
|
right: unset !important;
|
|
4
4
|
left: unset !important;
|
|
5
5
|
|
|
6
|
+
.ant-modal .ant-modal-content .ant-modal-body {
|
|
7
|
+
padding-bottom: 60px !important;
|
|
8
|
+
padding-top: 0 !important;
|
|
9
|
+
}
|
|
6
10
|
.urlModalWrap {
|
|
7
11
|
font-family: 'Open Sans';
|
|
8
12
|
font-style: normal;
|
|
@@ -64,40 +68,37 @@
|
|
|
64
68
|
align-items: center;
|
|
65
69
|
}
|
|
66
70
|
}
|
|
71
|
+
}
|
|
72
|
+
.shareUrlWrap {
|
|
73
|
+
height: 500px;
|
|
74
|
+
}
|
|
67
75
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
.footer {
|
|
77
|
+
padding: 10px 0;
|
|
78
|
+
display: flex;
|
|
79
|
+
align-items: center;
|
|
80
|
+
justify-content: space-between;
|
|
81
|
+
border-top: 1px solid #e0e0e0;
|
|
82
|
+
position: absolute;
|
|
83
|
+
bottom: 0;
|
|
84
|
+
left: 24px;
|
|
85
|
+
right: 24px;
|
|
78
86
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
border-radius: 6px;
|
|
91
|
-
}
|
|
87
|
+
.btn-cancel {
|
|
88
|
+
background: #E9F0FF;
|
|
89
|
+
border-radius: 6px;
|
|
90
|
+
color: #2F54EB;
|
|
91
|
+
border: none;
|
|
92
|
+
margin-right: 12px;
|
|
93
|
+
}
|
|
94
|
+
.btn-confirm {
|
|
95
|
+
background: #2F54EB;
|
|
96
|
+
border: none;
|
|
97
|
+
border-radius: 6px;
|
|
92
98
|
}
|
|
93
|
-
|
|
94
99
|
.total {
|
|
95
100
|
font-size: 13px;
|
|
96
101
|
color: #2d3040;
|
|
97
102
|
}
|
|
98
103
|
}
|
|
99
|
-
|
|
100
|
-
.ant-modal {
|
|
101
|
-
top: 25px;
|
|
102
|
-
}
|
|
103
104
|
}
|
|
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
require("./index.less");
|
|
11
11
|
|
|
12
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
|
+
|
|
12
14
|
var _locale = require("../../locale");
|
|
13
15
|
|
|
14
16
|
var _LinkModal = _interopRequireDefault(require("../LinkModal"));
|
|
@@ -64,20 +66,28 @@ function (_super) {
|
|
|
64
66
|
var _a = this.props,
|
|
65
67
|
value = _a.value,
|
|
66
68
|
_onChange = _a.onChange,
|
|
67
|
-
disabled = _a.disabled;
|
|
69
|
+
disabled = _a.disabled; // 弹框选择url不可编辑,需要先清除
|
|
70
|
+
|
|
71
|
+
var editable = !value || !value.type;
|
|
68
72
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
69
73
|
className: "m-url-picker"
|
|
70
74
|
}, disabled && /*#__PURE__*/_react["default"].createElement("div", {
|
|
71
75
|
className: "disabled"
|
|
72
76
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
73
|
-
className: "input-url
|
|
77
|
+
className: (0, _classnames["default"])('input-url', {
|
|
78
|
+
noEditable: !editable
|
|
79
|
+
})
|
|
74
80
|
}, /*#__PURE__*/_react["default"].createElement("input", {
|
|
81
|
+
disabled: !editable,
|
|
75
82
|
onChange: function onChange(e) {
|
|
76
|
-
return _onChange(
|
|
83
|
+
return _onChange({
|
|
84
|
+
name: e.target.value,
|
|
85
|
+
value: e.target.value
|
|
86
|
+
});
|
|
77
87
|
},
|
|
78
88
|
placeholder: (0, _locale.i18n)('PLEASE_ADD_A_LINK'),
|
|
79
89
|
type: "text",
|
|
80
|
-
value: value
|
|
90
|
+
value: value.name || ''
|
|
81
91
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
82
92
|
className: "icon-btns"
|
|
83
93
|
}, window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
@@ -185,8 +185,18 @@ function (_super) {
|
|
|
185
185
|
|
|
186
186
|
var data = this.props.data;
|
|
187
187
|
var sliderIndex = this.state.sliderIndex;
|
|
188
|
-
var
|
|
189
|
-
|
|
188
|
+
var _a = data.customize,
|
|
189
|
+
layout = _a.layout,
|
|
190
|
+
rowNum = _a.rowNum;
|
|
191
|
+
var colNum = 1;
|
|
192
|
+
|
|
193
|
+
if (layout === 'layout1') {
|
|
194
|
+
colNum = Math.min(rowNum, data.groupSource.length);
|
|
195
|
+
} else if (layout === 'layout3') {
|
|
196
|
+
colNum = Math.min(rowNum + 0.2, data.groupSource.length);
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
var floorColNum = Math.floor(colNum);
|
|
190
200
|
var GAData = {
|
|
191
201
|
moduleId: data.id,
|
|
192
202
|
moduleName: data.moduleIndex + '.' + data.type
|
|
@@ -212,7 +222,8 @@ function (_super) {
|
|
|
212
222
|
_this.setState({
|
|
213
223
|
sliderIndex: newIndex
|
|
214
224
|
});
|
|
215
|
-
}
|
|
225
|
+
},
|
|
226
|
+
variableWidth: true
|
|
216
227
|
};
|
|
217
228
|
var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) + 12 + "px";
|
|
218
229
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -220,7 +231,7 @@ function (_super) {
|
|
|
220
231
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
221
232
|
className: "content",
|
|
222
233
|
style: {
|
|
223
|
-
paddingBottom: data.setting.dots.open && data.groupSource.length /
|
|
234
|
+
paddingBottom: data.setting.dots.open && data.groupSource.length / floorColNum > 1 ? dotsSpace : '0'
|
|
224
235
|
}
|
|
225
236
|
}, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
|
|
226
237
|
ref: function ref(slider) {
|
|
@@ -238,7 +249,7 @@ function (_super) {
|
|
|
238
249
|
groupId: item.id,
|
|
239
250
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
240
251
|
})
|
|
241
|
-
})),
|
|
252
|
+
})), layout === 'layout2' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
|
|
242
253
|
className: "title"
|
|
243
254
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
244
255
|
data: item.title,
|
|
@@ -276,7 +287,7 @@ function (_super) {
|
|
|
276
287
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
277
288
|
})
|
|
278
289
|
}))));
|
|
279
|
-
})), data.setting.dots.open && Math.ceil(data.groupSource.length /
|
|
290
|
+
})), data.setting.dots.open && Math.ceil(data.groupSource.length / floorColNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
280
291
|
className: "swiper-ban"
|
|
281
292
|
}, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
|
|
282
293
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -195,8 +195,18 @@ function (_super) {
|
|
|
195
195
|
|
|
196
196
|
var data = this.props.data;
|
|
197
197
|
var sliderIndex = this.state.sliderIndex;
|
|
198
|
-
var
|
|
199
|
-
|
|
198
|
+
var _a = data.customize,
|
|
199
|
+
layout = _a.layout,
|
|
200
|
+
pcRowNum = _a.pcRowNum;
|
|
201
|
+
var colNum = 1;
|
|
202
|
+
|
|
203
|
+
if (layout === 'layout1') {
|
|
204
|
+
colNum = Math.min(pcRowNum, data.groupSource.length);
|
|
205
|
+
} else if (layout === 'layout3') {
|
|
206
|
+
colNum = Math.min(pcRowNum + 0.2, data.groupSource.length);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
var floorColNum = Math.floor(colNum);
|
|
200
210
|
var GAData = {
|
|
201
211
|
moduleId: data.id,
|
|
202
212
|
moduleName: data.moduleIndex + '.' + data.type
|
|
@@ -222,7 +232,8 @@ function (_super) {
|
|
|
222
232
|
_this.setState({
|
|
223
233
|
sliderIndex: newIndex
|
|
224
234
|
});
|
|
225
|
-
}
|
|
235
|
+
},
|
|
236
|
+
variableWidth: true
|
|
226
237
|
};
|
|
227
238
|
var navStyle = {
|
|
228
239
|
fontSize: data.setting.navigation.size,
|
|
@@ -235,7 +246,7 @@ function (_super) {
|
|
|
235
246
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
236
247
|
className: "content",
|
|
237
248
|
style: {
|
|
238
|
-
paddingBottom: data.setting.dots.open && data.groupSource.length /
|
|
249
|
+
paddingBottom: data.setting.dots.open && data.groupSource.length / floorColNum > 1 ? dotsSpace : '0'
|
|
239
250
|
}
|
|
240
251
|
}, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
241
252
|
className: "carousel-icon-left",
|
|
@@ -267,10 +278,10 @@ function (_super) {
|
|
|
267
278
|
groupId: item.id,
|
|
268
279
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
269
280
|
}),
|
|
270
|
-
maxHeight: item.image.content.pcImgSrc ? 'unset' : PC_IMG_SIZE[
|
|
271
|
-
minHeight: PC_IMG_SIZE[
|
|
272
|
-
minWidth: PC_IMG_SIZE[
|
|
273
|
-
})),
|
|
281
|
+
maxHeight: item.image.content.pcImgSrc ? 'unset' : PC_IMG_SIZE[floorColNum].defH,
|
|
282
|
+
minHeight: PC_IMG_SIZE[floorColNum].minH,
|
|
283
|
+
minWidth: PC_IMG_SIZE[floorColNum].minW
|
|
284
|
+
})), layout === 'layout2' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
|
|
274
285
|
className: "title"
|
|
275
286
|
}, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
276
287
|
data: item.title,
|
|
@@ -308,7 +319,7 @@ function (_super) {
|
|
|
308
319
|
groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
|
|
309
320
|
})
|
|
310
321
|
}))));
|
|
311
|
-
}))), data.setting.dots.open && Math.ceil(data.groupSource.length /
|
|
322
|
+
}))), data.setting.dots.open && Math.ceil(data.groupSource.length / floorColNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
312
323
|
className: "swiper-ban"
|
|
313
324
|
}, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
|
|
314
325
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
package/es/constants/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
|
|
6
|
+
exports.urlTypeMap = exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
|
|
7
7
|
var STORAGE_KEY = {
|
|
8
8
|
LOCALE: 'magicLocale',
|
|
9
9
|
MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
|
|
@@ -45,6 +45,18 @@ var urlType = {
|
|
|
45
45
|
VIDEO: 'video'
|
|
46
46
|
};
|
|
47
47
|
exports.urlType = urlType;
|
|
48
|
+
var urlTypeMap = {
|
|
49
|
+
CATEGORY: 'Category',
|
|
50
|
+
CUSTOMIZED_PAGE: 'CustomizedPage',
|
|
51
|
+
PRODUCT_DETAIL_PAGE: 'ProductDetailPage',
|
|
52
|
+
FILTERED_PRODUCT: 'FilteredProduct',
|
|
53
|
+
FUNCTION_PAGE: 'FunctionPage',
|
|
54
|
+
COUPONS: 'Coupons',
|
|
55
|
+
BUNDLE_CAMPAIGN: 'BundleCampaign',
|
|
56
|
+
VIDEO: 'Video',
|
|
57
|
+
SHARE_URL: 'ShareURL'
|
|
58
|
+
};
|
|
59
|
+
exports.urlTypeMap = urlTypeMap;
|
|
48
60
|
var respCodeMap = {
|
|
49
61
|
NOT_LOGGED_IN: 'BUYER-WEB-06003'
|
|
50
62
|
};
|
package/es/constants/layout.js
CHANGED
|
@@ -29,6 +29,8 @@ var _carouselLayout = _interopRequireDefault(require("../assets/images/layout-ic
|
|
|
29
29
|
|
|
30
30
|
var _carouselLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout2.png"));
|
|
31
31
|
|
|
32
|
+
var _carouselLayout3 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout3.png"));
|
|
33
|
+
|
|
32
34
|
var _layoutImagetextP = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p1.png"));
|
|
33
35
|
|
|
34
36
|
var _layoutImagetextP2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p2.png"));
|
|
@@ -108,6 +110,10 @@ var carouselLayout = [{
|
|
|
108
110
|
id: 'layout2',
|
|
109
111
|
name: 'layout2',
|
|
110
112
|
image: _carouselLayout2["default"]
|
|
113
|
+
}, {
|
|
114
|
+
id: 'layout3',
|
|
115
|
+
name: 'layout3',
|
|
116
|
+
image: _carouselLayout3["default"]
|
|
111
117
|
}];
|
|
112
118
|
exports.carouselLayout = carouselLayout;
|
|
113
119
|
var imageTextLayoutPc = [{
|
package/es/utils/businessUtil.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.renderPreview = exports.parseUrl = exports.listToTree = exports.getPromotionList = exports.computeStyle = exports.canNumber = void 0;
|
|
6
|
+
exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToTree = exports.getPromotionList = exports.computeStyle = exports.canNumber = void 0;
|
|
7
7
|
|
|
8
8
|
var _qs = _interopRequireDefault(require("qs"));
|
|
9
9
|
|
|
@@ -16,6 +16,138 @@ var _constants = require("../constants");
|
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
17
17
|
|
|
18
18
|
/* eslint-disable import/no-cycle */
|
|
19
|
+
var newParseUrl = function newParseUrl(urlObj) {
|
|
20
|
+
var link = urlObj.value;
|
|
21
|
+
var params;
|
|
22
|
+
var type = urlObj.type,
|
|
23
|
+
value = urlObj.value,
|
|
24
|
+
offerId = urlObj.offerId,
|
|
25
|
+
productId = urlObj.productId;
|
|
26
|
+
|
|
27
|
+
switch (type) {
|
|
28
|
+
// 商品详情
|
|
29
|
+
case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
|
|
30
|
+
link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
|
|
31
|
+
params = {
|
|
32
|
+
action: 'jump',
|
|
33
|
+
params: {
|
|
34
|
+
type: 'PRODUCT_DETAIL',
|
|
35
|
+
offerId: offerId,
|
|
36
|
+
productId: productId
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
break;
|
|
40
|
+
|
|
41
|
+
case _constants.urlTypeMap.CATEGORY:
|
|
42
|
+
// 商品列表
|
|
43
|
+
link = "/product/list/" + value;
|
|
44
|
+
params = {
|
|
45
|
+
action: 'jump',
|
|
46
|
+
params: {
|
|
47
|
+
type: 'PRODUCT_LIST',
|
|
48
|
+
catgId: arg1
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
break;
|
|
52
|
+
// 海报页面
|
|
53
|
+
|
|
54
|
+
case _constants.urlTypeMap.CUSTOMIZED_PAGE:
|
|
55
|
+
link = "/poster/" + value;
|
|
56
|
+
params = {
|
|
57
|
+
action: 'jump',
|
|
58
|
+
data: {
|
|
59
|
+
type: 'NAVIGATE',
|
|
60
|
+
url: link
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
break;
|
|
64
|
+
// 商品列表
|
|
65
|
+
|
|
66
|
+
case _constants.urlTypeMap.FILTERED_PRODUCT:
|
|
67
|
+
link = "/product/list?" + value;
|
|
68
|
+
params = {
|
|
69
|
+
action: 'jump',
|
|
70
|
+
params: {
|
|
71
|
+
type: 'PRODUCT_LIST',
|
|
72
|
+
params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
|
|
73
|
+
return value;
|
|
74
|
+
})
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
break;
|
|
78
|
+
|
|
79
|
+
case _constants.urlTypeMap.COUPONS:
|
|
80
|
+
// 领取优惠券
|
|
81
|
+
params = {
|
|
82
|
+
action: 'operation',
|
|
83
|
+
params: {
|
|
84
|
+
type: 'GET_COUPON',
|
|
85
|
+
couponId: value
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
break;
|
|
89
|
+
|
|
90
|
+
case _constants.urlTypeMap.VIDEO:
|
|
91
|
+
// 播放视频
|
|
92
|
+
params = {
|
|
93
|
+
action: 'operation',
|
|
94
|
+
params: {
|
|
95
|
+
type: 'VIDEO',
|
|
96
|
+
data: (0, _commonUtil.ensure)(function () {
|
|
97
|
+
return JSON.parse(value);
|
|
98
|
+
}, {})
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
break;
|
|
102
|
+
|
|
103
|
+
case _constants.urlTypeMap.SHARE_URL:
|
|
104
|
+
// 播放视频
|
|
105
|
+
params = {
|
|
106
|
+
action: 'operation',
|
|
107
|
+
params: {
|
|
108
|
+
type: 'SHARE_URL',
|
|
109
|
+
url: value
|
|
110
|
+
}
|
|
111
|
+
};
|
|
112
|
+
break;
|
|
113
|
+
|
|
114
|
+
default:
|
|
115
|
+
var map = {
|
|
116
|
+
'/main/cart': 'CART',
|
|
117
|
+
'/main/account': 'ACCOUNT',
|
|
118
|
+
'/my-coupon': 'MY_COUPON',
|
|
119
|
+
'/coupon-center': 'COUPON_CENTER',
|
|
120
|
+
'/main/community': 'COMMUNITY',
|
|
121
|
+
'/message-center': 'MESSAGE',
|
|
122
|
+
'/spike': 'FLASH',
|
|
123
|
+
'/check-in-gift': 'CHECK_IN',
|
|
124
|
+
'/invite': 'INVITE',
|
|
125
|
+
'/special-mission': 'SOCIAL_COMMERCE',
|
|
126
|
+
'/main/category': 'CATEGORY',
|
|
127
|
+
'/main/social-commerce': 'SOCIAL_COMMERCE',
|
|
128
|
+
'/social-commerce/my-cashback': 'CASHBACK',
|
|
129
|
+
'/account/wallet': 'WALLET',
|
|
130
|
+
'/product/GroupBuy': 'GROUP',
|
|
131
|
+
'/search-page': 'SEARCH_PAGE'
|
|
132
|
+
};
|
|
133
|
+
link = url;
|
|
134
|
+
params = {
|
|
135
|
+
action: 'jump',
|
|
136
|
+
params: {
|
|
137
|
+
type: map[url],
|
|
138
|
+
link: link
|
|
139
|
+
}
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
return {
|
|
144
|
+
link: link,
|
|
145
|
+
data: params
|
|
146
|
+
};
|
|
147
|
+
};
|
|
148
|
+
|
|
149
|
+
exports.newParseUrl = newParseUrl;
|
|
150
|
+
|
|
19
151
|
var parseUrl = function parseUrl(url) {
|
|
20
152
|
var link = url;
|
|
21
153
|
var params;
|
package/es/utils/commonUtil.js
CHANGED
|
@@ -208,8 +208,10 @@ function commonFetch(url, data, method) {
|
|
|
208
208
|
var _a, _b;
|
|
209
209
|
|
|
210
210
|
var isLoginUrl = url.includes('portal/login');
|
|
211
|
+
var credentials = localStorage.getItem('credentials');
|
|
211
212
|
var headers = {
|
|
212
|
-
'Content-Type': isLoginUrl ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8'
|
|
213
|
+
'Content-Type': isLoginUrl ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8',
|
|
214
|
+
credentials: credentials
|
|
213
215
|
};
|
|
214
216
|
|
|
215
217
|
if (_method === 'GET') {
|
package/es/utils/coreUtil.js
CHANGED
|
@@ -298,7 +298,7 @@ var clickUrl = function clickUrl(url) {
|
|
|
298
298
|
return;
|
|
299
299
|
}
|
|
300
300
|
|
|
301
|
-
var _a = (0, _businessUtil.parseUrl)(url),
|
|
301
|
+
var _a = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
|
|
302
302
|
link = _a.link,
|
|
303
303
|
data = _a.data;
|
|
304
304
|
|
|
@@ -323,6 +323,15 @@ var clickUrl = function clickUrl(url) {
|
|
|
323
323
|
|
|
324
324
|
if (params.type === 'GET_COUPON') {
|
|
325
325
|
getCoupon(params.couponId);
|
|
326
|
+
return;
|
|
327
|
+
} // 分享
|
|
328
|
+
|
|
329
|
+
|
|
330
|
+
if (params.type === 'SHARE_URL') {
|
|
331
|
+
if (window.magicDesign.handleAction) {
|
|
332
|
+
window.magicDesign.handleAction(params);
|
|
333
|
+
}
|
|
334
|
+
|
|
326
335
|
return;
|
|
327
336
|
}
|
|
328
337
|
|
|
Binary file
|
|
@@ -315,7 +315,10 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
315
315
|
width: '100%'
|
|
316
316
|
}
|
|
317
317
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
|
|
318
|
-
span: 12
|
|
318
|
+
span: 12,
|
|
319
|
+
style: {
|
|
320
|
+
display: 'flex'
|
|
321
|
+
}
|
|
319
322
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
320
323
|
className: "labelStyle"
|
|
321
324
|
}, "Campaign Name"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
|
|
@@ -323,9 +326,13 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
323
326
|
onChange: function onChange(e) {
|
|
324
327
|
setCampaignName(e.target.value);
|
|
325
328
|
},
|
|
329
|
+
size: "small",
|
|
326
330
|
value: campaignName
|
|
327
331
|
})), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
|
|
328
|
-
span: 12
|
|
332
|
+
span: 12,
|
|
333
|
+
style: {
|
|
334
|
+
display: 'flex'
|
|
335
|
+
}
|
|
329
336
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
330
337
|
className: "labelStyle"
|
|
331
338
|
}, "Store"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
|
|
@@ -336,6 +343,7 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
336
343
|
optionFilterProp: "children",
|
|
337
344
|
placeholder: "Please select",
|
|
338
345
|
showSearch: true,
|
|
346
|
+
size: "small",
|
|
339
347
|
value: storeId
|
|
340
348
|
}, storeList && storeList.length > 0 && storeList.map(function (v) {
|
|
341
349
|
return /*#__PURE__*/_react["default"].createElement(Option, {
|
|
@@ -348,13 +356,17 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
348
356
|
width: '100%'
|
|
349
357
|
}
|
|
350
358
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
|
|
351
|
-
span: 12
|
|
359
|
+
span: 12,
|
|
360
|
+
style: {
|
|
361
|
+
display: 'flex'
|
|
362
|
+
}
|
|
352
363
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
353
364
|
className: "labelStyle"
|
|
354
365
|
}, "Campaign State"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
|
|
355
366
|
className: "inputStyle",
|
|
356
367
|
defaultValue: "A,B",
|
|
357
368
|
onChange: changeCamState,
|
|
369
|
+
size: "small",
|
|
358
370
|
value: cmpState
|
|
359
371
|
}, stateMap && stateMap.length > 0 && stateMap.map(function (v) {
|
|
360
372
|
return /*#__PURE__*/_react["default"].createElement(Option, {
|
|
@@ -362,9 +374,13 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
362
374
|
value: v.key
|
|
363
375
|
}, v.value);
|
|
364
376
|
}))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
|
|
365
|
-
span: 12
|
|
377
|
+
span: 12,
|
|
378
|
+
style: {
|
|
379
|
+
paddingLeft: '120px'
|
|
380
|
+
}
|
|
366
381
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
367
382
|
onClick: queryFunc,
|
|
383
|
+
size: "small",
|
|
368
384
|
style: {
|
|
369
385
|
marginRight: 10
|
|
370
386
|
},
|
|
@@ -372,7 +388,8 @@ var BundleCampaign = function BundleCampaign(props) {
|
|
|
372
388
|
}, "Query"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
373
389
|
onClick: function onClick() {
|
|
374
390
|
reset();
|
|
375
|
-
}
|
|
391
|
+
},
|
|
392
|
+
size: "small"
|
|
376
393
|
}, "Cancel"))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
|
|
377
394
|
bordered: false,
|
|
378
395
|
columns: columns,
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
.bundleCampaign{
|
|
2
|
-
padding-top: 12px;
|
|
3
|
-
border-top: 1px solid #f0f0f0;
|
|
4
|
-
|
|
2
|
+
// padding-top: 12px;
|
|
3
|
+
// border-top: 1px solid #f0f0f0;
|
|
4
|
+
height: 550px;
|
|
5
5
|
.inputStyle {
|
|
6
|
-
width:
|
|
6
|
+
width: 280px;
|
|
7
7
|
height: 32px;
|
|
8
8
|
margin-left: 10px;
|
|
9
9
|
}
|
|
10
10
|
.labelStyle {
|
|
11
11
|
display: inline-block;
|
|
12
12
|
width: 110px;
|
|
13
|
+
text-align: right;
|
|
14
|
+
line-height: 2;
|
|
13
15
|
}
|
|
14
16
|
.mb12 {
|
|
15
17
|
margin-bottom: 12px;
|
|
@@ -211,12 +211,19 @@ function CatgTable(props) {
|
|
|
211
211
|
}
|
|
212
212
|
}];
|
|
213
213
|
var rowSelection = {
|
|
214
|
-
onChange: function onChange(selectedRowKeys) {
|
|
215
|
-
_onChange(
|
|
214
|
+
onChange: function onChange(selectedRowKeys, selectedRow) {
|
|
215
|
+
_onChange({
|
|
216
|
+
value: selectedRowKeys[0],
|
|
217
|
+
name: selectedRow[0].catgName
|
|
218
|
+
});
|
|
216
219
|
},
|
|
217
220
|
type: 'radio'
|
|
218
221
|
};
|
|
219
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
222
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
223
|
+
style: {
|
|
224
|
+
height: 550
|
|
225
|
+
}
|
|
226
|
+
}, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
|
|
220
227
|
bordered: false,
|
|
221
228
|
columns: columns,
|
|
222
229
|
dataSource: catgList,
|
|
@@ -230,5 +237,5 @@ function CatgTable(props) {
|
|
|
230
237
|
scroll: {
|
|
231
238
|
y: 480
|
|
232
239
|
}
|
|
233
|
-
});
|
|
240
|
+
}));
|
|
234
241
|
}
|
|
@@ -229,7 +229,10 @@ function CouponTable(props) {
|
|
|
229
229
|
var rowSelection = {
|
|
230
230
|
type: 'radio',
|
|
231
231
|
onChange: function onChange(selectedRowKeys, selectedRows) {
|
|
232
|
-
_onChange(
|
|
232
|
+
_onChange({
|
|
233
|
+
name: selectedRows[0].couponName,
|
|
234
|
+
value: selectedRows[0].couponId
|
|
235
|
+
});
|
|
233
236
|
}
|
|
234
237
|
};
|
|
235
238
|
|
|
@@ -283,7 +286,9 @@ function CouponTable(props) {
|
|
|
283
286
|
loadCouponsList();
|
|
284
287
|
}, []);
|
|
285
288
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
286
|
-
|
|
289
|
+
style: {
|
|
290
|
+
height: 550
|
|
291
|
+
}
|
|
287
292
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
|
|
288
293
|
columns: columns,
|
|
289
294
|
dataSource: data,
|