@conecli/cone-render 0.9.1-shop2.2 → 0.9.1-shop2.20
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/dist/api/index.ts +1 -1
- package/dist/common/const.ts +1 -1
- package/dist/common/environmentType.ts +1 -0
- 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.ts +1 -0
- package/dist/common/jssdk.ts +1 -0
- package/dist/common/pageType.ts +1 -0
- package/dist/common/sgmCustomCode.ts +1 -0
- package/dist/common/token/index.h5.ts +1 -1
- package/dist/common/token/token.jd.ts +1 -1
- package/dist/common/token/token.ts +1 -1
- package/dist/common/wxappApi.jd.ts +1 -0
- package/dist/components/ErrorBoundary.tsx +1 -1
- package/dist/components/base/CountDown/index.tsx +1 -1
- package/dist/components/base/CustomScrollView/index.jd.tsx +1 -0
- package/dist/components/base/CustomScrollView/index.module.scss +7 -0
- package/dist/components/base/CustomScrollView/index.tsx +1 -1
- package/dist/components/base/CustomVideo/index.tsx +1 -1
- package/dist/components/base/Dialog/index.module.scss +5 -0
- package/dist/components/base/Dialog/index.tsx +1 -1
- package/dist/components/base/Exposure/index.h5.tsx +1 -1
- package/dist/components/base/ExposureSmart/index.h5.tsx +1 -1
- package/dist/components/base/ExposureSmart/index.tsx +1 -1
- package/dist/components/base/ExposureSmart/reporter.tsx +1 -1
- package/dist/components/base/InOrOutViewObserver/index.tsx +1 -1
- 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/LazyLoadImage/const.ts +1 -1
- package/dist/components/base/LazyLoadImage/index.h5.module.scss +23 -20
- package/dist/components/base/LazyLoadImage/index.h5.tsx +1 -1
- package/dist/components/base/MobileCommonHeader/index.module.scss +17 -0
- package/dist/components/base/MobileCommonHeader/index.tsx +1 -0
- package/dist/components/base/NetworkDataError/const.ts +1 -1
- package/dist/components/base/NetworkDataError/index.module.scss +7 -0
- package/dist/components/base/NetworkDataError/index.tsx +1 -1
- package/dist/components/base/Price/Double/index.tsx +1 -1
- package/dist/components/base/Price/index.tsx +1 -1
- package/dist/components/decorate/DecorateFloorModule/index.module.scss +32 -2
- package/dist/components/decorate/DecorateFloorModule/index.tsx +1 -1
- package/dist/components/decorate/EmptyFloorModule/index.tsx +1 -1
- package/dist/components/decorate/PlaceHolder/index.tsx +1 -1
- package/dist/components/floorItem.jd.tsx +1 -1
- package/dist/components/floorItem.tsx +1 -1
- package/dist/components/floorItem.weapp.tsx +1 -1
- package/dist/components/isv/Floor/index.tsx +1 -1
- package/dist/components/remoteFloorItem.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/interface/service.ts +1 -1
- package/dist/interface/utils.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.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.jdb.ts +1 -1
- package/dist/jumpEventReport/web.jdjch.ts +1 -1
- package/dist/jumpEventReport/web.jxwxapp.ts +1 -0
- package/dist/jumpEventReport/web.tjapp.ts +1 -0
- package/dist/jumpEventReport/web.tjm.ts +1 -0
- package/dist/jumpEventReport/web.wxapp.ts +1 -1
- package/dist/modules/ContainerFloorList/index.h5.module.scss +18 -1
- package/dist/modules/ContainerFloorList/index.h5.tsx +1 -1
- package/dist/modules/ContainerFloorList/index.tsx +1 -1
- package/dist/open/api/device.ts +1 -1
- package/dist/open/api/environment.ts +1 -1
- package/dist/open/api/index.ts +1 -1
- package/dist/open/api/jump copy.ts +1 -1
- package/dist/open/api/request.ts +1 -1
- package/dist/open/api/shopMember.ts +1 -1
- package/dist/open/api/track.ts +1 -1
- package/dist/open/api/util.ts +1 -1
- package/dist/open/components/index.ts +1 -1
- package/dist/sass/app.h5.scss +49 -3
- package/dist/sass/base.scss +57 -0
- package/dist/service/fetchGateway.ts +1 -1
- package/dist/service/http/const.ts +1 -1
- package/dist/service/requestServer.ts +1 -1
- package/dist/utils/connectNativeJsBridge.ts +1 -1
- package/dist/utils/connectNativeJsBridge.weapp.ts +1 -1
- package/dist/utils/draExceptionAndProfile.ts +1 -1
- package/dist/utils/h5Utils.ts +1 -1
- 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/jm-common.js +1 -1
- package/dist/utils/sgmCodeUtils.ts +1 -0
- package/dist/utils/taroRenderUtil.ts +1 -1
- package/dist/utils/utils.ts +1 -1
- package/package.json +1 -1
- package/dist/customHooks/useDocumentVisibilitychange.ts +0 -1
|
@@ -50,6 +50,10 @@
|
|
|
50
50
|
.d-no-data-tip-1 {
|
|
51
51
|
background-image: url('https://img14.360buyimg.com/imagetools/jfs/t1/152550/40/8432/21643/5fc9cae0E5391a506/523da679188ff687.png');
|
|
52
52
|
}
|
|
53
|
+
|
|
54
|
+
.d-no-data-tip-2 {
|
|
55
|
+
background-image: url('https://img11.360buyimg.com/imagetools/jfs/t1/142705/35/17776/5911/5fd1e62dE4fbc2300/3ee1d4160db1dac6.png');
|
|
56
|
+
}
|
|
53
57
|
.d-no-network-err-tip {
|
|
54
58
|
background-image: url('https://img14.360buyimg.com/imagetools/jfs/t1/146556/1/17745/7493/5fd1e62dE86e86669/96f5c91befa8e991.png');
|
|
55
59
|
}
|
|
@@ -85,3 +89,6 @@
|
|
|
85
89
|
min-height: 500px;
|
|
86
90
|
background: #f2f2f2;
|
|
87
91
|
}
|
|
92
|
+
.d-shop-network-no-position {
|
|
93
|
+
position: static;
|
|
94
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import { Button, View } from '@tarojs/components'
|
|
2
1
|
NetWorkErrorSubTip,
|
|
3
2
|
subMessage,
|
|
4
3
|
backgroundColorWhite,
|
|
5
4
|
const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
|
|
6
5
|
const useErrorSubTip = subMessage? subMessage: NetWorkErrorSubTip[netWorkDataType]
|
|
7
6
|
const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
|
|
8
7
|
const maxHeight = latestRes.displayHeight || 546
|
|
9
8
|
style={{maxHeight: isMemberPage ? '100vh' : maxHeight}}
|
|
10
9
|
{useErrorSubTip? <View className={netWorkErrorStyle['d-error-sub-tip']}>{useErrorSubTip}</View>: null}
|
|
11
10
|
<Button
|
|
12
11
|
onClick={refershInitData}
|
|
13
12
|
className={classNames(
|
|
14
13
|
netWorkErrorStyle['d-opt-btn'],
|
|
15
14
|
'd-button-no-border',
|
|
16
15
|
)}
|
|
17
16
|
plain
|
|
18
17
|
size="mini"
|
|
19
18
|
>
|
|
20
19
|
重新加载
|
|
21
20
|
</Button>
|
|
22
21
|
)}
|
|
23
22
|
subMessage: '',
|
|
23
|
+
import { Button, View } from '@tarojs/components'
|
|
24
24
|
NetWorkErrorList,
|
|
25
25
|
NetWorkErrorTip,
|
|
26
26
|
NetWorkErrorSubTip,
|
|
27
27
|
NetWorkShowType,
|
|
28
28
|
NetWork_Image_Type,
|
|
29
29
|
const {
|
|
30
30
|
className,
|
|
31
31
|
message,
|
|
32
32
|
subMessage,
|
|
33
33
|
btnLabel,
|
|
34
34
|
backgroundColorWhite,
|
|
35
35
|
netWorkDataType,
|
|
36
36
|
netWorkShowType,
|
|
37
37
|
netWorkImageType,
|
|
38
38
|
refreshCallBackFn,
|
|
39
39
|
viewMaxHeight,
|
|
40
40
|
noPosition = false,
|
|
41
41
|
} = props
|
|
42
42
|
const refershInitData = useCallback(() => {
|
|
43
43
|
refreshCallBackFn && refreshCallBackFn(true)
|
|
44
44
|
}, [])
|
|
45
45
|
const useErrorTip = message != '' ? message : NetWorkErrorTip[netWorkDataType]
|
|
46
46
|
const useErrorSubTip = subMessage
|
|
47
47
|
? subMessage
|
|
48
48
|
: NetWorkErrorSubTip[netWorkDataType]
|
|
49
49
|
const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
|
|
50
50
|
const maxHeight = latestRes.displayHeight || 546
|
|
51
51
|
return NetWorkErrorList.includes(netWorkDataType as NETWORK_DATA_TYPE) ? (
|
|
52
52
|
<View
|
|
53
53
|
style={{ maxHeight: viewMaxHeight !== '' ? viewMaxHeight : isMemberPage ? '100vh' : maxHeight }}
|
|
54
54
|
className={classNames(
|
|
55
55
|
netWorkErrorStyle['d-shop-network'],
|
|
56
56
|
{
|
|
57
57
|
[netWorkErrorStyle['d-shop-network-white']]: backgroundColorWhite,
|
|
58
58
|
},
|
|
59
59
|
{
|
|
60
60
|
[netWorkErrorStyle['d-shop-network-part']]:
|
|
61
61
|
netWorkShowType === NetWorkShowType.PART,
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
[netWorkErrorStyle['d-network-jd-shop-view']]: isH5AndJdShopView,
|
|
65
65
|
},
|
|
66
66
|
{
|
|
67
67
|
[netWorkErrorStyle['d-shop-network-no-position']]: noPosition
|
|
68
68
|
},
|
|
69
69
|
'flexible-center-box',
|
|
70
70
|
className,
|
|
71
71
|
)}
|
|
72
72
|
>
|
|
73
73
|
<View className={classNames(netWorkErrorStyle['d-error-content'],'d-error-content')}>
|
|
74
74
|
<View
|
|
75
75
|
className={classNames(
|
|
76
76
|
netWorkErrorStyle['d-error-type'],
|
|
77
77
|
netWorkErrorStyle[`d-${netWorkDataType}`],
|
|
78
78
|
netWorkErrorStyle[`d-${netWorkImageType}`],
|
|
79
79
|
'd-error-type'
|
|
80
80
|
)}
|
|
81
81
|
/>
|
|
82
82
|
<View className={classNames(netWorkErrorStyle['d-error-tip'],'d-error-tip')}>
|
|
83
83
|
{useErrorTip}
|
|
84
84
|
</View>
|
|
85
85
|
{useErrorSubTip ? <View className={classNames(netWorkErrorStyle['d-error-sub-tip'],'d-error-sub-tip')}>{useErrorSubTip}</View> : null}
|
|
86
86
|
<View className={'flexible-horizontal-center-box'}>
|
|
87
87
|
{refreshCallBackFn && (
|
|
88
88
|
<Button
|
|
89
89
|
onClick={refershInitData}
|
|
90
90
|
className={classNames(
|
|
91
91
|
netWorkErrorStyle['d-opt-btn'],
|
|
92
92
|
'd-button-no-border',
|
|
93
93
|
'd-opt-btn'
|
|
94
94
|
)}
|
|
95
95
|
plain
|
|
96
96
|
size="mini"
|
|
97
97
|
>
|
|
98
98
|
{btnLabel}
|
|
99
99
|
</Button>
|
|
100
100
|
)}
|
|
101
101
|
</View>
|
|
102
102
|
</View>
|
|
103
103
|
</View>
|
|
104
104
|
) : null
|
|
105
105
|
className: '',
|
|
106
106
|
message: '',
|
|
107
107
|
subMessage: '',
|
|
108
108
|
btnLabel: '重新加载',
|
|
109
109
|
backgroundColorWhite: false,
|
|
110
110
|
netWorkDataType: NETWORK_DATA_TYPE.NORMAL,
|
|
111
111
|
netWorkImageType: NetWork_Image_Type.No_Data_Default_Tip,
|
|
112
112
|
netWorkShowType: NetWorkShowType.FULL,
|
|
113
113
|
refreshCallBackFn: null,
|
|
114
114
|
viewMaxHeight: ''
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
1
|
const result = String(strPrice).match(/(-?\d+)\.?(\d+)?/);
|
|
3
2
|
if(result && Number(result[0]) > 0){
|
|
4
3
|
return {
|
|
5
4
|
integerPrice: result[1],
|
|
6
5
|
decimalPrice: (result[2] || '').replace(/0+$/, '')
|
|
7
6
|
}
|
|
8
7
|
}else{
|
|
9
8
|
return null;
|
|
10
9
|
}
|
|
11
10
|
const {
|
|
12
11
|
jdPrice,
|
|
13
12
|
finalPrice,
|
|
14
13
|
priceText = '',
|
|
15
14
|
priceType,
|
|
16
15
|
hitUserIdentity = false,
|
|
17
16
|
isAuctionWare,
|
|
18
17
|
fallbackRender = null,
|
|
19
18
|
className = null,
|
|
20
19
|
style = {},
|
|
21
20
|
childrenClassName = null,
|
|
22
21
|
bigNoPriceClassName = null,
|
|
23
22
|
bigSymbolClassName = null,
|
|
24
23
|
bigIntegerClassName = null,
|
|
25
24
|
bigDecimalClassName = null,
|
|
26
25
|
priceDescClassName = null,
|
|
27
26
|
smallPriceClassName = null,
|
|
28
27
|
lineNumber = 1,
|
|
29
28
|
size = 'M'
|
|
30
29
|
} = props
|
|
31
30
|
const especialHitStyleType = {
|
|
32
31
|
7: 'plusStyle',
|
|
33
32
|
9: 'samStyle'
|
|
34
33
|
}
|
|
35
34
|
const especialMissStyleType = {
|
|
36
35
|
7: 'plusStyle',
|
|
37
36
|
8: 'fansStyle',
|
|
38
37
|
9: 'samStyle',
|
|
39
38
|
10: 'studentStyle',
|
|
40
39
|
12: 'yhdStyle',
|
|
41
40
|
13: 'memberStyle'
|
|
42
41
|
}
|
|
43
42
|
const isNoPrice = priceType === 4
|
|
44
43
|
const isUseFinalPriceAsBigPrice = [1, 2, 6, 14, 16, 17, 18].includes(priceType)
|
|
45
44
|
const isEquivalentHit = isUseFinalPriceAsBigPrice || hitUserIdentity
|
|
46
45
|
const bigPriceObj = getDeconstructPrice(isEquivalentHit? finalPrice: jdPrice)
|
|
47
46
|
if(isAuctionWare || (!isNoPrice && bigPriceObj === null)){
|
|
48
47
|
return fallbackRender
|
|
49
48
|
}
|
|
50
49
|
const {integerPrice, decimalPrice = ''} = bigPriceObj || {}
|
|
51
50
|
const isOnlyShowBigPrice = priceType === 3
|
|
52
51
|
const isHideSmallPrice = priceType === 14
|
|
53
52
|
const smallPrice = isEquivalentHit? jdPrice: finalPrice
|
|
54
53
|
const isPriceDescInFront = isEquivalentHit
|
|
55
54
|
const hitColorStyle = isEquivalentHit? styles[especialHitStyleType[priceType]]: null
|
|
56
55
|
const missColorStyle = isEquivalentHit? null: styles[especialMissStyleType[priceType]]
|
|
57
56
|
const isBigPriceHasDecimal = decimalPrice !== '' && !/^0+$/.test(decimalPrice)
|
|
58
57
|
const sizeLineHeight = {
|
|
59
58
|
'XS': 28,
|
|
60
59
|
'S': 34,
|
|
61
60
|
'M': 40,
|
|
62
61
|
'L': 46,
|
|
63
62
|
'XL': 52
|
|
64
63
|
}
|
|
65
64
|
const lineHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25)
|
|
66
65
|
const wrapHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25 * lineNumber)
|
|
67
66
|
const computedHeightStyle = {
|
|
68
67
|
height: wrapHeight
|
|
69
68
|
}
|
|
70
69
|
const itemCommonStyle = {
|
|
71
70
|
height: lineHeight
|
|
72
71
|
}
|
|
73
72
|
const needSizeStyles = ['bigNoPrice', 'bigSymbol', 'bigInteger', 'bigDecimal', 'priceDesc', 'smallPrice']
|
|
74
73
|
const sizeStyles = needSizeStyles.reduce((acc, cur) => {
|
|
75
74
|
acc[cur] = styles[cur + size]
|
|
76
75
|
return acc
|
|
77
76
|
}, {})
|
|
78
77
|
const noPriceShowText = priceText || (/^[\u4e00-\u9fa5]+$/.test(jdPrice)? jdPrice: '')
|
|
79
78
|
return (
|
|
80
79
|
<View className={classNames(styles.wrap, className)} style={{...computedHeightStyle, ...style}}>
|
|
81
80
|
{isNoPrice?
|
|
82
81
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigNoPrice, sizeStyles['bigNoPrice'], childrenClassName, bigNoPriceClassName)} style={{...itemCommonStyle}}>{noPriceShowText}</Text>
|
|
83
82
|
:
|
|
84
83
|
[
|
|
85
84
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigSymbol, sizeStyles['bigSymbol'], hitColorStyle, childrenClassName, bigSymbolClassName)} key="bigSymbol" style={{...itemCommonStyle}}>¥</Text>,
|
|
86
85
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigInteger, sizeStyles['bigInteger'], hitColorStyle, !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront ? styles.rightMargin : null, childrenClassName, bigIntegerClassName)} key="bigInteger" style={{...itemCommonStyle}}>{integerPrice}</Text>,
|
|
87
86
|
isBigPriceHasDecimal?
|
|
88
87
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigDecimal, sizeStyles['bigDecimal'], hitColorStyle, isPriceDescInFront ? null : styles.rightMargin, childrenClassName, bigDecimalClassName)} key="bigDecimal" style={{...itemCommonStyle}}>.{decimalPrice}</Text>
|
|
89
88
|
:
|
|
90
89
|
null
|
|
91
90
|
,
|
|
92
91
|
!isOnlyShowBigPrice && [
|
|
93
92
|
isPriceDescInFront && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.bigStyle, hitColorStyle, isPriceDescInFront ? styles.rightMargin : null, childrenClassName, priceDescClassName)} key="descFront" style={{...itemCommonStyle}}>{priceText}</Text>,
|
|
94
93
|
smallPrice && !isHideSmallPrice ? <Text className={classNames(styles.childStyle, styles.smallPrice, sizeStyles['smallPrice'], styles.smallStyle, missColorStyle, childrenClassName, smallPriceClassName)} key="smallPrice" style={{...itemCommonStyle}}>¥{smallPrice}</Text> : null,
|
|
95
94
|
!isPriceDescInFront && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.smallStyle, styles.missPriceDesc, missColorStyle, childrenClassName, priceDescClassName)} key="descBack" style={{...itemCommonStyle}}>{priceText}</Text>
|
|
96
95
|
]
|
|
97
96
|
]
|
|
98
97
|
}
|
|
99
98
|
</View>
|
|
100
99
|
)
|
|
100
|
+
import React from 'react';
|
|
101
101
|
const result = String(strPrice).match(/(-?\d+)\.?(\d+)?/);
|
|
102
102
|
if(result && Number(result[0]) > 0){
|
|
103
103
|
return {
|
|
104
104
|
integerPrice: result[1],
|
|
105
105
|
decimalPrice: (result[2] || '').replace(/0+$/, '')
|
|
106
106
|
}
|
|
107
107
|
}else{
|
|
108
108
|
return null;
|
|
109
109
|
}
|
|
110
110
|
const {
|
|
111
111
|
jdPrice,
|
|
112
112
|
finalPrice,
|
|
113
113
|
priceText = '',
|
|
114
114
|
priceType,
|
|
115
115
|
hitUserIdentity = false,
|
|
116
116
|
isAuctionWare,
|
|
117
117
|
fallbackRender = null,
|
|
118
118
|
className = null,
|
|
119
119
|
style = {},
|
|
120
120
|
childrenClassName = null,
|
|
121
121
|
bigNoPriceClassName = null,
|
|
122
122
|
bigSymbolClassName = null,
|
|
123
123
|
bigIntegerClassName = null,
|
|
124
124
|
bigDecimalClassName = null,
|
|
125
125
|
priceDescClassName = null,
|
|
126
126
|
smallPriceClassName = null,
|
|
127
127
|
lineNumber = 1,
|
|
128
128
|
size = 'M',
|
|
129
129
|
isDefaultRemoveSmallPrice = false
|
|
130
130
|
} = props
|
|
131
131
|
const especialHitStyleType = {
|
|
132
132
|
7: 'plusStyle',
|
|
133
133
|
9: 'samStyle'
|
|
134
134
|
}
|
|
135
135
|
const especialMissStyleType = {
|
|
136
136
|
7: 'plusStyle',
|
|
137
137
|
8: 'fansStyle',
|
|
138
138
|
9: 'samStyle',
|
|
139
139
|
10: 'studentStyle',
|
|
140
140
|
12: 'yhdStyle',
|
|
141
141
|
13: 'memberStyle'
|
|
142
142
|
}
|
|
143
143
|
const isNoPrice = priceType === 4
|
|
144
144
|
const isUseFinalPriceAsBigPrice = [1, 2, 6, 14, 16, 17, 18].includes(priceType)
|
|
145
145
|
const isEquivalentHit = isUseFinalPriceAsBigPrice || hitUserIdentity
|
|
146
146
|
const bigPriceObj = getDeconstructPrice(isEquivalentHit? finalPrice: jdPrice)
|
|
147
147
|
if(isAuctionWare || (!isNoPrice && bigPriceObj === null)){
|
|
148
148
|
return fallbackRender
|
|
149
149
|
}
|
|
150
150
|
const {integerPrice, decimalPrice = ''} = bigPriceObj || {}
|
|
151
151
|
const isOnlyShowBigPrice = priceType === 3
|
|
152
152
|
const isHideSmallPrice = priceType === 14 || isDefaultRemoveSmallPrice
|
|
153
153
|
const smallPrice = isEquivalentHit? jdPrice: finalPrice
|
|
154
154
|
const isPriceDescInFront = isEquivalentHit
|
|
155
155
|
const hitColorStyle = isEquivalentHit? styles[especialHitStyleType[priceType]]: null
|
|
156
156
|
const missColorStyle = isEquivalentHit? null: styles[especialMissStyleType[priceType]]
|
|
157
157
|
const isBigPriceHasDecimal = decimalPrice !== '' && !/^0+$/.test(decimalPrice)
|
|
158
158
|
const sizeLineHeight = {
|
|
159
159
|
'XS': 28,
|
|
160
160
|
'S': 34,
|
|
161
161
|
'M': 40,
|
|
162
162
|
'L': 46,
|
|
163
163
|
'XL': 52
|
|
164
164
|
}
|
|
165
165
|
const lineHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25)
|
|
166
166
|
const wrapHeight = Taro.pxTransform(sizeLineHeight[size] * 1.25 * lineNumber)
|
|
167
167
|
const computedHeightStyle = {
|
|
168
168
|
height: wrapHeight
|
|
169
169
|
}
|
|
170
170
|
const itemCommonStyle = {
|
|
171
171
|
height: lineHeight
|
|
172
172
|
}
|
|
173
173
|
const needSizeStyles = ['bigNoPrice', 'bigSymbol', 'bigInteger', 'bigDecimal', 'priceDesc', 'smallPrice']
|
|
174
174
|
const sizeStyles = needSizeStyles.reduce((acc, cur) => {
|
|
175
175
|
acc[cur] = styles[cur + size]
|
|
176
176
|
return acc
|
|
177
177
|
}, {})
|
|
178
178
|
const noPriceShowText = priceText || (/^[\u4e00-\u9fa5]+$/.test(jdPrice)? jdPrice: '')
|
|
179
179
|
return (
|
|
180
180
|
<View className={classNames(styles.wrap, className)} style={{...computedHeightStyle, ...style}}>
|
|
181
181
|
{isNoPrice?
|
|
182
182
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigNoPrice, sizeStyles['bigNoPrice'], childrenClassName, bigNoPriceClassName)} style={{...itemCommonStyle}}>{noPriceShowText}</Text>
|
|
183
183
|
:
|
|
184
184
|
[
|
|
185
185
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigSymbol, sizeStyles['bigSymbol'], hitColorStyle, childrenClassName, bigSymbolClassName)} key="bigSymbol" style={{...itemCommonStyle}}>¥</Text>,
|
|
186
186
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigInteger, sizeStyles['bigInteger'], hitColorStyle, !isOnlyShowBigPrice && !isBigPriceHasDecimal && !isPriceDescInFront ? styles.rightMargin : null, childrenClassName, bigIntegerClassName)} key="bigInteger" style={{...itemCommonStyle}}>{integerPrice}</Text>,
|
|
187
187
|
isBigPriceHasDecimal?
|
|
188
188
|
<Text className={classNames(styles.childStyle, styles.bigStyle, styles.bigDecimal, sizeStyles['bigDecimal'], hitColorStyle, isPriceDescInFront ? null : styles.rightMargin, childrenClassName, bigDecimalClassName)} key="bigDecimal" style={{...itemCommonStyle}}>.{decimalPrice}</Text>
|
|
189
189
|
:
|
|
190
190
|
null
|
|
191
191
|
,
|
|
192
192
|
!isOnlyShowBigPrice && [
|
|
193
193
|
isPriceDescInFront && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.bigStyle, hitColorStyle, isPriceDescInFront ? styles.rightMargin : null, childrenClassName, priceDescClassName)} key="descFront" style={{...itemCommonStyle}}>{priceText}</Text>,
|
|
194
194
|
<view style={{
|
|
195
195
|
display: 'inline-flex'
|
|
196
196
|
}}>
|
|
197
197
|
{smallPrice && !isHideSmallPrice ? <Text className={classNames(styles.childStyle, styles.smallPrice, sizeStyles['smallPrice'], styles.smallStyle, missColorStyle, childrenClassName, smallPriceClassName)} key="smallPrice" style={{...itemCommonStyle}}>¥{smallPrice}</Text> : null}
|
|
198
198
|
{!isPriceDescInFront && !isHideSmallPrice && <Text className={classNames(styles.childStyle, styles.priceDesc, sizeStyles['priceDesc'], styles.smallStyle, styles.missPriceDesc, missColorStyle, childrenClassName, priceDescClassName)} key="descBack" style={{...itemCommonStyle}}>{priceText}</Text>}
|
|
199
199
|
</view>
|
|
200
200
|
]
|
|
201
201
|
]
|
|
202
202
|
}
|
|
203
203
|
</View>
|
|
204
204
|
)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import React from 'react'
|
|
2
1
|
<BasePrice {...props}/>
|
|
3
2
|
:
|
|
4
3
|
<DoublePrice {...props} />
|
|
4
|
+
import React from 'react'
|
|
5
5
|
if (props.priceType === undefined) {
|
|
6
6
|
if (props.value === undefined) {
|
|
7
7
|
if (props.jdPrice === undefined) {
|
|
8
8
|
return null
|
|
9
9
|
} else {
|
|
10
10
|
return <BasePrice {...props} value={props.jdPrice} />
|
|
11
11
|
}
|
|
12
12
|
} else {
|
|
13
13
|
return <BasePrice {...props} />
|
|
14
14
|
}
|
|
15
15
|
} else {
|
|
16
16
|
return <DoublePrice {...props} />
|
|
17
17
|
}
|
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
|
|
2
|
-
.d-container-item {
|
|
2
|
+
.d-container-item, .d-container-item-trusteeship {
|
|
3
3
|
position: relative;
|
|
4
4
|
overflow: hidden;
|
|
5
5
|
z-index: 3;
|
|
6
6
|
&:first-child {
|
|
7
7
|
z-index: 1;
|
|
8
8
|
}
|
|
9
|
-
|
|
9
|
+
|
|
10
|
+
&.d-container-item-hide{
|
|
11
|
+
display: none;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
.d-container-item-cover {
|
|
15
|
+
&:first-child {
|
|
16
|
+
z-index: 99;
|
|
17
|
+
top: 22px;
|
|
18
|
+
// top: 21px;
|
|
19
|
+
width: 98.5%;
|
|
20
|
+
left: 6px;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
width: 100%;
|
|
24
|
+
position: absolute;
|
|
25
|
+
}
|
|
26
|
+
.d-container-item{
|
|
27
|
+
&.d-container-item-active {
|
|
10
28
|
:global {
|
|
11
29
|
.d-decorate-floor-item {
|
|
12
30
|
.d-floor-selected-border {
|
|
@@ -16,3 +34,15 @@
|
|
|
16
34
|
}
|
|
17
35
|
}
|
|
18
36
|
}
|
|
37
|
+
|
|
38
|
+
.d-container-item-trusteeship{
|
|
39
|
+
&.d-container-item-active {
|
|
40
|
+
:global {
|
|
41
|
+
.d-decorate-floor-item {
|
|
42
|
+
.d-floor-selected-border {
|
|
43
|
+
border: 4px solid #4A82F2 !important;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import { View } from '@tarojs/components'
|
|
2
1
|
selectContainerId,
|
|
3
2
|
placeHolderPreContainerId,
|
|
4
3
|
containerData,
|
|
5
4
|
children,
|
|
6
5
|
style,
|
|
7
6
|
shopTotalInfo,
|
|
8
7
|
} = props;
|
|
9
8
|
return children ? children : null;
|
|
10
9
|
}, [containerData, shopTotalInfo]);
|
|
11
10
|
data-container-empty={containerData?.floors?.[0]?.configEmpty || 'false'}
|
|
11
|
+
import { View } from '@tarojs/components'
|
|
12
12
|
const {
|
|
13
13
|
selectContainerId,
|
|
14
14
|
placeHolderPreContainerId,
|
|
15
15
|
containerData,
|
|
16
16
|
children,
|
|
17
17
|
style,
|
|
18
18
|
shopTotalInfo,
|
|
19
19
|
urlQueryData,
|
|
20
20
|
containerIndex = -1,
|
|
21
21
|
luxuryFixed = false
|
|
22
22
|
} = props;
|
|
23
23
|
const { isTrusteeship = false } = urlQueryData || {}
|
|
24
24
|
const selectContainerState = selectContainerId == containerData?.containerId
|
|
25
25
|
const ChildrenComponent = useCallback(() => {
|
|
26
26
|
return children ? children : null;
|
|
27
27
|
}, [containerData, shopTotalInfo]);
|
|
28
28
|
const isHideFloor = isTrusteeship && containerData?.floors?.[0]?.status === -1
|
|
29
29
|
return (
|
|
30
30
|
<View
|
|
31
31
|
className={classNames(
|
|
32
32
|
decorateModuleStyle[isTrusteeship ? 'd-container-item-trusteeship' : 'd-container-item'],
|
|
33
33
|
'J_container',
|
|
34
34
|
{
|
|
35
35
|
[decorateModuleStyle['d-container-item-active']]:
|
|
36
36
|
selectContainerState,
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
J_floorItemActive: selectContainerState,
|
|
40
40
|
},
|
|
41
41
|
{
|
|
42
42
|
[decorateModuleStyle['d-container-item-hide']]:
|
|
43
43
|
isHideFloor,
|
|
44
44
|
},
|
|
45
45
|
{
|
|
46
46
|
[decorateModuleStyle['d-container-item-cover']]:
|
|
47
47
|
containerIndex === 0 && luxuryFixed && !isTrusteeship,
|
|
48
48
|
},
|
|
49
49
|
)}
|
|
50
50
|
id={`J_container_${containerData?.containerId}`}
|
|
51
51
|
data-container-id={containerData?.containerId}
|
|
52
52
|
data-container-type={containerData?.typeCode}
|
|
53
53
|
data-container-cn={containerData?.typeCn}
|
|
54
54
|
data-container-floorFlag={containerData?.extInfo?.floorFlag || ''}
|
|
55
55
|
data-container-moduleInstanceType={containerData?.extInfo?.moduleInstanceType || ''}
|
|
56
56
|
data-container-position={containerData?.containerPosition}
|
|
57
57
|
data-container-alias={
|
|
58
58
|
containerData?.containerAlias
|
|
59
59
|
? containerData?.containerAlias
|
|
60
60
|
: ''
|
|
61
61
|
}
|
|
62
62
|
data-container-empty={containerData?.floors?.[0]?.configEmpty || 'false'}
|
|
63
63
|
style={
|
|
64
64
|
containerData?.typeCode !== ContainerShopHeaderType ? style : {}
|
|
65
65
|
}
|
|
66
66
|
>
|
|
67
67
|
<input
|
|
68
68
|
type="hidden"
|
|
69
69
|
value={`container_${containerData?.containerId}`}
|
|
70
70
|
/>
|
|
71
71
|
<ChildrenComponent />
|
|
72
72
|
<PlaceHolder
|
|
73
73
|
placeHolderPreContainerId={placeHolderPreContainerId}
|
|
74
74
|
containerId={containerData?.containerId}
|
|
75
75
|
{...(selectContainerId === "luxuryHeader-isUpperHalf" && { isShowPlaceHolder: false })}
|
|
76
76
|
/>
|
|
77
77
|
</View>
|
|
78
78
|
)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import { View, Text } from '@tarojs/components'
|
|
2
1
|
'//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
|
|
3
2
|
const newModuleFloorTypeList = [100, 101, 100000, 99999]
|
|
4
3
|
const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
|
|
5
4
|
if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
|
|
5
|
+
import { View, Text } from '@tarojs/components'
|
|
6
6
|
'//img11.360buyimg.com/imagetools/jfs/t1/141506/22/31698/7923/637b6db9E2af80265/10e76e2c31e0e356.png'
|
|
7
7
|
'//img14.360buyimg.com/imagetools/jfs/t1/247708/11/19310/58975/66ecefa4Fe36ade02/370c18c961aceef1.png'
|
|
8
8
|
const {
|
|
9
9
|
moduleType,
|
|
10
10
|
configEmpty,
|
|
11
11
|
previewUri = null,
|
|
12
12
|
uid,
|
|
13
13
|
moduleFlag,
|
|
14
14
|
moduleName,
|
|
15
15
|
} = props.floorData
|
|
16
16
|
const { luxuryFixed = false } = props
|
|
17
17
|
let previewUrl = previewUri
|
|
18
18
|
const newModuleFloorTypeList = [100, 101, 100000, 99999]
|
|
19
19
|
const isNewFloorState = newModuleFloorTypeList.includes(moduleType)
|
|
20
20
|
if ((moduleType == 99999 || moduleType == 101) && !previewUri) {
|
|
21
21
|
previewUrl = luxuryFixed ? luxuryDecorateModulePrevDefaultUrl : decorateModulePrevDefaultUrl
|
|
22
22
|
}
|
|
23
23
|
const loadImageErr = e => {
|
|
24
24
|
e.target.src = decorateModulePrevDefaultUrl
|
|
25
25
|
}
|
|
26
26
|
if (moduleFlag && TRUSTEESHIP_MODULE_FLAG_LIST.indexOf(moduleFlag) !== -1)
|
|
27
27
|
return null
|
|
28
28
|
return isNewFloorState && configEmpty && previewUrl ? (
|
|
29
29
|
<View
|
|
30
30
|
className={emptyModuleStyle['d-empty-module']}
|
|
31
31
|
data-floor-uid={uid}
|
|
32
32
|
data-floor-type={moduleFlag}
|
|
33
33
|
data-floor-modulename={moduleName}
|
|
34
34
|
>
|
|
35
35
|
{}
|
|
36
36
|
{}
|
|
37
37
|
{}
|
|
38
38
|
{}
|
|
39
39
|
{}
|
|
40
40
|
{}
|
|
41
41
|
{}
|
|
42
42
|
<View className={classNames(emptyModuleStyle['d-empty-img'])}>
|
|
43
43
|
<img
|
|
44
44
|
width={luxuryFixed ? 375 : 355}
|
|
45
45
|
className={classNames('J_floorEmptyDataImg')}
|
|
46
46
|
src={previewUrl}
|
|
47
47
|
onError={loadImageErr.bind(this)}
|
|
48
48
|
/>
|
|
49
49
|
</View>
|
|
50
50
|
</View>
|
|
51
51
|
) : (
|
|
52
52
|
<View
|
|
53
53
|
className={classNames(
|
|
54
54
|
emptyModuleStyle['d-empty-module'],
|
|
55
55
|
emptyModuleStyle['d-empty-text-warp'],
|
|
56
56
|
)}
|
|
57
57
|
data-floor-uid={uid}
|
|
58
58
|
data-floor-type={moduleFlag}
|
|
59
59
|
data-floor-modulename={moduleName}
|
|
60
60
|
>
|
|
61
61
|
<Text className={emptyModuleStyle['d-empty-text']}>
|
|
62
62
|
该楼层还未配置数据
|
|
63
63
|
</Text>
|
|
64
64
|
</View>
|
|
65
65
|
)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import { View, Text } from '@tarojs/components'
|
|
1
|
+
import { View, Text } from '@tarojs/components'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import { ComponentInterFace } from '../interface/component'
|
|
2
1
|
const { floorData, builtInComponents = {} } = props
|
|
3
2
|
const floorModuleType = floorData?.floorExtInfo?.moduleFlag
|
|
4
3
|
const FloorContentItem =
|
|
5
4
|
(floorModuleType && builtInComponents[floorModuleType]) || null
|
|
6
5
|
const dataDefines = getFloorDataToDataDefines(floorData)
|
|
7
6
|
return FloorContentItem ? (
|
|
8
7
|
<ErrorBoundary {...props}>
|
|
9
8
|
<FloorContentItem {...props} dataDefines={dataDefines} />
|
|
10
9
|
</ErrorBoundary>
|
|
11
10
|
) : null
|
|
12
11
|
renderSourceType: BUSINESS_TYPE.ONLINE,
|
|
13
12
|
switch (moduleId) {
|
|
14
13
|
case 83158:
|
|
15
14
|
return 'freeLayout'
|
|
16
15
|
case 99654:
|
|
17
16
|
return 'activeText'
|
|
18
17
|
case 100382:
|
|
19
18
|
return 'superGoods'
|
|
20
19
|
}
|
|
21
20
|
floorList.map((item) => {
|
|
22
21
|
if (!item.floorExtInfo) {
|
|
23
22
|
return null
|
|
24
23
|
}
|
|
25
24
|
const moduleFlag = item.floorExtInfo.moduleFlag
|
|
26
25
|
if (!moduleFlag) {
|
|
27
26
|
const newModuleFlag = moduleId2ModuleFlag(item.moduleId)
|
|
28
27
|
if (newModuleFlag) {
|
|
29
28
|
item.floorExtInfo.moduleFlag = newModuleFlag
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
31
|
})
|
|
32
|
+
import React from 'react'
|
|
33
33
|
return FloorContentItem ? (
|
|
34
34
|
<FloorContentItem {...props} dataDefines={dataDefines} />
|
|
35
35
|
) : isDevMode ? (
|
|
36
36
|
renderDecorateDefaultModule()
|
|
37
37
|
) : null
|