@fonixtree/magic-design 2.0.83 → 2.0.84
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/CommonFunctions/defaultJSON.js +3 -3
- package/es/composite-comp/dito/components/CommonFunctions/mobile/index.less +2 -5
- package/es/composite-comp/dito/components/Orders/defaultJSON.js +4 -4
- package/es/composite-comp/dito/components/Orders/mobile/index.js +4 -2
- package/es/composite-comp/dito/components/Orders/mobile/index.less +12 -9
- package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js +6 -6
- package/es/composite-comp/dito/components/PersonalInformation/index.js +1 -1
- package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js +4 -4
- package/es/composite-comp/dito/config-panels/OrdersConfig/index.js +1 -0
- package/es/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigGroup/index.js +4 -1
- package/es/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +1 -0
- package/es/constants/index.js +2 -2
- package/es/core/Designer/ConfigPanel/index.js +1 -1
- package/es/locale/en/en.json +1 -1
- package/es/locale/es/es.json +1 -1
- package/es/locale/id/id.json +1 -1
- package/lib/composite-comp/dito/components/CommonFunctions/defaultJSON.js +3 -3
- package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.less +2 -5
- package/lib/composite-comp/dito/components/Orders/defaultJSON.js +4 -4
- package/lib/composite-comp/dito/components/Orders/mobile/index.js +4 -2
- package/lib/composite-comp/dito/components/Orders/mobile/index.less +12 -9
- package/lib/composite-comp/dito/components/PersonalInformation/defaultJSON.js +6 -6
- package/lib/composite-comp/dito/components/PersonalInformation/index.js +1 -1
- package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js +4 -4
- package/lib/composite-comp/dito/config-panels/OrdersConfig/index.js +1 -0
- package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigGroup/index.js +4 -1
- package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/index.js +1 -0
- package/lib/constants/index.js +2 -2
- package/lib/core/Designer/ConfigPanel/index.js +1 -1
- package/lib/locale/en/en.json +1 -1
- package/lib/locale/es/es.json +1 -1
- package/lib/locale/id/id.json +1 -1
- package/package.json +1 -1
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
|
|
10
|
+
var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text: 'Function Name',
|
|
20
|
+
text: text || 'Function Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -63,7 +63,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
63
63
|
return {
|
|
64
64
|
id: (0, _uuid.v4)(),
|
|
65
65
|
type: 'COMMON_FUNCTIONS',
|
|
66
|
-
groupSource: [CommonFunctionsGroupSourceJSON()],
|
|
66
|
+
groupSource: [CommonFunctionsGroupSourceJSON('Address'), CommonFunctionsGroupSourceJSON('Policies'), CommonFunctionsGroupSourceJSON('Security Center'), CommonFunctionsGroupSourceJSON('Function Name')],
|
|
67
67
|
spacing: {
|
|
68
68
|
pc: {
|
|
69
69
|
paddingTop: 0,
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
.common-functions-mobile {
|
|
2
|
-
|
|
3
|
-
padding-top: 1.7rem;
|
|
4
|
-
height: calc(100vh - 6.36rem);
|
|
2
|
+
padding: 0.32rem 0;
|
|
5
3
|
box-sizing: border-box;
|
|
6
4
|
overflow: auto;
|
|
7
5
|
}
|
|
@@ -12,7 +10,6 @@
|
|
|
12
10
|
.common-functions-mobile ul li {
|
|
13
11
|
padding: 0.24rem 0.32rem;
|
|
14
12
|
box-sizing: border-box;
|
|
15
|
-
background: #ffffff;
|
|
16
13
|
display: flex;
|
|
17
14
|
justify-content: space-between;
|
|
18
15
|
align-items: center;
|
|
@@ -24,7 +21,7 @@
|
|
|
24
21
|
.common-functions-mobile ul li > div .img {
|
|
25
22
|
width: 0.32rem;
|
|
26
23
|
height: 0.32rem;
|
|
27
|
-
margin-right: 0.
|
|
24
|
+
margin-right: 0.08rem;
|
|
28
25
|
}
|
|
29
26
|
.common-functions-mobile ul li > div .title {
|
|
30
27
|
font-size: 0.28rem;
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.OrdersGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
10
|
+
var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text:
|
|
20
|
+
text: text || 'Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -54,7 +54,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
|
54
54
|
h5ImgHoverUrl: ''
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
|
-
sourceType: 'To
|
|
57
|
+
sourceType: 'To Pay'
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
60
|
|
|
@@ -64,7 +64,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
64
64
|
return {
|
|
65
65
|
id: (0, _uuid.v4)(),
|
|
66
66
|
type: 'ORDERS',
|
|
67
|
-
groupSource: [OrdersGroupSourceJSON()],
|
|
67
|
+
groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Rating'), OrdersGroupSourceJSON('Return')],
|
|
68
68
|
spacing: {
|
|
69
69
|
pc: {
|
|
70
70
|
paddingTop: 0,
|
|
@@ -198,7 +198,7 @@ var getAccountPageValue = function getAccountPageValue(key) {
|
|
|
198
198
|
};
|
|
199
199
|
|
|
200
200
|
var orderData = {
|
|
201
|
-
'To
|
|
201
|
+
'To Pay': {
|
|
202
202
|
key: 'toPayNum',
|
|
203
203
|
route: '/main/order/1'
|
|
204
204
|
},
|
|
@@ -290,6 +290,8 @@ function (_super) {
|
|
|
290
290
|
var data = this.props.data;
|
|
291
291
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
292
292
|
className: (0, _classnames["default"])('orders-mobile')
|
|
293
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
294
|
+
className: "fixed-wrap"
|
|
293
295
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
294
296
|
className: "top"
|
|
295
297
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
@@ -321,7 +323,7 @@ function (_super) {
|
|
|
321
323
|
data: item.title,
|
|
322
324
|
readonly: true
|
|
323
325
|
}));
|
|
324
|
-
})));
|
|
326
|
+
}))));
|
|
325
327
|
};
|
|
326
328
|
|
|
327
329
|
OrdersMobile.defaultProps = {
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
.orders-mobile {
|
|
2
|
+
height: 1.4rem;
|
|
3
|
+
}
|
|
4
|
+
.orders-mobile .fixed-wrap {
|
|
2
5
|
display: flex;
|
|
3
6
|
flex-direction: column;
|
|
4
7
|
background-color: #fff;
|
|
@@ -12,7 +15,7 @@
|
|
|
12
15
|
top: -1.4rem;
|
|
13
16
|
padding: 0.32rem;
|
|
14
17
|
}
|
|
15
|
-
.orders-mobile .top {
|
|
18
|
+
.orders-mobile .fixed-wrap .top {
|
|
16
19
|
display: flex;
|
|
17
20
|
flex-direction: row;
|
|
18
21
|
justify-content: space-between;
|
|
@@ -20,45 +23,45 @@
|
|
|
20
23
|
line-height: 0.36rem;
|
|
21
24
|
color: var(--font-color);
|
|
22
25
|
}
|
|
23
|
-
.orders-mobile .top .title {
|
|
26
|
+
.orders-mobile .fixed-wrap .top .title {
|
|
24
27
|
font-size: 0.28rem;
|
|
25
28
|
font-weight: 600;
|
|
26
29
|
color: #2C2C2C;
|
|
27
30
|
}
|
|
28
|
-
.orders-mobile .top .btn-wrap {
|
|
31
|
+
.orders-mobile .fixed-wrap .top .btn-wrap {
|
|
29
32
|
display: flex;
|
|
30
33
|
flex-direction: row;
|
|
31
34
|
justify-content: center;
|
|
32
35
|
align-items: center;
|
|
33
36
|
}
|
|
34
|
-
.orders-mobile .top .btn-wrap .text {
|
|
37
|
+
.orders-mobile .fixed-wrap .top .btn-wrap .text {
|
|
35
38
|
font-size: 0.28rem;
|
|
36
39
|
color: #929292;
|
|
37
40
|
font-weight: 400;
|
|
38
41
|
margin-right: 0.08rem;
|
|
39
42
|
}
|
|
40
|
-
.orders-mobile .list {
|
|
43
|
+
.orders-mobile .fixed-wrap .list {
|
|
41
44
|
display: flex;
|
|
42
45
|
flex-direction: row;
|
|
43
46
|
justify-content: space-between;
|
|
44
47
|
margin-top: 0.48rem;
|
|
45
48
|
margin-bottom: 0.02rem;
|
|
46
49
|
}
|
|
47
|
-
.orders-mobile .list .item {
|
|
50
|
+
.orders-mobile .fixed-wrap .list .item {
|
|
48
51
|
display: flex;
|
|
49
52
|
flex-direction: column;
|
|
50
53
|
justify-content: center;
|
|
51
54
|
align-items: center;
|
|
52
55
|
flex: 1;
|
|
53
56
|
}
|
|
54
|
-
.orders-mobile .list .item .img-wrap {
|
|
57
|
+
.orders-mobile .fixed-wrap .list .item .img-wrap {
|
|
55
58
|
position: relative;
|
|
56
59
|
display: flex;
|
|
57
60
|
margin-bottom: 0.16rem;
|
|
58
61
|
width: 0.72rem;
|
|
59
62
|
height: 0.72rem;
|
|
60
63
|
}
|
|
61
|
-
.orders-mobile .list .item .img-wrap .pot {
|
|
64
|
+
.orders-mobile .fixed-wrap .list .item .img-wrap .pot {
|
|
62
65
|
display: inline-block;
|
|
63
66
|
padding: 0 0.08rem;
|
|
64
67
|
background: #ce1126;
|
|
@@ -74,7 +77,7 @@
|
|
|
74
77
|
border-radius: 50%;
|
|
75
78
|
line-height: 0.3rem;
|
|
76
79
|
}
|
|
77
|
-
.orders-mobile .list .item .title {
|
|
80
|
+
.orders-mobile .fixed-wrap .list .item .title {
|
|
78
81
|
height: 0.44rem;
|
|
79
82
|
font-size: 0.24rem;
|
|
80
83
|
line-height: 0.22rem;
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
10
|
+
var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text: '
|
|
20
|
+
text: text || 'Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -40,7 +40,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
40
40
|
open: true,
|
|
41
41
|
type: 'TEXT',
|
|
42
42
|
specialContent: [],
|
|
43
|
-
text:
|
|
43
|
+
text: 0,
|
|
44
44
|
content: {
|
|
45
45
|
sizeType: 'Customize font styles',
|
|
46
46
|
fontFamily: 'Open Sans',
|
|
@@ -57,7 +57,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
57
57
|
},
|
|
58
58
|
vertical: {}
|
|
59
59
|
},
|
|
60
|
-
sourceType:
|
|
60
|
+
sourceType: text
|
|
61
61
|
};
|
|
62
62
|
};
|
|
63
63
|
|
|
@@ -66,11 +66,11 @@ exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
|
|
|
66
66
|
var getDefaultJSON = function getDefaultJSON() {
|
|
67
67
|
return {
|
|
68
68
|
id: (0, _uuid.v4)(),
|
|
69
|
-
type: '
|
|
69
|
+
type: 'PERSONAL_INFOMATION',
|
|
70
70
|
login: {
|
|
71
71
|
open: true
|
|
72
72
|
},
|
|
73
|
-
groupSource: [PersonalInfoGroupSourceJSON()],
|
|
73
|
+
groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Coupons'), PersonalInfoGroupSourceJSON('Recently Viewed')],
|
|
74
74
|
spacing: {
|
|
75
75
|
pc: {
|
|
76
76
|
paddingTop: 0,
|
|
@@ -74,7 +74,7 @@ function (_super) {
|
|
|
74
74
|
};
|
|
75
75
|
|
|
76
76
|
PersonalInformation.defaultProps = {};
|
|
77
|
-
PersonalInformation.type = '
|
|
77
|
+
PersonalInformation.type = 'PERSONAL_INFOMATION';
|
|
78
78
|
PersonalInformation.getDefaultJSON = _defaultJSON.getDefaultJSON;
|
|
79
79
|
PersonalInformation = __decorate([_compositeDecorator["default"]], PersonalInformation);
|
|
80
80
|
return PersonalInformation;
|
|
@@ -244,13 +244,13 @@ function (_super) {
|
|
|
244
244
|
var userInfo = _this.state.userInfo;
|
|
245
245
|
|
|
246
246
|
if (v === _index.personalInfoType.WISHLIST) {
|
|
247
|
-
return userInfo.userCollectionNum ||
|
|
247
|
+
return userInfo.userCollectionNum || 0;
|
|
248
248
|
} else if (v === _index.personalInfoType.STORES) {
|
|
249
|
-
return userInfo.userCollectionStoreNum ||
|
|
249
|
+
return userInfo.userCollectionStoreNum || 0;
|
|
250
250
|
} else if (v === _index.personalInfoType.COUPONS) {
|
|
251
|
-
return userInfo.couponNum ||
|
|
251
|
+
return userInfo.couponNum || 0;
|
|
252
252
|
} else if (v === _index.personalInfoType.VIEWED) {
|
|
253
|
-
return userInfo.recentViewNum ||
|
|
253
|
+
return userInfo.recentViewNum || 0;
|
|
254
254
|
}
|
|
255
255
|
};
|
|
256
256
|
|
|
@@ -97,7 +97,9 @@ function (_super) {
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
ConfigGroup.prototype.render = function () {
|
|
100
|
-
var
|
|
100
|
+
var _a = this.props,
|
|
101
|
+
source = _a.source,
|
|
102
|
+
maxNum = _a.maxNum;
|
|
101
103
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
102
104
|
className: "banner_group"
|
|
103
105
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -111,6 +113,7 @@ function (_super) {
|
|
|
111
113
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
112
114
|
className: "btn_wrap"
|
|
113
115
|
}, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
|
|
116
|
+
disabled: source.length >= maxNum,
|
|
114
117
|
icon: "icon-add",
|
|
115
118
|
onClick: this.onAddClick,
|
|
116
119
|
type: "primary"
|
package/es/constants/index.js
CHANGED
|
@@ -46,7 +46,7 @@ var walletType = {
|
|
|
46
46
|
};
|
|
47
47
|
exports.walletType = walletType;
|
|
48
48
|
var orderStatusType = {
|
|
49
|
-
PAY: 'To
|
|
49
|
+
PAY: 'To Pay',
|
|
50
50
|
SHIP: 'To Ship',
|
|
51
51
|
RECEIVE: 'To Receive',
|
|
52
52
|
RATING: 'Rating',
|
|
@@ -212,7 +212,7 @@ var compInfoMap = {
|
|
|
212
212
|
name: 'Menu Navigation',
|
|
213
213
|
icon: 'icon-footer'
|
|
214
214
|
},
|
|
215
|
-
|
|
215
|
+
PERSONAL_INFOMATION: {
|
|
216
216
|
name: 'Personal Information',
|
|
217
217
|
icon: 'icon-account'
|
|
218
218
|
},
|
|
@@ -131,7 +131,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
|
|
|
131
131
|
groupName = panelProps.button.text;
|
|
132
132
|
break;
|
|
133
133
|
|
|
134
|
-
case '
|
|
134
|
+
case 'PERSONAL_INFOMATION':
|
|
135
135
|
case 'ORDERS':
|
|
136
136
|
groupName = panelProps.sourceType;
|
|
137
137
|
break;
|
package/es/locale/en/en.json
CHANGED
package/es/locale/es/es.json
CHANGED
package/es/locale/id/id.json
CHANGED
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.CommonFunctionsGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
|
|
10
|
+
var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var CommonFunctionsGroupSourceJSON = function CommonFunctionsGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text: 'Function Name',
|
|
20
|
+
text: text || 'Function Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -63,7 +63,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
63
63
|
return {
|
|
64
64
|
id: (0, _uuid.v4)(),
|
|
65
65
|
type: 'COMMON_FUNCTIONS',
|
|
66
|
-
groupSource: [CommonFunctionsGroupSourceJSON()],
|
|
66
|
+
groupSource: [CommonFunctionsGroupSourceJSON('Address'), CommonFunctionsGroupSourceJSON('Policies'), CommonFunctionsGroupSourceJSON('Security Center'), CommonFunctionsGroupSourceJSON('Function Name')],
|
|
67
67
|
spacing: {
|
|
68
68
|
pc: {
|
|
69
69
|
paddingTop: 0,
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
.common-functions-mobile {
|
|
2
|
-
|
|
3
|
-
padding-top: 1.7rem;
|
|
4
|
-
height: calc(100vh - 6.36rem);
|
|
2
|
+
padding: 0.32rem 0;
|
|
5
3
|
box-sizing: border-box;
|
|
6
4
|
overflow: auto;
|
|
7
5
|
}
|
|
@@ -12,7 +10,6 @@
|
|
|
12
10
|
.common-functions-mobile ul li {
|
|
13
11
|
padding: 0.24rem 0.32rem;
|
|
14
12
|
box-sizing: border-box;
|
|
15
|
-
background: #ffffff;
|
|
16
13
|
display: flex;
|
|
17
14
|
justify-content: space-between;
|
|
18
15
|
align-items: center;
|
|
@@ -24,7 +21,7 @@
|
|
|
24
21
|
.common-functions-mobile ul li > div .img {
|
|
25
22
|
width: 0.32rem;
|
|
26
23
|
height: 0.32rem;
|
|
27
|
-
margin-right: 0.
|
|
24
|
+
margin-right: 0.08rem;
|
|
28
25
|
}
|
|
29
26
|
.common-functions-mobile ul li > div .title {
|
|
30
27
|
font-size: 0.28rem;
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.OrdersGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
10
|
+
var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text:
|
|
20
|
+
text: text || 'Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -54,7 +54,7 @@ var OrdersGroupSourceJSON = function OrdersGroupSourceJSON() {
|
|
|
54
54
|
h5ImgHoverUrl: ''
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
|
-
sourceType: 'To
|
|
57
|
+
sourceType: 'To Pay'
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
60
|
|
|
@@ -64,7 +64,7 @@ var getDefaultJSON = function getDefaultJSON() {
|
|
|
64
64
|
return {
|
|
65
65
|
id: (0, _uuid.v4)(),
|
|
66
66
|
type: 'ORDERS',
|
|
67
|
-
groupSource: [OrdersGroupSourceJSON()],
|
|
67
|
+
groupSource: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive'), OrdersGroupSourceJSON('Rating'), OrdersGroupSourceJSON('Return')],
|
|
68
68
|
spacing: {
|
|
69
69
|
pc: {
|
|
70
70
|
paddingTop: 0,
|
|
@@ -198,7 +198,7 @@ var getAccountPageValue = function getAccountPageValue(key) {
|
|
|
198
198
|
};
|
|
199
199
|
|
|
200
200
|
var orderData = {
|
|
201
|
-
'To
|
|
201
|
+
'To Pay': {
|
|
202
202
|
key: 'toPayNum',
|
|
203
203
|
route: '/main/order/1'
|
|
204
204
|
},
|
|
@@ -290,6 +290,8 @@ function (_super) {
|
|
|
290
290
|
var data = this.props.data;
|
|
291
291
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
292
292
|
className: (0, _classnames["default"])('orders-mobile')
|
|
293
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
294
|
+
className: "fixed-wrap"
|
|
293
295
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
294
296
|
className: "top"
|
|
295
297
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
@@ -321,7 +323,7 @@ function (_super) {
|
|
|
321
323
|
data: item.title,
|
|
322
324
|
readonly: true
|
|
323
325
|
}));
|
|
324
|
-
})));
|
|
326
|
+
}))));
|
|
325
327
|
};
|
|
326
328
|
|
|
327
329
|
OrdersMobile.defaultProps = {
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
.orders-mobile {
|
|
2
|
+
height: 1.4rem;
|
|
3
|
+
}
|
|
4
|
+
.orders-mobile .fixed-wrap {
|
|
2
5
|
display: flex;
|
|
3
6
|
flex-direction: column;
|
|
4
7
|
background-color: #fff;
|
|
@@ -12,7 +15,7 @@
|
|
|
12
15
|
top: -1.4rem;
|
|
13
16
|
padding: 0.32rem;
|
|
14
17
|
}
|
|
15
|
-
.orders-mobile .top {
|
|
18
|
+
.orders-mobile .fixed-wrap .top {
|
|
16
19
|
display: flex;
|
|
17
20
|
flex-direction: row;
|
|
18
21
|
justify-content: space-between;
|
|
@@ -20,45 +23,45 @@
|
|
|
20
23
|
line-height: 0.36rem;
|
|
21
24
|
color: var(--font-color);
|
|
22
25
|
}
|
|
23
|
-
.orders-mobile .top .title {
|
|
26
|
+
.orders-mobile .fixed-wrap .top .title {
|
|
24
27
|
font-size: 0.28rem;
|
|
25
28
|
font-weight: 600;
|
|
26
29
|
color: #2C2C2C;
|
|
27
30
|
}
|
|
28
|
-
.orders-mobile .top .btn-wrap {
|
|
31
|
+
.orders-mobile .fixed-wrap .top .btn-wrap {
|
|
29
32
|
display: flex;
|
|
30
33
|
flex-direction: row;
|
|
31
34
|
justify-content: center;
|
|
32
35
|
align-items: center;
|
|
33
36
|
}
|
|
34
|
-
.orders-mobile .top .btn-wrap .text {
|
|
37
|
+
.orders-mobile .fixed-wrap .top .btn-wrap .text {
|
|
35
38
|
font-size: 0.28rem;
|
|
36
39
|
color: #929292;
|
|
37
40
|
font-weight: 400;
|
|
38
41
|
margin-right: 0.08rem;
|
|
39
42
|
}
|
|
40
|
-
.orders-mobile .list {
|
|
43
|
+
.orders-mobile .fixed-wrap .list {
|
|
41
44
|
display: flex;
|
|
42
45
|
flex-direction: row;
|
|
43
46
|
justify-content: space-between;
|
|
44
47
|
margin-top: 0.48rem;
|
|
45
48
|
margin-bottom: 0.02rem;
|
|
46
49
|
}
|
|
47
|
-
.orders-mobile .list .item {
|
|
50
|
+
.orders-mobile .fixed-wrap .list .item {
|
|
48
51
|
display: flex;
|
|
49
52
|
flex-direction: column;
|
|
50
53
|
justify-content: center;
|
|
51
54
|
align-items: center;
|
|
52
55
|
flex: 1;
|
|
53
56
|
}
|
|
54
|
-
.orders-mobile .list .item .img-wrap {
|
|
57
|
+
.orders-mobile .fixed-wrap .list .item .img-wrap {
|
|
55
58
|
position: relative;
|
|
56
59
|
display: flex;
|
|
57
60
|
margin-bottom: 0.16rem;
|
|
58
61
|
width: 0.72rem;
|
|
59
62
|
height: 0.72rem;
|
|
60
63
|
}
|
|
61
|
-
.orders-mobile .list .item .img-wrap .pot {
|
|
64
|
+
.orders-mobile .fixed-wrap .list .item .img-wrap .pot {
|
|
62
65
|
display: inline-block;
|
|
63
66
|
padding: 0 0.08rem;
|
|
64
67
|
background: #ce1126;
|
|
@@ -74,7 +77,7 @@
|
|
|
74
77
|
border-radius: 50%;
|
|
75
78
|
line-height: 0.3rem;
|
|
76
79
|
}
|
|
77
|
-
.orders-mobile .list .item .title {
|
|
80
|
+
.orders-mobile .fixed-wrap .list .item .title {
|
|
78
81
|
height: 0.44rem;
|
|
79
82
|
font-size: 0.24rem;
|
|
80
83
|
line-height: 0.22rem;
|
|
@@ -7,7 +7,7 @@ exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _uuid = require("uuid");
|
|
9
9
|
|
|
10
|
-
var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
10
|
+
var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
|
|
11
11
|
var groupId = (0, _uuid.v4)();
|
|
12
12
|
return {
|
|
13
13
|
id: groupId,
|
|
@@ -17,7 +17,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
17
17
|
open: true,
|
|
18
18
|
type: 'TEXT',
|
|
19
19
|
specialContent: [],
|
|
20
|
-
text: '
|
|
20
|
+
text: text || 'Name',
|
|
21
21
|
content: {
|
|
22
22
|
sizeType: 'Customize font styles',
|
|
23
23
|
fontFamily: 'Open Sans',
|
|
@@ -40,7 +40,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
40
40
|
open: true,
|
|
41
41
|
type: 'TEXT',
|
|
42
42
|
specialContent: [],
|
|
43
|
-
text:
|
|
43
|
+
text: 0,
|
|
44
44
|
content: {
|
|
45
45
|
sizeType: 'Customize font styles',
|
|
46
46
|
fontFamily: 'Open Sans',
|
|
@@ -57,7 +57,7 @@ var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON() {
|
|
|
57
57
|
},
|
|
58
58
|
vertical: {}
|
|
59
59
|
},
|
|
60
|
-
sourceType:
|
|
60
|
+
sourceType: text
|
|
61
61
|
};
|
|
62
62
|
};
|
|
63
63
|
|
|
@@ -66,11 +66,11 @@ exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
|
|
|
66
66
|
var getDefaultJSON = function getDefaultJSON() {
|
|
67
67
|
return {
|
|
68
68
|
id: (0, _uuid.v4)(),
|
|
69
|
-
type: '
|
|
69
|
+
type: 'PERSONAL_INFOMATION',
|
|
70
70
|
login: {
|
|
71
71
|
open: true
|
|
72
72
|
},
|
|
73
|
-
groupSource: [PersonalInfoGroupSourceJSON()],
|
|
73
|
+
groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Coupons'), PersonalInfoGroupSourceJSON('Recently Viewed')],
|
|
74
74
|
spacing: {
|
|
75
75
|
pc: {
|
|
76
76
|
paddingTop: 0,
|
|
@@ -74,7 +74,7 @@ function (_super) {
|
|
|
74
74
|
};
|
|
75
75
|
|
|
76
76
|
PersonalInformation.defaultProps = {};
|
|
77
|
-
PersonalInformation.type = '
|
|
77
|
+
PersonalInformation.type = 'PERSONAL_INFOMATION';
|
|
78
78
|
PersonalInformation.getDefaultJSON = _defaultJSON.getDefaultJSON;
|
|
79
79
|
PersonalInformation = __decorate([_compositeDecorator["default"]], PersonalInformation);
|
|
80
80
|
return PersonalInformation;
|
|
@@ -244,13 +244,13 @@ function (_super) {
|
|
|
244
244
|
var userInfo = _this.state.userInfo;
|
|
245
245
|
|
|
246
246
|
if (v === _index.personalInfoType.WISHLIST) {
|
|
247
|
-
return userInfo.userCollectionNum ||
|
|
247
|
+
return userInfo.userCollectionNum || 0;
|
|
248
248
|
} else if (v === _index.personalInfoType.STORES) {
|
|
249
|
-
return userInfo.userCollectionStoreNum ||
|
|
249
|
+
return userInfo.userCollectionStoreNum || 0;
|
|
250
250
|
} else if (v === _index.personalInfoType.COUPONS) {
|
|
251
|
-
return userInfo.couponNum ||
|
|
251
|
+
return userInfo.couponNum || 0;
|
|
252
252
|
} else if (v === _index.personalInfoType.VIEWED) {
|
|
253
|
-
return userInfo.recentViewNum ||
|
|
253
|
+
return userInfo.recentViewNum || 0;
|
|
254
254
|
}
|
|
255
255
|
};
|
|
256
256
|
|
package/lib/composite-comp/dito/config-panels/PersonalInformationConfig/ConfigGroup/index.js
CHANGED
|
@@ -97,7 +97,9 @@ function (_super) {
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
ConfigGroup.prototype.render = function () {
|
|
100
|
-
var
|
|
100
|
+
var _a = this.props,
|
|
101
|
+
source = _a.source,
|
|
102
|
+
maxNum = _a.maxNum;
|
|
101
103
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
102
104
|
className: "banner_group"
|
|
103
105
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -111,6 +113,7 @@ function (_super) {
|
|
|
111
113
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
112
114
|
className: "btn_wrap"
|
|
113
115
|
}, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
|
|
116
|
+
disabled: source.length >= maxNum,
|
|
114
117
|
icon: "icon-add",
|
|
115
118
|
onClick: this.onAddClick,
|
|
116
119
|
type: "primary"
|
package/lib/constants/index.js
CHANGED
|
@@ -46,7 +46,7 @@ var walletType = {
|
|
|
46
46
|
};
|
|
47
47
|
exports.walletType = walletType;
|
|
48
48
|
var orderStatusType = {
|
|
49
|
-
PAY: 'To
|
|
49
|
+
PAY: 'To Pay',
|
|
50
50
|
SHIP: 'To Ship',
|
|
51
51
|
RECEIVE: 'To Receive',
|
|
52
52
|
RATING: 'Rating',
|
|
@@ -212,7 +212,7 @@ var compInfoMap = {
|
|
|
212
212
|
name: 'Menu Navigation',
|
|
213
213
|
icon: 'icon-footer'
|
|
214
214
|
},
|
|
215
|
-
|
|
215
|
+
PERSONAL_INFOMATION: {
|
|
216
216
|
name: 'Personal Information',
|
|
217
217
|
icon: 'icon-account'
|
|
218
218
|
},
|
|
@@ -131,7 +131,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
|
|
|
131
131
|
groupName = panelProps.button.text;
|
|
132
132
|
break;
|
|
133
133
|
|
|
134
|
-
case '
|
|
134
|
+
case 'PERSONAL_INFOMATION':
|
|
135
135
|
case 'ORDERS':
|
|
136
136
|
groupName = panelProps.sourceType;
|
|
137
137
|
break;
|
package/lib/locale/en/en.json
CHANGED
package/lib/locale/es/es.json
CHANGED
package/lib/locale/id/id.json
CHANGED