@fonixtree/magic-design 1.0.125 → 1.0.128
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/composite-comp/dito/components/PersonalInformation/defaultJSON.js +55 -1
- package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js +137 -7
- package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less +86 -0
- package/es/composite-comp/dito/config-panels/{OrdersConfig/ConfigGroup → PersonalInformationConfig/OrdersConfigGroup}/index.js +2 -2
- package/es/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +14 -4
- package/es/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +64 -1
- package/es/constants/component-types.js +3 -9
- package/es/constants/index.js +0 -4
- package/es/core/Designer/ConfigPanel/index.js +18 -1
- package/es/decorator/compositeDecorator.js +1 -1
- package/es/decorator/metaDecorator.js +1 -2
- package/es/mobx/Store.js +12 -0
- package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js +55 -1
- package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js +137 -7
- package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less +86 -0
- package/lib/composite-comp/dito/config-panels/{OrdersConfig/ConfigGroup → PersonalInformationConfig/OrdersConfigGroup}/index.js +2 -2
- package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +14 -4
- package/lib/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js +64 -1
- package/lib/constants/component-types.js +3 -9
- package/lib/constants/index.js +0 -4
- package/lib/core/Designer/ConfigPanel/index.js +18 -1
- package/lib/decorator/compositeDecorator.js +1 -1
- package/lib/decorator/metaDecorator.js +1 -2
- package/lib/mobx/Store.js +12 -0
- package/package.json +1 -1
- package/es/composite-comp/dito/components/Orders/defaultJSON.js +0 -89
- package/es/composite-comp/dito/components/Orders/index.js +0 -84
- package/es/composite-comp/dito/components/Orders/mobile/index.js +0 -352
- package/es/composite-comp/dito/components/Orders/mobile/index.less +0 -86
- package/es/composite-comp/dito/config-panels/OrdersConfig/index.js +0 -114
- package/es/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js +0 -148
- package/es/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.less +0 -9
- package/lib/composite-comp/dito/components/Orders/defaultJSON.js +0 -89
- package/lib/composite-comp/dito/components/Orders/index.js +0 -84
- package/lib/composite-comp/dito/components/Orders/mobile/index.js +0 -352
- package/lib/composite-comp/dito/components/Orders/mobile/index.less +0 -86
- package/lib/composite-comp/dito/config-panels/OrdersConfig/index.js +0 -114
- package/lib/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js +0 -148
- package/lib/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.less +0 -9
- /package/es/composite-comp/dito/config-panels/PersonalInformationConfig/{ConfigGroup → PersonInfoConfigGroup}/index.js +0 -0
- /package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/{ConfigGroup → PersonInfoConfigGroup}/index.js +0 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = void 0;
|
|
6
|
+
exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = exports.OrdersGroupSourceJSON = void 0;
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
@@ -63,6 +63,59 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
|
|
|
63
63
|
|
|
64
64
|
exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
|
|
65
65
|
|
|
66
|
+
var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
|
|
67
|
+
var groupId = (0, _uuid.v4)();
|
|
68
|
+
return {
|
|
69
|
+
id: groupId,
|
|
70
|
+
title: {
|
|
71
|
+
parentId: groupId,
|
|
72
|
+
id: (0, _uuid.v4)(),
|
|
73
|
+
open: true,
|
|
74
|
+
type: 'TEXT',
|
|
75
|
+
specialContent: [],
|
|
76
|
+
text: text || 'Name',
|
|
77
|
+
content: {
|
|
78
|
+
sizeType: 'Customize font styles',
|
|
79
|
+
fontFamily: 'Montserrat',
|
|
80
|
+
fontWeight: 500,
|
|
81
|
+
fontSize: 12,
|
|
82
|
+
color: '#2C2C2C',
|
|
83
|
+
width: 0,
|
|
84
|
+
textAlign: 'center'
|
|
85
|
+
},
|
|
86
|
+
underline: {
|
|
87
|
+
open: false,
|
|
88
|
+
textDecorationColor: '',
|
|
89
|
+
textDecorationStyle: 'solid'
|
|
90
|
+
},
|
|
91
|
+
vertical: {}
|
|
92
|
+
},
|
|
93
|
+
image: {
|
|
94
|
+
parentId: groupId,
|
|
95
|
+
id: (0, _uuid.v4)(),
|
|
96
|
+
open: true,
|
|
97
|
+
type: 'IMAGE',
|
|
98
|
+
content: {
|
|
99
|
+
h5Name: 'name2',
|
|
100
|
+
pcName: 'name2',
|
|
101
|
+
h5ImgSrc: '',
|
|
102
|
+
pcImgSrc: '',
|
|
103
|
+
clickUrl: ''
|
|
104
|
+
},
|
|
105
|
+
hover: {
|
|
106
|
+
open: false,
|
|
107
|
+
backgroundType: 'enlarge',
|
|
108
|
+
magnification: 1.5,
|
|
109
|
+
pcImgHoverUrl: '',
|
|
110
|
+
h5ImgHoverUrl: ''
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
sourceType: text
|
|
114
|
+
};
|
|
115
|
+
};
|
|
116
|
+
|
|
117
|
+
exports.OrdersGroupSourceJSON = OrdersGroupSourceJSON;
|
|
118
|
+
|
|
66
119
|
var getDefaultJSON = function getDefaultJSON() {
|
|
67
120
|
return {
|
|
68
121
|
id: (0, _uuid.v4)(),
|
|
@@ -90,6 +143,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
90
143
|
}
|
|
91
144
|
},
|
|
92
145
|
groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
|
|
146
|
+
groupSource2: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Done'), OrdersGroupSourceJSON('Cancelled')],
|
|
93
147
|
spacing: {
|
|
94
148
|
pc: {
|
|
95
149
|
paddingTop: 0,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
|
|
6
|
+
exports.setAccountPageValue = exports.pInfoData = exports.orderData = exports["default"] = void 0;
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
@@ -15,6 +15,8 @@ var _antd = require("antd");
|
|
|
15
15
|
|
|
16
16
|
var _avatar = _interopRequireDefault(require("./images/avatar.png"));
|
|
17
17
|
|
|
18
|
+
var _coreUtil = require("../../../../../utils/coreUtil");
|
|
19
|
+
|
|
18
20
|
var _components = require("../../../../../meta-comp/components");
|
|
19
21
|
|
|
20
22
|
var _androidUtil = require("../../../../../utils/androidUtil");
|
|
@@ -235,7 +237,6 @@ var pInfoData = {
|
|
|
235
237
|
}
|
|
236
238
|
};
|
|
237
239
|
exports.pInfoData = pInfoData;
|
|
238
|
-
var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
|
|
239
240
|
var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
|
|
240
241
|
|
|
241
242
|
var setAccountPageValue = function setAccountPageValue(obj) {
|
|
@@ -245,6 +246,35 @@ var setAccountPageValue = function setAccountPageValue(obj) {
|
|
|
245
246
|
|
|
246
247
|
exports.setAccountPageValue = setAccountPageValue;
|
|
247
248
|
|
|
249
|
+
var getAccountPageValue = function getAccountPageValue(key) {
|
|
250
|
+
var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
|
|
251
|
+
return accountPageValue ? accountPageValue[key] || '' : '';
|
|
252
|
+
};
|
|
253
|
+
|
|
254
|
+
var orderData = {
|
|
255
|
+
'To Pay': {
|
|
256
|
+
key: 'toPayNum',
|
|
257
|
+
route: '/main/order/1'
|
|
258
|
+
},
|
|
259
|
+
'To Ship': {
|
|
260
|
+
key: 'toDeliveryNum',
|
|
261
|
+
route: '/main/order/2'
|
|
262
|
+
},
|
|
263
|
+
'To Receive': {
|
|
264
|
+
key: 'toReceiveNum',
|
|
265
|
+
route: '/main/order/3'
|
|
266
|
+
},
|
|
267
|
+
Done: {
|
|
268
|
+
key: 'toRatingNum',
|
|
269
|
+
route: '/main/order/4'
|
|
270
|
+
},
|
|
271
|
+
Cancelled: {
|
|
272
|
+
key: 'returnsNum',
|
|
273
|
+
route: '/main/order/5'
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
exports.orderData = orderData;
|
|
277
|
+
|
|
248
278
|
var PersonalInfoMobile =
|
|
249
279
|
/** @class */
|
|
250
280
|
function (_super) {
|
|
@@ -258,7 +288,8 @@ function (_super) {
|
|
|
258
288
|
userInfo: currentUser,
|
|
259
289
|
loading: false,
|
|
260
290
|
selectedImgFile: {},
|
|
261
|
-
editImgModalVisible: false
|
|
291
|
+
editImgModalVisible: false,
|
|
292
|
+
orderStatus: getAccountPageValue('orderStatus') || {}
|
|
262
293
|
};
|
|
263
294
|
|
|
264
295
|
_this.getNum = function (v) {
|
|
@@ -309,6 +340,8 @@ function (_super) {
|
|
|
309
340
|
};
|
|
310
341
|
|
|
311
342
|
_this.clickName = function () {
|
|
343
|
+
var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
|
|
344
|
+
|
|
312
345
|
if (!(0, _isEmpty["default"])(LPObj)) {
|
|
313
346
|
return;
|
|
314
347
|
}
|
|
@@ -406,7 +439,6 @@ function (_super) {
|
|
|
406
439
|
|
|
407
440
|
_this.hideBottomBar = function () {
|
|
408
441
|
var homeNavBar = document.querySelector('.home-navigation');
|
|
409
|
-
console.log('homeNavBar', homeNavBar);
|
|
410
442
|
if (homeNavBar) homeNavBar.style.visibility = 'hidden';
|
|
411
443
|
};
|
|
412
444
|
|
|
@@ -471,6 +503,57 @@ function (_super) {
|
|
|
471
503
|
}
|
|
472
504
|
};
|
|
473
505
|
|
|
506
|
+
_this.onItemClick = function (v) {
|
|
507
|
+
var _a;
|
|
508
|
+
|
|
509
|
+
if ((0, _commonUtil.checkLogin)(true)) {
|
|
510
|
+
var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
|
|
511
|
+
var selfUrl = (0, _commonUtil.ensure)(function () {
|
|
512
|
+
return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
|
|
513
|
+
}, '');
|
|
514
|
+
(0, _commonUtil.navigateTo)(routeUrl || selfUrl);
|
|
515
|
+
}
|
|
516
|
+
};
|
|
517
|
+
|
|
518
|
+
_this.getInit = function () {
|
|
519
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
520
|
+
var orderStatus;
|
|
521
|
+
return __generator(this, function (_a) {
|
|
522
|
+
switch (_a.label) {
|
|
523
|
+
case 0:
|
|
524
|
+
return [4
|
|
525
|
+
/*yield*/
|
|
526
|
+
, (0, _commonUtil.commonFetch)('/designer/v1/h5/orders/status/num', {}, 'GET')];
|
|
527
|
+
|
|
528
|
+
case 1:
|
|
529
|
+
orderStatus = _a.sent();
|
|
530
|
+
this.setState({
|
|
531
|
+
orderStatus: orderStatus
|
|
532
|
+
});
|
|
533
|
+
setAccountPageValue({
|
|
534
|
+
orderStatus: orderStatus
|
|
535
|
+
});
|
|
536
|
+
return [2
|
|
537
|
+
/*return*/
|
|
538
|
+
];
|
|
539
|
+
}
|
|
540
|
+
});
|
|
541
|
+
});
|
|
542
|
+
};
|
|
543
|
+
|
|
544
|
+
_this.getImageHtml = function (item) {
|
|
545
|
+
var orderStatus = _this.state.orderStatus;
|
|
546
|
+
var num = (0, _commonUtil.ensure)(function () {
|
|
547
|
+
return orderStatus[orderData[item.sourceType].key];
|
|
548
|
+
}, '');
|
|
549
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
|
|
550
|
+
data: item.image,
|
|
551
|
+
maxWidth: "100%"
|
|
552
|
+
}), num ? /*#__PURE__*/_react["default"].createElement("span", {
|
|
553
|
+
className: "pot"
|
|
554
|
+
}, num) : null);
|
|
555
|
+
};
|
|
556
|
+
|
|
474
557
|
return _this;
|
|
475
558
|
}
|
|
476
559
|
|
|
@@ -480,6 +563,10 @@ function (_super) {
|
|
|
480
563
|
}
|
|
481
564
|
|
|
482
565
|
this.getMessageNum();
|
|
566
|
+
|
|
567
|
+
if ((0, _commonUtil.isLogin)()) {
|
|
568
|
+
this.getInit();
|
|
569
|
+
}
|
|
483
570
|
};
|
|
484
571
|
|
|
485
572
|
PersonalInfoMobile.prototype.render = function () {
|
|
@@ -491,6 +578,7 @@ function (_super) {
|
|
|
491
578
|
userInfo = _a.userInfo,
|
|
492
579
|
editImgModalVisible = _a.editImgModalVisible,
|
|
493
580
|
selectedImgFile = _a.selectedImgFile;
|
|
581
|
+
var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
|
|
494
582
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
495
583
|
className: (0, _classnames["default"])('personal-information-mobile')
|
|
496
584
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -537,7 +625,7 @@ function (_super) {
|
|
|
537
625
|
onClick: this.goLoginPage
|
|
538
626
|
}, (0, _locale.i18n)('LOGIN_OR_REGISTER')))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
539
627
|
className: "btnGroup"
|
|
540
|
-
},
|
|
628
|
+
}, (0, _isEmpty["default"])(LPObj) && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
541
629
|
color: "#fff",
|
|
542
630
|
onClick: this.goSettings,
|
|
543
631
|
size: 24,
|
|
@@ -551,7 +639,7 @@ function (_super) {
|
|
|
551
639
|
type: "icon-messages"
|
|
552
640
|
}), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
|
|
553
641
|
className: "num"
|
|
554
|
-
}, messageNum)))), (0, _commonUtil.isLogin)() && /*#__PURE__*/_react["default"].createElement("div", {
|
|
642
|
+
}, messageNum)))), ((0, _commonUtil.isLogin)() || (0, _coreUtil.isDesignMode)()) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
555
643
|
className: "bottom"
|
|
556
644
|
}, data.groupSource.map(function (item) {
|
|
557
645
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -577,7 +665,49 @@ function (_super) {
|
|
|
577
665
|
item.title.text = text;
|
|
578
666
|
}
|
|
579
667
|
})));
|
|
580
|
-
})),
|
|
668
|
+
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
669
|
+
className: "orders"
|
|
670
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
671
|
+
className: "fixed-wrap"
|
|
672
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
673
|
+
className: "top"
|
|
674
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
675
|
+
className: "title"
|
|
676
|
+
}, (0, _locale.i18n)('ORDERS')), /*#__PURE__*/_react["default"].createElement("div", {
|
|
677
|
+
className: "btn-wrap"
|
|
678
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
679
|
+
className: "text",
|
|
680
|
+
onClick: function onClick() {
|
|
681
|
+
if ((0, _commonUtil.checkLogin)(true)) (0, _commonUtil.navigateTo)('/main/order/0');
|
|
682
|
+
}
|
|
683
|
+
}, (0, _locale.i18n)('VIEW_ALL_ORDERS')), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
|
|
684
|
+
color: "#C7C7C7",
|
|
685
|
+
size: 13,
|
|
686
|
+
type: "icon-outlined-right"
|
|
687
|
+
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
688
|
+
className: "list"
|
|
689
|
+
}, data.groupSource2.map(function (item) {
|
|
690
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
691
|
+
key: item.id,
|
|
692
|
+
className: "item",
|
|
693
|
+
onClick: function onClick() {
|
|
694
|
+
return _this.onItemClick(item.sourceType);
|
|
695
|
+
}
|
|
696
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
697
|
+
className: "content-wrap",
|
|
698
|
+
style: {
|
|
699
|
+
pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
|
|
700
|
+
}
|
|
701
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
702
|
+
className: "img-wrap"
|
|
703
|
+
}, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
|
|
704
|
+
className: "title",
|
|
705
|
+
data: item.title,
|
|
706
|
+
onTextInput: function onTextInput(text) {
|
|
707
|
+
item.title.text = text;
|
|
708
|
+
}
|
|
709
|
+
})));
|
|
710
|
+
})))), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
|
|
581
711
|
onClose: function onClose() {
|
|
582
712
|
_this.setState({
|
|
583
713
|
editImgModalVisible: false
|
|
@@ -141,3 +141,89 @@
|
|
|
141
141
|
line-height: 0.32rem;
|
|
142
142
|
text-align: center;
|
|
143
143
|
}
|
|
144
|
+
.personal-information-mobile .orders {
|
|
145
|
+
margin-top: 0.48rem;
|
|
146
|
+
}
|
|
147
|
+
.personal-information-mobile .orders .fixed-wrap {
|
|
148
|
+
display: flex;
|
|
149
|
+
flex-direction: column;
|
|
150
|
+
background-color: #fff;
|
|
151
|
+
box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
|
|
152
|
+
border-radius: 0.32rem;
|
|
153
|
+
width: auto;
|
|
154
|
+
padding: 0.32rem;
|
|
155
|
+
}
|
|
156
|
+
.personal-information-mobile .orders .fixed-wrap .top {
|
|
157
|
+
display: flex;
|
|
158
|
+
flex-direction: row;
|
|
159
|
+
justify-content: space-between;
|
|
160
|
+
font-weight: 600;
|
|
161
|
+
line-height: 0.36rem;
|
|
162
|
+
color: var(--font-color);
|
|
163
|
+
}
|
|
164
|
+
.personal-information-mobile .orders .fixed-wrap .top .title {
|
|
165
|
+
font-size: 0.28rem;
|
|
166
|
+
font-weight: 600;
|
|
167
|
+
color: #2C2C2C;
|
|
168
|
+
}
|
|
169
|
+
.personal-information-mobile .orders .fixed-wrap .top .btn-wrap {
|
|
170
|
+
display: flex;
|
|
171
|
+
flex-direction: row;
|
|
172
|
+
justify-content: center;
|
|
173
|
+
align-items: center;
|
|
174
|
+
}
|
|
175
|
+
.personal-information-mobile .orders .fixed-wrap .top .btn-wrap .text {
|
|
176
|
+
font-size: 0.28rem;
|
|
177
|
+
color: #929292;
|
|
178
|
+
font-weight: 400;
|
|
179
|
+
margin-right: 0.08rem;
|
|
180
|
+
}
|
|
181
|
+
.personal-information-mobile .orders .fixed-wrap .list {
|
|
182
|
+
display: flex;
|
|
183
|
+
flex-direction: row;
|
|
184
|
+
justify-content: space-between;
|
|
185
|
+
height: 1.32rem;
|
|
186
|
+
margin-top: 0.48rem;
|
|
187
|
+
margin-bottom: 0.02rem;
|
|
188
|
+
}
|
|
189
|
+
.personal-information-mobile .orders .fixed-wrap .list .item {
|
|
190
|
+
display: flex;
|
|
191
|
+
flex: 1 1;
|
|
192
|
+
}
|
|
193
|
+
.personal-information-mobile .orders .fixed-wrap .list .item .content-wrap {
|
|
194
|
+
width: 100%;
|
|
195
|
+
display: flex;
|
|
196
|
+
flex-direction: column;
|
|
197
|
+
justify-content: center;
|
|
198
|
+
align-items: center;
|
|
199
|
+
}
|
|
200
|
+
.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap {
|
|
201
|
+
position: relative;
|
|
202
|
+
display: flex;
|
|
203
|
+
margin-bottom: 0.16rem;
|
|
204
|
+
width: 0.72rem;
|
|
205
|
+
height: 0.72rem;
|
|
206
|
+
}
|
|
207
|
+
.personal-information-mobile .orders .fixed-wrap .list .item .img-wrap .pot {
|
|
208
|
+
display: inline-block;
|
|
209
|
+
padding: 0 0.08rem;
|
|
210
|
+
background: #ce1126;
|
|
211
|
+
border: 0.02rem solid #ce1126;
|
|
212
|
+
font-size: 0.16rem;
|
|
213
|
+
text-align: center;
|
|
214
|
+
color: #fff;
|
|
215
|
+
position: absolute;
|
|
216
|
+
top: -0.04rem;
|
|
217
|
+
left: 0.4rem;
|
|
218
|
+
min-width: 0.32rem;
|
|
219
|
+
height: 0.32rem;
|
|
220
|
+
border-radius: 50%;
|
|
221
|
+
line-height: 0.3rem;
|
|
222
|
+
}
|
|
223
|
+
.personal-information-mobile .orders .fixed-wrap .list .item .title {
|
|
224
|
+
height: 0.44rem;
|
|
225
|
+
font-size: 0.24rem;
|
|
226
|
+
line-height: 0.22rem;
|
|
227
|
+
color: #2C2C2C;
|
|
228
|
+
text-align: center;
|
|
229
|
+
}
|
|
@@ -13,9 +13,9 @@ var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList
|
|
|
13
13
|
|
|
14
14
|
var _coreUtil = require("../../../../../utils/coreUtil");
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _defaultJSON = require("../../../components/PersonalInformation/defaultJSON");
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _Button = _interopRequireDefault(require("../../../../../common/Button"));
|
|
19
19
|
|
|
20
20
|
var _locale = require("../../../../../locale");
|
|
21
21
|
|
|
@@ -7,10 +7,12 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _PersonInfoConfigGroup = _interopRequireDefault(require("./PersonInfoConfigGroup"));
|
|
11
11
|
|
|
12
12
|
var _ConfigDecoration = _interopRequireDefault(require("./ConfigDecoration"));
|
|
13
13
|
|
|
14
|
+
var _OrdersConfigGroup = _interopRequireDefault(require("./OrdersConfigGroup"));
|
|
15
|
+
|
|
14
16
|
var _locale = require("../../../../locale");
|
|
15
17
|
|
|
16
18
|
var _common = require("../../../../common");
|
|
@@ -94,20 +96,28 @@ function (_super) {
|
|
|
94
96
|
})
|
|
95
97
|
}, {
|
|
96
98
|
key: 'PersonalInformation3',
|
|
97
|
-
name: (0, _locale.i18n)('
|
|
98
|
-
value: /*#__PURE__*/_react["default"].createElement(
|
|
99
|
+
name: (0, _locale.i18n)('CONTENT'),
|
|
100
|
+
value: /*#__PURE__*/_react["default"].createElement(_PersonInfoConfigGroup["default"], {
|
|
99
101
|
maxNum: 4,
|
|
100
102
|
source: data.groupSource
|
|
101
103
|
}),
|
|
102
104
|
metaOption: data.groupSource
|
|
103
105
|
}, {
|
|
104
106
|
key: 'PersonalInformation4',
|
|
107
|
+
name: (0, _locale.i18n)('ORDERS'),
|
|
108
|
+
value: /*#__PURE__*/_react["default"].createElement(_OrdersConfigGroup["default"], {
|
|
109
|
+
maxNum: 5,
|
|
110
|
+
source: data.groupSource2
|
|
111
|
+
}),
|
|
112
|
+
metaOption: data.groupSource2
|
|
113
|
+
}, {
|
|
114
|
+
key: 'PersonalInformation5',
|
|
105
115
|
name: (0, _locale.i18n)('SPACING'),
|
|
106
116
|
value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
|
|
107
117
|
data: data.spacing
|
|
108
118
|
})
|
|
109
119
|
}, {
|
|
110
|
-
key: '
|
|
120
|
+
key: 'PersonalInformation6',
|
|
111
121
|
name: (0, _locale.i18n)('BACKGROUND'),
|
|
112
122
|
value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
|
|
113
123
|
data: data.background
|
package/es/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js
CHANGED
|
@@ -11,6 +11,8 @@ var _antd = require("antd");
|
|
|
11
11
|
|
|
12
12
|
var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
|
|
13
13
|
|
|
14
|
+
var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
|
|
15
|
+
|
|
14
16
|
var _common = require("../../../../common");
|
|
15
17
|
|
|
16
18
|
var _coreUtil = require("../../../../utils/coreUtil");
|
|
@@ -115,6 +117,59 @@ function (_super) {
|
|
|
115
117
|
}, (0, _locale.i18n)('RECENTLY_VIEWED'))))));
|
|
116
118
|
};
|
|
117
119
|
|
|
120
|
+
_this.getOrdersPanel = function (data) {
|
|
121
|
+
var source = [{
|
|
122
|
+
key: 'secondContent3',
|
|
123
|
+
name: (0, _locale.i18n)('Icon'),
|
|
124
|
+
value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
|
|
125
|
+
data: data.image
|
|
126
|
+
}),
|
|
127
|
+
metaOption: data.image
|
|
128
|
+
}, {
|
|
129
|
+
key: 'secondContent4',
|
|
130
|
+
name: /*#__PURE__*/_react["default"].createElement("span", {
|
|
131
|
+
dangerouslySetInnerHTML: {
|
|
132
|
+
__html: data.title.text
|
|
133
|
+
}
|
|
134
|
+
}),
|
|
135
|
+
value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
|
|
136
|
+
data: data.title
|
|
137
|
+
}),
|
|
138
|
+
metaOption: data.title
|
|
139
|
+
}];
|
|
140
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
|
|
141
|
+
headerSize: "middle",
|
|
142
|
+
onRefresh: function onRefresh() {
|
|
143
|
+
return (0, _coreUtil.renderPreview)();
|
|
144
|
+
},
|
|
145
|
+
showActiveColor: true,
|
|
146
|
+
source: source,
|
|
147
|
+
type: "switch"
|
|
148
|
+
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
149
|
+
className: "sourceOfAmount"
|
|
150
|
+
}, /*#__PURE__*/_react["default"].createElement(_common.Field, {
|
|
151
|
+
title: (0, _locale.i18n)('SOURCE_OF_AMOUNT')
|
|
152
|
+
}, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
|
|
153
|
+
onChange: function onChange(v) {
|
|
154
|
+
data.sourceType = v;
|
|
155
|
+
data.title.text = v;
|
|
156
|
+
|
|
157
|
+
_this.selfRender();
|
|
158
|
+
},
|
|
159
|
+
value: data.sourceType
|
|
160
|
+
}, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
|
|
161
|
+
value: _index.orderStatusType.PAY
|
|
162
|
+
}, (0, _locale.i18n)('TO_PAY')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
|
|
163
|
+
value: _index.orderStatusType.SHIP
|
|
164
|
+
}, (0, _locale.i18n)('TO_SHIP')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
|
|
165
|
+
value: _index.orderStatusType.RECEIVE
|
|
166
|
+
}, (0, _locale.i18n)('TO_RECEIVE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
|
|
167
|
+
value: _index.orderStatusType.DONE
|
|
168
|
+
}, (0, _locale.i18n)('DONE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
|
|
169
|
+
value: _index.orderStatusType.CANCELLED
|
|
170
|
+
}, (0, _locale.i18n)('CANCELLED'))))));
|
|
171
|
+
};
|
|
172
|
+
|
|
118
173
|
return _this;
|
|
119
174
|
}
|
|
120
175
|
|
|
@@ -122,7 +177,15 @@ function (_super) {
|
|
|
122
177
|
var panelProps = this.props.panelProps;
|
|
123
178
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
124
179
|
className: "personal_info_second_conf_wrap"
|
|
125
|
-
}, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
|
|
180
|
+
}, panelProps.image ? /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
|
|
181
|
+
divider: "bold",
|
|
182
|
+
headerSize: "large",
|
|
183
|
+
source: [{
|
|
184
|
+
key: 'secondConfig2',
|
|
185
|
+
name: (0, _locale.i18n)('ORDERS'),
|
|
186
|
+
value: this.getOrdersPanel(panelProps, true)
|
|
187
|
+
}]
|
|
188
|
+
}) : /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
|
|
126
189
|
divider: "bold",
|
|
127
190
|
headerSize: "large",
|
|
128
191
|
source: [{
|
|
@@ -55,8 +55,6 @@ var _HeadNavigation = _interopRequireDefault(require("../composite-comp/dito/com
|
|
|
55
55
|
|
|
56
56
|
var _PersonalInformation = _interopRequireDefault(require("../composite-comp/dito/components/PersonalInformation"));
|
|
57
57
|
|
|
58
|
-
var _Orders = _interopRequireDefault(require("../composite-comp/dito/components/Orders"));
|
|
59
|
-
|
|
60
58
|
var _CommonFunctions = _interopRequireDefault(require("../composite-comp/dito/components/CommonFunctions"));
|
|
61
59
|
|
|
62
60
|
var _Bargain = _interopRequireDefault(require("../composite-comp/dito/components/Bargain"));
|
|
@@ -113,8 +111,6 @@ var _HeadNavigationConfig = _interopRequireDefault(require("../composite-comp/di
|
|
|
113
111
|
|
|
114
112
|
var _PersonalInformationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/PersonalInformationConfig"));
|
|
115
113
|
|
|
116
|
-
var _OrdersConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/OrdersConfig"));
|
|
117
|
-
|
|
118
114
|
var _CommonFunctionsConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/CommonFunctionsConfig"));
|
|
119
115
|
|
|
120
116
|
var _BargainConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/BargainConfig"));
|
|
@@ -155,8 +151,6 @@ var _HeadNavigationSecondConfig = _interopRequireDefault(require("../composite-c
|
|
|
155
151
|
|
|
156
152
|
var _PersonalInformationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/PersonalInformationSecondConfig"));
|
|
157
153
|
|
|
158
|
-
var _OrdersSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/OrdersSecondConfig"));
|
|
159
|
-
|
|
160
154
|
var _CommonFunctionsSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig"));
|
|
161
155
|
|
|
162
156
|
var _SearchBannerSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/SearchBannerSecondConfig"));
|
|
@@ -169,17 +163,17 @@ var _a, _b, _c; // 组件
|
|
|
169
163
|
/**
|
|
170
164
|
* 渲染组件索引
|
|
171
165
|
*/
|
|
172
|
-
var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_GroupBuy["default"].type] = _GroupBuy["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_MenuNavigation["default"].type] = _MenuNavigation["default"], _a[_HeadNavigation["default"].type] = _HeadNavigation["default"], _a[_PersonalInformation["default"].type] = _PersonalInformation["default"], _a[
|
|
166
|
+
var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_GroupBuy["default"].type] = _GroupBuy["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_MenuNavigation["default"].type] = _MenuNavigation["default"], _a[_HeadNavigation["default"].type] = _HeadNavigation["default"], _a[_PersonalInformation["default"].type] = _PersonalInformation["default"], _a[_CommonFunctions["default"].type] = _CommonFunctions["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_AffiliateRecommend["default"].type] = _AffiliateRecommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a[_Wallet["default"].type] = _Wallet["default"], _a[_WalletNuri["default"].type] = _WalletNuri["default"], _a[_CustomCode["default"].type] = _CustomCode["default"], _a[_Location["default"].type] = _Location["default"], _a[_Bargain["default"].type] = _Bargain["default"], _a[_SearchBanner["default"].type] = _SearchBanner["default"], _a);
|
|
173
167
|
/**
|
|
174
168
|
* 一级配置面板索引
|
|
175
169
|
*/
|
|
176
170
|
|
|
177
171
|
exports.componentMap = componentMap;
|
|
178
|
-
var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_GroupBuy["default"].type] = _GroupBuyConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_MenuNavigation["default"].type] = _MenuNavigationConfig["default"], _b[_HeadNavigation["default"].type] = _HeadNavigationConfig["default"], _b[_PersonalInformation["default"].type] = _PersonalInformationConfig["default"], _b[
|
|
172
|
+
var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_GroupBuy["default"].type] = _GroupBuyConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_MenuNavigation["default"].type] = _MenuNavigationConfig["default"], _b[_HeadNavigation["default"].type] = _HeadNavigationConfig["default"], _b[_PersonalInformation["default"].type] = _PersonalInformationConfig["default"], _b[_CommonFunctions["default"].type] = _CommonFunctionsConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_AffiliateRecommend["default"].type] = _AffiliateRecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b[_Wallet["default"].type] = _WalletConfig["default"], _b[_WalletNuri["default"].type] = _WalletNuriConfig["default"], _b[_CustomCode["default"].type] = _CustomCodeConfig["default"], _b[_Location["default"].type] = _LocationConfig["default"], _b[_Bargain["default"].type] = _BargainConfig["default"], _b[_SearchBanner["default"].type] = _SearchBannerConfig["default"], _b);
|
|
179
173
|
/**
|
|
180
174
|
* 二级配置面板索引
|
|
181
175
|
*/
|
|
182
176
|
|
|
183
177
|
exports.configPanelMap = configPanelMap;
|
|
184
|
-
var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Video["default"].type] = _VideoSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_AffiliateRecommend["default"].type] = _AffiliateRecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_MenuNavigation["default"].type] = _MenuNavigationSecondConfig["default"], _c[_HeadNavigation["default"].type] = _HeadNavigationSecondConfig["default"], _c[_PersonalInformation["default"].type] = _PersonalInformationSecondConfig["default"], _c[
|
|
178
|
+
var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Video["default"].type] = _VideoSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_AffiliateRecommend["default"].type] = _AffiliateRecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_MenuNavigation["default"].type] = _MenuNavigationSecondConfig["default"], _c[_HeadNavigation["default"].type] = _HeadNavigationSecondConfig["default"], _c[_PersonalInformation["default"].type] = _PersonalInformationSecondConfig["default"], _c[_CommonFunctions["default"].type] = _CommonFunctionsSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_ImageGallery["default"].type] = _ImageGallerySecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c[_Wallet["default"].type] = _WalletSecondConfig["default"], _c[_WalletNuri["default"].type] = _WalletNuriSecondConfig["default"], _c[_SearchBanner["default"].type] = _SearchBannerSecondConfig["default"], _c);
|
|
185
179
|
exports.secondConfigPanelMap = secondConfigPanelMap;
|
package/es/constants/index.js
CHANGED
|
@@ -66,6 +66,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
|
|
|
66
66
|
return;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
+
console.log('....', selectedNode, _mobx.store.clickedGroup);
|
|
69
70
|
var panelProps = selectedNode.groupSource.find(function (src) {
|
|
70
71
|
return src.id === clickedGroup;
|
|
71
72
|
});
|
|
@@ -73,6 +74,15 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
|
|
|
73
74
|
return src.id === clickedGroup;
|
|
74
75
|
});
|
|
75
76
|
|
|
77
|
+
if (!panelProps) {
|
|
78
|
+
panelProps = selectedNode.groupSource2.find(function (src) {
|
|
79
|
+
return src.id === clickedGroup;
|
|
80
|
+
});
|
|
81
|
+
panelIndex = selectedNode.groupSource2.findIndex(function (src) {
|
|
82
|
+
return src.id === clickedGroup;
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
|
|
76
86
|
if (!panelProps) {
|
|
77
87
|
return;
|
|
78
88
|
}
|
|
@@ -133,7 +143,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
|
|
|
133
143
|
break;
|
|
134
144
|
|
|
135
145
|
case 'PERSONAL_INFOMATION':
|
|
136
|
-
case 'ORDERS':
|
|
137
146
|
groupName = panelProps.sourceType;
|
|
138
147
|
break;
|
|
139
148
|
}
|
|
@@ -291,6 +300,14 @@ function (_super) {
|
|
|
291
300
|
});
|
|
292
301
|
}, null);
|
|
293
302
|
|
|
303
|
+
if (!panelProps) {
|
|
304
|
+
panelProps = (0, _commonUtil.ensure)(function () {
|
|
305
|
+
return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2.find(function (src) {
|
|
306
|
+
return src.id === _this.state.clickedGroup;
|
|
307
|
+
});
|
|
308
|
+
}, null);
|
|
309
|
+
}
|
|
310
|
+
|
|
294
311
|
if (panelProps) {
|
|
295
312
|
var instance = Clazz ? /*#__PURE__*/_react["default"].createElement(Clazz, {
|
|
296
313
|
panelProps: panelProps,
|