@conecli/cone-render 0.10.1-shop3.5 → 0.10.1-shop3.50
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/README.md +1 -1
- package/dist/common/accessibility.h5.ts +1 -0
- package/dist/common/accessibility.ts +0 -0
- package/dist/common/const.ts +1 -1
- package/dist/common/index.h5.ts +1 -1
- package/dist/common/index.jd.ts +1 -1
- package/dist/common/index.ts +1 -1
- package/dist/common/index.weapp.ts +1 -1
- package/dist/common/jdplayerSdk.weapp.tsx +1 -0
- package/dist/common/jssdk.ts +1 -1
- package/dist/common/jssdk.weapp.ts +1 -0
- package/dist/common/pageType.ts +1 -1
- package/dist/common/token/index.h5.ts +1 -1
- package/dist/common/token/token.jd.ts +1 -1
- package/dist/common/wxappApi.ts +1 -1
- package/dist/components/ErrorBoundary.tsx +1 -1
- package/dist/components/base/CommonFloorHead/index.module.scss +126 -111
- package/dist/components/base/CommonFloorHead/index.tsx +1 -1
- package/dist/components/base/CountDown/index.tsx +1 -1
- package/dist/components/base/CustomScrollView/index-back.tsx +1 -0
- package/dist/components/base/CustomScrollView/index.tsx +1 -1
- package/dist/components/base/CustomVideo/index.tsx +1 -1
- package/dist/components/base/CustomVideo/index.weapp.tsx +1 -0
- package/dist/components/base/Dialog/index.module.scss +11 -0
- package/dist/components/base/InOrOutViewObserver/index.weapp.tsx +1 -0
- package/dist/components/base/InViewRender/index.tsx +1 -1
- package/dist/components/base/ItemViewExposureSmart/index.tsx +1 -1
- package/dist/components/base/LazyLayoutLoad/index.tsx +1 -1
- package/dist/components/base/MobileCommonHeader/index.weapp.tsx +1 -0
- package/dist/components/base/NetworkDataError/const.ts +1 -1
- package/dist/components/base/NetworkDataError/index.module.scss +118 -72
- package/dist/components/base/NetworkDataError/index.tsx +1 -1
- package/dist/components/base/Price/Base/index.module.scss +12 -0
- package/dist/components/base/Price/Base/index.tsx +1 -1
- package/dist/components/base/Price/Double/index.module.scss +24 -0
- package/dist/components/base/Price/Double/index.tsx +1 -1
- package/dist/components/debug/DebugLayout/index.module.scss +2 -2
- package/dist/components/floorItem.weapp.tsx +1 -1
- package/dist/interface/common.ts +1 -1
- package/dist/interface/component.ts +1 -1
- package/dist/interface/jumpEventReport.ts +1 -1
- package/dist/jumpEventReport/base.ts +1 -1
- package/dist/jumpEventReport/const.ts +1 -1
- package/dist/jumpEventReport/createReportFloorData.ts +1 -1
- package/dist/jumpEventReport/index.h5.ts +1 -1
- package/dist/jumpEventReport/index.jd.ts +1 -1
- package/dist/jumpEventReport/index.weapp.ts +1 -1
- package/dist/jumpEventReport/jdJumpJdApp.ts +1 -1
- package/dist/jumpEventReport/jumpUrlConfig/base.ts +1 -1
- package/dist/jumpEventReport/logEventConfig.h5.ts +1 -0
- package/dist/jumpEventReport/logEventConfig.ts +1 -1
- package/dist/jumpEventReport/web/report.ts +1 -1
- package/dist/jumpEventReport/web.base.ts +1 -1
- package/dist/jumpEventReport/web.jd.ts +1 -1
- package/dist/jumpEventReport/web.pc.ts +1 -1
- package/dist/jumpEventReport/web.tjm.ts +1 -1
- package/dist/jumpEventReport/web.wxapp.ts +1 -1
- package/dist/language/en_US.json +231 -0
- package/dist/language/zh_CN.json +231 -0
- package/dist/language/zh_HK.json +231 -0
- package/dist/libs/taroAppReport.js +2 -2
- package/dist/modules/ContainerFloorList/index.h5.module.scss +66 -56
- package/dist/modules/ContainerFloorList/index.h5.tsx +1 -1
- package/dist/modules/ContainerFloorList/index.tsx +1 -1
- package/dist/modules/DecorateContainerFloorList/index.weapp.tsx +1 -0
- package/dist/open/api/environment.ts +1 -1
- package/dist/open/api/shopMember.ts +1 -1
- package/dist/open/api/shopMember.weapp.ts +1 -0
- package/dist/open/api/util.ts +1 -1
- package/dist/open/index.ts +1 -1
- package/dist/sass/app.h5.scss +278 -224
- package/dist/service/fetchGateway.ts +1 -1
- package/dist/service/fetchGateway.weapp.ts +1 -0
- package/dist/service/fetchJsonp.weapp.ts +1 -0
- package/dist/service/http/colorSign.ts +1 -1
- package/dist/service/http/const.ts +1 -1
- package/dist/service/http/h5Http.ts +1 -1
- package/dist/service/http/httpInterceptors.weapp.ts +1 -0
- package/dist/service/requestServer.h5.ts +1 -1
- package/dist/service/requestServer.ts +1 -1
- package/dist/service/requestServer.weapp.ts +1 -0
- package/dist/utils/connectNativeJsBridge.ts +1 -1
- package/dist/utils/h5Utils.ts +1 -1
- package/dist/utils/harmonyCallRouter.h5.ts +1 -0
- package/dist/utils/harmonyCallRouter.ts +0 -0
- package/dist/utils/index.h5.ts +1 -1
- package/dist/utils/index.ts +1 -1
- package/dist/utils/index.weapp.ts +1 -1
- package/dist/utils/jumpExtMapUtil.h5.ts +1 -0
- package/dist/utils/jumpExtMapUtil.ts +1 -0
- package/dist/utils/log.ts +1 -0
- package/dist/utils/{sColor.js → sColor.ts} +1 -1
- package/dist/utils/sColor.weapp.ts +1 -0
- package/dist/utils/utils.ts +1 -1
- package/dist/wxapp/common/address_api/address_api_v2.js +1 -0
- package/dist/wxapp/common/user_info.js +1 -1
- package/package.json +160 -141
- package/dist/jumpEventReport/web/wqshop.report.ts +0 -1
- package/dist/utils/priceUtils.js +0 -1
|
@@ -1,148 +1,163 @@
|
|
|
1
1
|
.d-root {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
position: relative;
|
|
3
|
+
width: 100%;
|
|
4
|
+
margin-bottom: -24px;
|
|
5
|
+
background-color: #ffffff;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
.d-content-wrap {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
9
|
+
position: absolute;
|
|
10
|
+
// display: flex;
|
|
11
|
+
// align-items: center;
|
|
12
|
+
top: 0;
|
|
13
|
+
left: 0;
|
|
14
|
+
width: 100%;
|
|
15
|
+
height: 96px;
|
|
16
|
+
// height: 100%;
|
|
17
|
+
|
|
18
|
+
&.d-has-title-bg {
|
|
19
|
+
background-size: cover;
|
|
20
|
+
|
|
21
|
+
.d-text {
|
|
22
|
+
// margin-top: -14px;
|
|
23
|
+
color: #ffffff;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
.d-sub-text {
|
|
27
|
+
// margin-top: -8px;
|
|
28
|
+
color: #ffffff;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
.d-content {
|
|
32
|
+
bottom: 40px;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
&.d-type-is-img {
|
|
37
|
+
.d-content {
|
|
38
|
+
bottom: 44%; // 当图片标题类型渲染时,兼容新老数据,下发的图片高度会有几个尺寸,所以这里改成百分比
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
.d-text {
|
|
43
|
+
// margin-top: 16px;
|
|
44
|
+
margin-left: 20px;
|
|
45
|
+
font-family: 'PingFang SC';
|
|
46
|
+
font-size: 32px;
|
|
47
|
+
// line-height: 32px;
|
|
48
|
+
font-weight: bold;
|
|
49
|
+
color: #1a1a1a;
|
|
50
|
+
|
|
51
|
+
// hack修复在使用overflowhidden(为了实现过长自动出现省略号)前提下,某些字体,例如PingFang SC,默认行高时,基线和底线部分的字体内容(例如:jpqy)有可能显示不完整的问题
|
|
52
|
+
position: relative;
|
|
53
|
+
top: 2px;
|
|
54
|
+
padding-bottom: 2px;
|
|
55
55
|
// 文字titile行高不够被遮盖问题 比如“g”字母
|
|
56
56
|
line-height: 1.3;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
.d-vertical-line {
|
|
60
|
+
position: relative;
|
|
61
|
+
top: -4px;
|
|
62
|
+
width: 1px;
|
|
63
|
+
height: 24px;
|
|
64
|
+
margin-left: 12px;
|
|
65
|
+
opacity: 0.3;
|
|
66
|
+
background: #ffffff;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
.d-sub-text {
|
|
70
|
+
position: relative;
|
|
71
|
+
top: -2px;
|
|
72
|
+
margin-left: 12px;
|
|
73
|
+
font-family: 'PingFang SC';
|
|
74
|
+
font-size: 24px;
|
|
75
|
+
color: #808080;
|
|
76
|
+
}
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
.d-content-wrap-relative {
|
|
80
|
-
|
|
80
|
+
position: relative;
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
.d-content {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
84
|
+
position: absolute;
|
|
85
|
+
bottom: 22px;
|
|
86
|
+
width: 100%;
|
|
87
|
+
display: flex;
|
|
88
|
+
justify-content: space-between;
|
|
89
|
+
align-items: flex-end;
|
|
90
90
|
}
|
|
91
91
|
|
|
92
92
|
.d-content-left {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
flex: 1;
|
|
94
|
+
display: flex;
|
|
95
|
+
justify-content: flex-start;
|
|
96
|
+
align-items: flex-end;
|
|
97
|
+
max-width: calc(100% - 108px);
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
.d-content-right {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
101
|
+
display: flex;
|
|
102
|
+
align-items: flex-end;
|
|
103
|
+
flex-shrink: 0;
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
.d-title-more {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
107
|
+
position: relative;
|
|
108
|
+
top: 16px;
|
|
109
|
+
display: flex;
|
|
110
|
+
align-items: flex-end;
|
|
111
|
+
height: 56px;
|
|
112
|
+
padding-bottom: 20px;
|
|
113
|
+
padding-left: 20px;
|
|
114
|
+
padding-right: 20px;
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
.d-title-more-text {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
118
|
+
font-family: 'PingFang SC';
|
|
119
|
+
font-size: 24px;
|
|
120
|
+
color: #808080;
|
|
121
|
+
display: flex;
|
|
122
|
+
align-items: center;
|
|
123
|
+
font-weight: normal;
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
.d-title-more-text-white {
|
|
127
|
-
|
|
127
|
+
color: #ffffff;
|
|
128
128
|
}
|
|
129
129
|
|
|
130
130
|
.d-title-more-arrow {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
131
|
+
position: relative;
|
|
132
|
+
top: -4px;
|
|
133
|
+
width: 12px;
|
|
134
|
+
height: 20px;
|
|
135
|
+
margin-left: 10px;
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
.d-img {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
139
|
+
width: 100%;
|
|
140
|
+
display: block;
|
|
141
|
+
// height: auto;
|
|
142
|
+
height: 96px;
|
|
143
|
+
background: no-repeat top/100% auto;
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
.d-place-holder {
|
|
147
|
-
|
|
147
|
+
height: 24px;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
:global {
|
|
151
|
+
.d-shop-pad {
|
|
152
|
+
:local {
|
|
153
|
+
.d-root {
|
|
154
|
+
.d-content-wrap-for-img {
|
|
155
|
+
height: 164px;
|
|
156
|
+
}
|
|
157
|
+
.d-img-bg {
|
|
158
|
+
height: 164px;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
148
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import React, { useMemo } from 'react'
|
|
2
1
|
key: 1,
|
|
2
|
+
import React, { useMemo } from 'react';
|
|
3
3
|
'https://m.360buyimg.com/imagetools/jfs/t1/170321/15/27425/230/61c1839aE0514462b/0b4d278fe18d91bb.png';
|
|
4
4
|
'https://m.360buyimg.com/imagetools/jfs/t1/94671/2/26921/257/623d630aE681512e3/ded2e640c4a0a7ea.png';
|
|
5
5
|
const getLogInfo = ReportContainerData.getReportClickFloorInfo(
|
|
6
6
|
floorData,
|
|
7
7
|
dataDefines,
|
|
8
8
|
{
|
|
9
9
|
clickArea: `title`,
|
|
10
10
|
skuid: ``,
|
|
11
11
|
tagList: [],
|
|
12
12
|
labelList: [],
|
|
13
13
|
pos: ``,
|
|
14
14
|
},
|
|
15
15
|
{
|
|
16
16
|
la_p: ``,
|
|
17
17
|
},
|
|
18
18
|
);
|
|
19
19
|
if (config) {
|
|
20
20
|
JumpEventReport.jdJumpConfigUrl(config, {
|
|
21
21
|
eventId: `TerminatorNew_${floorData.floorExtInfo?.moduleFlag}_Click`,
|
|
22
22
|
jsonParam: getLogInfo,
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
dataDefines,
|
|
26
26
|
floorData,
|
|
27
27
|
oldModuleFloorTitle,
|
|
28
28
|
titleText,
|
|
29
29
|
titleMoreClick,
|
|
30
30
|
additionalRenderContent,
|
|
31
31
|
customClassName,
|
|
32
32
|
const floorTitleDataDefine = dataDefines
|
|
33
33
|
? dataDefines.filter((item) => {
|
|
34
34
|
return item.type === 'floorTitle';
|
|
35
35
|
})
|
|
36
36
|
: [];
|
|
37
37
|
const floorTitle = oldModuleFloorTitle
|
|
38
38
|
? oldModuleFloorTitle
|
|
39
39
|
: floorTitleDataDefine[0]?.nodeText?.data ?? {};
|
|
40
40
|
const { detail, imageUrl, text, textBackground, type: floorTitleType = 1, subText } = floorTitle;
|
|
41
41
|
if (floorTitleType === 1) {
|
|
42
42
|
return null;
|
|
43
43
|
}
|
|
44
44
|
const bgMap = {
|
|
45
45
|
'1': null,
|
|
46
46
|
'2': textBackground || '',
|
|
47
47
|
'3': imageUrl || '',
|
|
48
48
|
};
|
|
49
49
|
const useFloorTitleBgImg = bgMap[floorTitleType];
|
|
50
50
|
return (
|
|
51
51
|
<View
|
|
52
52
|
className={classNames(styles['d-root'], customClassName)}
|
|
53
53
|
onClick={floorTitleType === 3 ? gotoMPage.bind(this, dataDefines, floorData, detail) : {}}
|
|
54
54
|
>
|
|
55
55
|
<View
|
|
56
56
|
className={classNames(styles['d-img'], {
|
|
57
57
|
[styles['d-img-bg']]: useFloorTitleBgImg,
|
|
58
58
|
})}
|
|
59
59
|
style={useFloorTitleBgImg ? { backgroundImage: `url(${useFloorTitleBgImg})` } : {}}
|
|
60
60
|
/>
|
|
61
61
|
<View
|
|
62
62
|
className={classNames(
|
|
63
63
|
styles['d-content-wrap'],
|
|
64
64
|
floorTitleType === 2 && textBackground ? styles['d-has-title-bg'] : null,
|
|
65
65
|
floorTitleType === 3 ? styles['d-type-is-img'] : null,
|
|
66
66
|
useFloorTitleBgImg ? styles['d-content-wrap-for-img'] : null,
|
|
67
67
|
)}
|
|
68
68
|
>
|
|
69
69
|
<View className={classNames(styles['d-content'], 'd-content')}>
|
|
70
70
|
<View className={styles['d-content-left']}>
|
|
71
71
|
{floorTitleType === 2 && text ? (
|
|
72
72
|
<Text className={classNames(styles['d-text'], 'text-ellipsis', 'd-text')}>
|
|
73
73
|
{titleText ? titleText : text}
|
|
74
74
|
</Text>
|
|
75
75
|
) : null}
|
|
76
76
|
{floorTitleType === 2 && subText
|
|
77
77
|
? [
|
|
78
78
|
textBackground ? <View key={1} className={styles['d-vertical-line']} /> : null,
|
|
79
79
|
<Text key={2} className={styles['d-sub-text']}>
|
|
80
80
|
{subText}
|
|
81
81
|
</Text>,
|
|
82
82
|
]
|
|
83
83
|
: null}
|
|
84
84
|
{additionalRenderContent ? additionalRenderContent(textBackground) : null}
|
|
85
85
|
</View>
|
|
86
86
|
<View className={styles['d-content-right']}>
|
|
87
87
|
{titleMoreClick ? (
|
|
88
88
|
<View
|
|
89
89
|
className={classNames(styles['d-title-more'], 'd-title-more')}
|
|
90
90
|
onClick={(e) => {
|
|
91
91
|
typeof titleMoreClick === 'function' && titleMoreClick(e);
|
|
92
92
|
e.stopPropagation();
|
|
93
93
|
}}
|
|
94
94
|
>
|
|
95
95
|
<Text
|
|
96
96
|
className={classNames(
|
|
97
97
|
styles['d-title-more-text'],
|
|
98
98
|
textBackground || floorTitleType === 3
|
|
99
99
|
? styles['d-title-more-text-white']
|
|
100
100
|
: null,
|
|
101
101
|
)}
|
|
102
102
|
>
|
|
103
103
|
更多
|
|
104
104
|
</Text>
|
|
105
105
|
<Image
|
|
106
106
|
className={styles['d-title-more-arrow']}
|
|
107
107
|
src={textBackground || floorTitleType === 3 ? ICON_ARROW_WHITE : ICON_ARROW_GRAY}
|
|
108
108
|
mode="widthFix"
|
|
109
109
|
/>
|
|
110
110
|
</View>
|
|
111
111
|
) : null}
|
|
112
112
|
</View>
|
|
113
113
|
</View>
|
|
114
114
|
</View>
|
|
115
115
|
</View>
|
|
116
116
|
);
|
|
117
117
|
props = {
|
|
118
118
|
titleText: null,
|
|
119
119
|
titleMoreClick: null,
|
|
120
120
|
additionalRenderContent: null,
|
|
121
121
|
customClassName: null,
|
|
122
122
|
key: 1,
|
|
123
123
|
},
|
|
124
124
|
return useMemo(() => {
|
|
125
125
|
return <CommonFloorHeader {...props} />;
|
|
126
126
|
}, [props.key]);
|