@cloudbase/weda-ui 2.0.10 → 2.0.11
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/package.json +9 -2
- package/src/mp/components/button/index.js +1 -1
- package/src/mp/components/button/index.wxml +19 -19
- package/src/mp/components/calendar/index.js +64 -37
- package/src/mp/components/calendar/index.wxml +28 -8
- package/src/mp/components/carousel/index.wxml +30 -3
- package/src/mp/components/chart/bar/index.js +1 -2
- package/src/mp/components/chart/bar/index.wxml +7 -2
- package/src/mp/components/chart/common/config/bar.js +1 -1
- package/src/mp/components/chart/common/core/eChartBar.js +29 -34
- package/src/mp/components/chart/common/core/eChartBase.js +46 -32
- package/src/mp/components/chart/common/core/eChartLine.js +34 -40
- package/src/mp/components/chart/common/core/eChartPie.js +12 -9
- package/src/mp/components/chart/ec-canvas/ec-canvas.wxml +19 -2
- package/src/mp/components/chart/ec-canvas/wx-canvas.js +24 -22
- package/src/mp/components/chart/line/index.js +2 -2
- package/src/mp/components/chart/line/index.wxml +7 -2
- package/src/mp/components/chart/pie/index.js +1 -1
- package/src/mp/components/chart/pie/index.wxml +7 -3
- package/src/mp/components/chart/statisticsCard/index.wxml +5 -1
- package/src/mp/components/dataView/index.wxml +2 -2
- package/src/mp/components/form/checkbox/index.js +10 -6
- package/src/mp/components/form/checkbox/index.wxml +26 -23
- package/src/mp/components/form/form/index.wxml +3 -3
- package/src/mp/components/form/formcell/index.wxml +9 -9
- package/src/mp/components/form/formcell/index.wxss +1 -1
- package/src/mp/components/form/input/index.js +3 -3
- package/src/mp/components/form/input/index.wxml +36 -30
- package/src/mp/components/form/input/index.wxss +2 -2
- package/src/mp/components/form/location/components/mapChoose/index.wxml +59 -12
- package/src/mp/components/form/location/index.wxml +39 -7
- package/src/mp/components/form/radio/index.js +9 -5
- package/src/mp/components/form/radio/index.wxml +23 -23
- package/src/mp/components/form/select/index.js +156 -97
- package/src/mp/components/form/select/index.wxml +39 -37
- package/src/mp/components/form/select/index.wxss +1 -1
- package/src/mp/components/form/select/region/index.js +18 -12
- package/src/mp/components/form/switch/index.wxml +20 -16
- package/src/mp/components/form/textarea/index.wxml +12 -8
- package/src/mp/components/form/tips/index.wxml +1 -3
- package/src/mp/components/form/uploader/index.js +1 -1
- package/src/mp/components/form/uploader/index.wxml +19 -18
- package/src/mp/components/form/uploader/weui-uploader.js +210 -200
- package/src/mp/components/form/uploader/weui-uploader.wxml +81 -38
- package/src/mp/components/form/uploaderFile/index.js +5 -4
- package/src/mp/components/form/uploaderFile/index.wxml +97 -41
- package/src/mp/components/graphicCard/index.js +26 -24
- package/src/mp/components/graphicCard/index.wxml +30 -6
- package/src/mp/components/image/index.wxml +25 -18
- package/src/mp/components/image/index.wxss +3 -1
- package/src/mp/components/listView/index.wxml +34 -11
- package/src/mp/components/lottery/index.wxml +29 -7
- package/src/mp/components/lottery/index.wxss +31 -25
- package/src/mp/components/navLayout/index.wxml +29 -7
- package/src/mp/components/navigationBar/index.wxml +162 -53
- package/src/mp/components/swiper/index.wxml +12 -7
- package/src/mp/components/tabs/index.js +14 -10
- package/src/mp/components/tabs/index.wxml +2 -1
- package/src/mp/components/text/index.wxml +2 -1
- package/src/mp/components/text/index.wxss +1 -1
- package/src/mp/components/wxOpenApi/phone/index.wxml +11 -12
- package/src/mp/components/wxOpenApi/phoneCode/index.wxml +11 -12
- package/src/mp/components/wxOpenApi/share/index.wxml +11 -12
- package/src/mp/components/wxOpenApi/userInfo/index.wxml +10 -11
- package/src/mp/style/weda-ui.wxss +8 -3
- package/src/mp/utils/deepEqual.js +37 -37
- package/src/mp/utils/destr.js +41 -40
- package/src/mp/utils/dr_square_point.js +10 -6
- package/src/setupTests.js +13 -13
- package/src/web/components/button/index.tsx +44 -40
- package/src/web/components/carousel/index.tsx +1 -1
- package/src/web/components/chart/common/config/bar.js +1 -1
- package/src/web/components/chart/common/core/eChartBar.js +28 -34
- package/src/web/components/chart/common/core/eChartLine.js +34 -40
- package/src/web/components/chart/common/core/eChartPie.js +12 -9
- package/src/web/components/form/form/index.tsx +5 -5
- package/src/web/components/form/formcell/index.css +5 -1
- package/src/web/components/form/formcell/index.tsx +1 -1
- package/src/web/components/form/select/h5.tsx +154 -103
- package/src/web/components/form/select/index.css +0 -3
- package/src/web/components/form/textarea/index.tsx +1 -1
- package/src/web/components/form/uploader/uploader.h5.tsx +26 -20
- package/src/web/components/image/index.tsx +1 -1
- package/src/web/components/link/index.tsx +1 -1
- package/src/web/components/navLayout/index.tsx +1 -1
- package/src/web/components/navigationBar/index.tsx +2 -2
- package/src/web/components/picker/timePicker.tsx +1 -1
- package/src/web/components/text/index.tsx +13 -14
- package/src/web/utils/isObjectEqual.js +2 -1
- package/src/web/weda-ui.css +4 -0
|
@@ -1,46 +1,102 @@
|
|
|
1
1
|
<view class="weda-uploader-files {{extClass}}">
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
<view class="weda-uploader-files__hd">
|
|
3
|
+
<view class="weda-uploader-files__title" wx:if="{{labelVisible}}"
|
|
4
|
+
>{{label}}</view
|
|
5
|
+
>
|
|
6
|
+
<view>
|
|
7
|
+
<button class="weui-btn weda-uploader-files__btn" bindtap="uploadFile">
|
|
8
|
+
上传文件
|
|
9
|
+
</button>
|
|
10
|
+
<view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips"
|
|
11
|
+
>支持批量上传</view
|
|
12
|
+
>
|
|
13
|
+
<view wx:else><slot name="tips"></slot></view>
|
|
9
14
|
</view>
|
|
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
|
-
|
|
15
|
+
</view>
|
|
16
|
+
<view class="weda-uploader-files__bd">
|
|
17
|
+
<view class="weda-uploader-files__files" wx-if="{{files.length > 0}}">
|
|
18
|
+
<block wx:for="{{files}}" wx:key="index">
|
|
19
|
+
<view class="weda-uploader-files__item">
|
|
20
|
+
<view class="weda-uploader-files__item-left">
|
|
21
|
+
<view class="weda-uploader-files__file-detail">
|
|
22
|
+
<text class="weda-uploader-files__file-name">{{item.name}}</text>
|
|
23
|
+
<view
|
|
24
|
+
wx:if="{{item.status === 'success' || item.status === 'fail'}}"
|
|
25
|
+
class="weda-uploader-files__file-status"
|
|
26
|
+
>
|
|
27
|
+
<mp-icon
|
|
28
|
+
wx:if="{{item.status === 'success' }}"
|
|
29
|
+
icon="done2"
|
|
30
|
+
size="{{16}}"
|
|
31
|
+
color="#00A870"
|
|
32
|
+
type="field"
|
|
33
|
+
></mp-icon>
|
|
34
|
+
<mp-icon
|
|
35
|
+
wx:if="{{item.status === 'fail' }}"
|
|
36
|
+
icon="close2"
|
|
37
|
+
size="{{16}}"
|
|
38
|
+
color="#E34D59"
|
|
39
|
+
type="field"
|
|
40
|
+
></mp-icon>
|
|
41
|
+
<text class="weda-uploader-files__file-status--msg"
|
|
42
|
+
>{{item.status === 'success' ? '上传成功' : '上传失败'}}</text
|
|
43
|
+
>
|
|
44
|
+
</view>
|
|
45
|
+
</view>
|
|
46
|
+
<view
|
|
47
|
+
class="weda-uploader-files__progress weui-progress"
|
|
48
|
+
wx-if="{{item.status === 'pending' || item.status === 'uploading'}}"
|
|
49
|
+
>
|
|
50
|
+
<view class="weui-progress__bar">
|
|
51
|
+
<progress
|
|
52
|
+
percent="{{item.percent}}"
|
|
53
|
+
stroke-width="3"
|
|
54
|
+
activeColor="#0052D9"
|
|
55
|
+
backgroundColor="#E7E7E7"
|
|
56
|
+
stroke-width="3"
|
|
57
|
+
/>
|
|
58
|
+
</view>
|
|
59
|
+
</view>
|
|
60
|
+
<view class="weda-uploader-files__file-foot">
|
|
61
|
+
<div>
|
|
62
|
+
<text
|
|
63
|
+
wx-if="{{item.status === 'uploading' || item.status === 'pending'}}"
|
|
64
|
+
>{{item.status === 'uploading' ? item.uploaded : '0K'
|
|
65
|
+
}}/</text
|
|
66
|
+
>
|
|
67
|
+
<text>{{item.size}}</text>
|
|
68
|
+
</div>
|
|
69
|
+
<div
|
|
70
|
+
wx-if="{{item.status === 'uploading' || item.status === 'pending'}}"
|
|
71
|
+
>
|
|
72
|
+
{{item.status === 'pending' ? '等待上传' : '上传中'}}
|
|
73
|
+
</div>
|
|
74
|
+
</view>
|
|
75
|
+
</view>
|
|
76
|
+
<view class="weda-uploader-files__btn-group">
|
|
77
|
+
<image
|
|
78
|
+
wx-if="{{item.status === 'success'&&downloadVisible}}"
|
|
79
|
+
data-item="{{item}}"
|
|
80
|
+
bindtap="downloadFile"
|
|
81
|
+
class="weda-uploader-files__icon"
|
|
82
|
+
src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/4cba5da1-cde4-40c6-a075-86eff22858a4.svg"
|
|
83
|
+
></image>
|
|
84
|
+
<image
|
|
85
|
+
wx-if="{{item.status === 'fail'}}"
|
|
86
|
+
data-item="{{item}}"
|
|
87
|
+
bindtap="reload"
|
|
88
|
+
class="weda-uploader-files__icon"
|
|
89
|
+
src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/af5486eb-65e0-4536-8e51-6c68a17b71ac.svg"
|
|
90
|
+
></image>
|
|
91
|
+
<image
|
|
92
|
+
class="weda-uploader-files__icon"
|
|
93
|
+
data-item="{{item}}"
|
|
94
|
+
bindtap="onDelete"
|
|
95
|
+
src="https://imgcache.qq.com/qcloud/tcloud_dtc/static/static_source_business/2372f6a8-2f6a-4f30-92bf-73c62a5c0ae7.svg"
|
|
96
|
+
></image>
|
|
97
|
+
</view>
|
|
44
98
|
</view>
|
|
99
|
+
</block>
|
|
45
100
|
</view>
|
|
101
|
+
</view>
|
|
46
102
|
</view>
|
|
@@ -161,16 +161,17 @@ Component({
|
|
|
161
161
|
optionList,
|
|
162
162
|
});
|
|
163
163
|
},
|
|
164
|
-
'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight':
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
164
|
+
'titleMaxLines,titleColor,titleFontWeight,titleFontSize,textAlign,titleLineHeight':
|
|
165
|
+
function (
|
|
166
|
+
titleMaxLines,
|
|
167
|
+
titleColor,
|
|
168
|
+
titleFontWeight,
|
|
169
|
+
titleFontSize,
|
|
170
|
+
textAlign,
|
|
171
|
+
titleLineHeight
|
|
172
|
+
) {
|
|
173
|
+
let titleStyle = this.properties.titleStyle;
|
|
174
|
+
titleStyle = `
|
|
174
175
|
-webkit-line-clamp:${titleMaxLines ? titleMaxLines : 'revert'};
|
|
175
176
|
color: ${titleColor};
|
|
176
177
|
font-weight: ${titleFontWeight};
|
|
@@ -178,18 +179,19 @@ Component({
|
|
|
178
179
|
text-align: ${textAlign};
|
|
179
180
|
line-height: ${titleLineHeight == 'auto' ? 'normal' : titleLineHeight};
|
|
180
181
|
`;
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight':
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
182
|
+
this.setData({ titleStyle });
|
|
183
|
+
},
|
|
184
|
+
'desMaxLines,desColor,desFontWeight,desFontSize,textAlign,desLineHeight':
|
|
185
|
+
function (
|
|
186
|
+
desMaxLines,
|
|
187
|
+
desColor,
|
|
188
|
+
desFontWeight,
|
|
189
|
+
desFontSize,
|
|
190
|
+
textAlign,
|
|
191
|
+
desLineHeight
|
|
192
|
+
) {
|
|
193
|
+
let desStyle = this.properties.desStyle;
|
|
194
|
+
desStyle = `
|
|
193
195
|
-webkit-line-clamp:${desMaxLines ? desMaxLines : 'revert'};
|
|
194
196
|
color: ${desColor};
|
|
195
197
|
font-weight: ${desFontWeight};
|
|
@@ -197,7 +199,7 @@ Component({
|
|
|
197
199
|
text-align: ${textAlign};
|
|
198
200
|
line-height: ${desLineHeight == 'auto' ? 'normal' : desLineHeight};
|
|
199
201
|
`;
|
|
200
|
-
|
|
201
|
-
|
|
202
|
+
this.setData({ desStyle });
|
|
203
|
+
},
|
|
202
204
|
},
|
|
203
205
|
});
|
|
@@ -3,22 +3,46 @@
|
|
|
3
3
|
<block wx:for="{{optionList}}" wx:key="colIndex" wx:for-item="row">
|
|
4
4
|
<view class="weda-grid weda-graphic-card__row">
|
|
5
5
|
<block wx:for="{{row}}" wx:key="colIndex" wx:for-item="col">
|
|
6
|
-
<view
|
|
6
|
+
<view
|
|
7
|
+
class="weda-col weda-grid__item weda-graphic-card__col weda-graphic-card__col--{{textAlign}}"
|
|
8
|
+
style="width: {{(1 / ColMobile) * 100}}%"
|
|
9
|
+
data-item="{{col}}"
|
|
10
|
+
bindtap="navigaTo"
|
|
11
|
+
>
|
|
7
12
|
<view class="weda-grid__box">
|
|
8
13
|
<view class="weda-graphic-card__col-body">
|
|
9
14
|
<view class="weda-graphic-card__icon" style="{{iconStyle}}">
|
|
10
|
-
<image
|
|
15
|
+
<image
|
|
16
|
+
src="{{col.icon}}"
|
|
17
|
+
mode="scaleToFill"
|
|
18
|
+
class="weda-graphic-card__img"
|
|
19
|
+
></image>
|
|
11
20
|
</view>
|
|
12
|
-
<view
|
|
21
|
+
<view
|
|
22
|
+
class="weda-graphic-card__title"
|
|
23
|
+
style="{{titleStyle}}"
|
|
24
|
+
wx:if="{{titleVisible}}"
|
|
25
|
+
>
|
|
13
26
|
{{col.title}}
|
|
14
27
|
</view>
|
|
15
|
-
<view
|
|
28
|
+
<view
|
|
29
|
+
class="weda-graphic-card__desc"
|
|
30
|
+
style="text-align: {{textAlign}}"
|
|
31
|
+
wx:if="{{desVisible}}"
|
|
32
|
+
style="{{desStyle}}"
|
|
33
|
+
>
|
|
16
34
|
{{col.des}}
|
|
17
35
|
</view>
|
|
18
36
|
</view>
|
|
19
|
-
<view
|
|
37
|
+
<view
|
|
38
|
+
class="wedatea2td-btn wedatea2td-btn--link weda-graphic-card__btn"
|
|
39
|
+
wx:if="{{buttonVisible && col}}"
|
|
40
|
+
>
|
|
20
41
|
<text class="weda-graphic-card__btn--text">{{buttonText}}</text>
|
|
21
|
-
<image
|
|
42
|
+
<image
|
|
43
|
+
src="chevron-right.svg"
|
|
44
|
+
class="weda-graphic-card__btn--icon wedatea2td-icon wedatea2td-icon-btnback"
|
|
45
|
+
></image>
|
|
22
46
|
</view>
|
|
23
47
|
</view>
|
|
24
48
|
</view>
|
|
@@ -1,20 +1,27 @@
|
|
|
1
1
|
<image
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
2
|
+
style="{{style}}"
|
|
3
|
+
class="weda-ui weda-image {{clsx}}"
|
|
4
|
+
src="{{realSrc}}"
|
|
5
|
+
alt="{{alt}}"
|
|
6
|
+
mode="{{imgMode}}"
|
|
7
|
+
lazy-load="{{lazyLoad}}"
|
|
8
|
+
show-menu-by-longpress="{{showMenuByLongpress}}"
|
|
9
|
+
bindtap="onImgTap"
|
|
10
|
+
bindload="load"
|
|
11
|
+
binderror="error"
|
|
12
12
|
/>
|
|
13
|
-
<view wx:if="{{showImg}}" class="weda-img-mask" bindtap="onMaskClick"
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
<view wx:if="{{showImg}}" class="weda-img-mask" bindtap="onMaskClick">
|
|
14
|
+
<view bindtap="onCloseClick" class="weda-img-modal-close-btn">
|
|
15
|
+
<icon type="clear" size="23" color="white"></icon>
|
|
16
|
+
</view>
|
|
17
|
+
<gesture
|
|
18
|
+
bindpinch="onPinch"
|
|
19
|
+
catchtap="onTapImgPreview"
|
|
20
|
+
bindpressMove="onPressMove"
|
|
21
|
+
>
|
|
22
|
+
<view
|
|
23
|
+
class="weda-img-preview"
|
|
24
|
+
style="margin-top:{{offsetHeight}}px;width: 100%;height:{{showHeight}}px;background-image: url('{{realSrc}}');transform: scale({{zoom}}) translateX({{previewTranslateX}}px) translateY({{previewTranslateY}}px);"
|
|
25
|
+
></view>
|
|
26
|
+
</gesture>
|
|
27
|
+
</view>
|
|
@@ -38,7 +38,9 @@
|
|
|
38
38
|
|
|
39
39
|
.weda-image-error::before {
|
|
40
40
|
content: '';
|
|
41
|
-
background: #f5f5f5
|
|
41
|
+
background: #f5f5f5
|
|
42
|
+
url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIiBmaWxsPSJub25lIj4KICA8cGF0aCBkPSJNMjUuMzIgMTYuMzU5N0MyNi4wNzY0IDE2LjM1OTcgMjYuODI1NCAxNi41MDg3IDI3LjUyNDMgMTYuNzk4MUMyOC4yMjMxIDE3LjA4NzYgMjguODU4MSAxNy41MTE5IDI5LjM5MjkgMTguMDQ2OEMyOS45Mjc4IDE4LjU4MTYgMzAuMzUyMSAxOS4yMTY2IDMwLjY0MTYgMTkuOTE1NEMzMC45MzEgMjAuNjE0MyAzMS4wOCAyMS4zNjMzIDMxLjA4IDIyLjExOTdDMzEuMDggMjIuODc2MSAzMC45MzEgMjMuNjI1MSAzMC42NDE2IDI0LjMyMzlDMzAuMzUyMSAyNS4wMjI4IDI5LjkyNzggMjUuNjU3OCAyOS4zOTI5IDI2LjE5MjZDMjguODU4MSAyNi43Mjc1IDI4LjIyMzEgMjcuMTUxOCAyNy41MjQzIDI3LjQ0MTJDMjYuODI1NCAyNy43MzA3IDI2LjA3NjQgMjcuODc5NyAyNS4zMiAyNy44Nzk3QzIzLjc5MjQgMjcuODc5NyAyMi4zMjczIDI3LjI3MjggMjEuMjQ3MSAyNi4xOTI2QzIwLjE2NjkgMjUuMTEyNCAxOS41NiAyMy42NDczIDE5LjU2IDIyLjExOTdDMTkuNTYgMjAuNTkyIDIwLjE2NjkgMTkuMTI3IDIxLjI0NzEgMTguMDQ2OEMyMi4zMjczIDE2Ljk2NjUgMjMuNzkyNCAxNi4zNTk3IDI1LjMyIDE2LjM1OTdaTTI4IDMuNTU5NjlWMTQuODc2OEMyNy4xNzc3IDE0LjU4NjYgMjYuMTkyIDE0LjQzODggMjUuMzIgMTQuNDM5N0MyNC4wMzEgMTQuNDM5NyAyMi44MTU3IDE0Ljc1NzEgMjEuNzQ4OCAxNS4zMTg0TDIwLjc5NTIgMTMuMTU5N0wxNi4wMjU5IDIwLjAyNzVMOC40NDU3NiAxNi40NDFMMy41NiAyMy4zOTk3SDE3Ljc0NjJDMTcuOTg2NyAyNC44MjkgMTguNjI4MiAyNi4xNjA2IDE5LjU5NTggMjcuMjM5N0gxVjMuNTU5NjlIMjhaTTI1Ljk2IDI0LjAzOTdIMjQuNjhWMjUuMzE5N0gyNS45NlYyNC4wMzk3Wk0yNS45NiAxOC45MTk3SDI0LjY4VjIzLjM5OTdIMjUuOTZWMTguOTE5N1pNNi4xMiAxMC41OTk3QzYuMTIgMTEuOTk4MSA3LjE5OTA0IDEzLjEwODUgOC42MDc2OCAxMy4xNTg0QzEwLjAyMDggMTMuMjA3NyAxMS4yNCAxMi4wNDggMTEuMjQgMTAuNTk5N0MxMS4yNCA5LjI0NjA5IDEwLjA2NDMgOC4wODU3NyA4Ljc1MjMyIDguMDQwOTdDNy4yOTU2OCA3Ljk5MTY5IDYuMTIgOS4xNTEzNyA2LjEyIDEwLjU5OTdaIiBmaWxsPSIjQkNDNEQwIj48L3BhdGg+Cjwvc3ZnPgo=')
|
|
43
|
+
no-repeat center / 50% 50%;
|
|
42
44
|
position: absolute;
|
|
43
45
|
left: 0;
|
|
44
46
|
top: 0;
|
|
@@ -1,14 +1,26 @@
|
|
|
1
|
-
<scroll-view
|
|
2
|
-
|
|
1
|
+
<scroll-view
|
|
2
|
+
scroll-y
|
|
3
|
+
scroll-with-animation
|
|
4
|
+
lower-threshold="5"
|
|
5
|
+
style="{{style}}"
|
|
6
|
+
class="weda-list-view__containor weda-ui {{className}}"
|
|
7
|
+
>
|
|
3
8
|
<!-- 列表插槽 -->
|
|
4
|
-
<view
|
|
9
|
+
<view
|
|
10
|
+
class="{{template === 'cardList' ? 'weda-list-view-card' : ''}}"
|
|
11
|
+
id="weda-list-view_content"
|
|
12
|
+
>
|
|
5
13
|
<slot></slot>
|
|
6
14
|
</view>
|
|
7
15
|
|
|
8
16
|
<view class="weda-list-view__more {{'weda-list-view__more-' + pagination}}">
|
|
9
17
|
<!-- 加载更多 -->
|
|
10
|
-
<block
|
|
11
|
-
|
|
18
|
+
<block
|
|
19
|
+
wx:if="{{pagination==='loadMoreButton' && pageSize * pageNo < total}}"
|
|
20
|
+
>
|
|
21
|
+
<view class="weda-list-view__more-text" bindtap="handleNext"
|
|
22
|
+
>加载更多</view
|
|
23
|
+
>
|
|
12
24
|
</block>
|
|
13
25
|
<!-- 触底刷新 -->
|
|
14
26
|
<block wx:elif="{{pagination==='bottomLoad'}}">
|
|
@@ -23,18 +35,29 @@
|
|
|
23
35
|
<!-- 分页器 -->
|
|
24
36
|
<block wx:elif="{{pagination==='pagination'}}">
|
|
25
37
|
<view class="weda-list-view__more-pagination">
|
|
26
|
-
<view
|
|
27
|
-
|
|
38
|
+
<view
|
|
39
|
+
class="weda-list-view__pagination-pre {{pageNo > 1 ? 'active': ''}}"
|
|
40
|
+
bindtap="handlePre"
|
|
41
|
+
>
|
|
42
|
+
<image
|
|
43
|
+
class="weda-list-view__pagination-icon"
|
|
44
|
+
src="arrow-right-line.svg"
|
|
45
|
+
/>
|
|
28
46
|
上一页
|
|
29
47
|
</view>
|
|
30
48
|
<view class="weda-list-view__pagination-text">{{pageStr}}</view>
|
|
31
|
-
<view
|
|
32
|
-
|
|
33
|
-
|
|
49
|
+
<view
|
|
50
|
+
class="weda-list-view__pagination-next {{pageSize * pageNo < total ? 'active' : ''}}"
|
|
51
|
+
bindtap="handleNext"
|
|
52
|
+
>
|
|
53
|
+
<image
|
|
54
|
+
class="weda-list-view__pagination-icon"
|
|
55
|
+
src="arrow-right-line.svg"
|
|
56
|
+
/>
|
|
34
57
|
下一页
|
|
35
58
|
</view>
|
|
36
59
|
</view>
|
|
37
60
|
</block>
|
|
38
61
|
<block wx:else></block>
|
|
39
62
|
</view>
|
|
40
|
-
</scroll-view>
|
|
63
|
+
</scroll-view>
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
<view class="weda-lottery">
|
|
2
2
|
<view class="weda-lottery__wrap">
|
|
3
3
|
<block wx:for="{{dotList}}" wx:key="dotIndex" wx:for-item="dot">
|
|
4
|
-
<view
|
|
4
|
+
<view
|
|
5
|
+
wx-if="{{dot.single}}"
|
|
6
|
+
class="weda-lottery__dot-single weda-lottery__dot-{{dot.position}}"
|
|
7
|
+
></view>
|
|
5
8
|
<block wx-if="{{!dot.single}}">
|
|
6
9
|
<view class="weda-lottery__dot-{{dot.position}}">
|
|
7
10
|
<view class="weda-lottery__dot weda-lottery__dot-{{dot.direction}}">
|
|
@@ -16,20 +19,39 @@
|
|
|
16
19
|
<view class="weda-lottery__inner-wrap">
|
|
17
20
|
<view class="weda-lottery__list">
|
|
18
21
|
<block wx:for="{{lotteryList}}" wx:key="index" wx:for-item="item">
|
|
19
|
-
<view
|
|
22
|
+
<view
|
|
23
|
+
key="{{index}}"
|
|
24
|
+
class="weda-lottery__turntable-item {{item.actived ? 'is-actived' : ''}}, {{item.selected ? 'is-selected' : ''}}"
|
|
25
|
+
>
|
|
20
26
|
<view class="weda-lottery__turntable-cell">
|
|
21
|
-
<view
|
|
22
|
-
|
|
27
|
+
<view
|
|
28
|
+
class="weda-lottery__turntable-cell-image"
|
|
29
|
+
wx-if="{{item.src}}"
|
|
30
|
+
>
|
|
31
|
+
<image
|
|
32
|
+
mode="aspectFit"
|
|
33
|
+
src="{{item.src}}"
|
|
34
|
+
alt="{{item.desc}}"
|
|
35
|
+
class="weda-lottery__turntable-cell-icon"
|
|
36
|
+
></image>
|
|
23
37
|
</view>
|
|
24
|
-
<view
|
|
38
|
+
<view
|
|
39
|
+
class="weda-lottery__turntable-cell-desc"
|
|
40
|
+
wx-if="{{item.desc}}"
|
|
41
|
+
>
|
|
25
42
|
{{item.desc}}
|
|
26
43
|
</view>
|
|
27
44
|
</view>
|
|
28
45
|
</view>
|
|
29
46
|
</block>
|
|
30
47
|
</view>
|
|
31
|
-
<view
|
|
32
|
-
|
|
48
|
+
<view
|
|
49
|
+
class="weda-lottery__turntable-btn {{btnActived ? 'is-actived' : ''}}"
|
|
50
|
+
>
|
|
51
|
+
<view
|
|
52
|
+
class="weda-lottery__btn-inner"
|
|
53
|
+
bindtap="{{clickLotteryEnable ? 'clickLotteryButton' : ''}}"
|
|
54
|
+
>
|
|
33
55
|
<view class="weda-lottery__btn">
|
|
34
56
|
<view class="weda-lottery__btn-image">
|
|
35
57
|
<text class="weda-lottery__btn-text">开始抽奖</text>
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
position: relative;
|
|
9
9
|
width: 100%;
|
|
10
10
|
height: 652rpx;
|
|
11
|
-
background: #
|
|
11
|
+
background: #ff465c;
|
|
12
12
|
border: 2rpx solid rgba(255, 255, 255, 0.6);
|
|
13
13
|
box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
|
|
14
14
|
border-radius: 20rpx;
|
|
@@ -57,15 +57,15 @@
|
|
|
57
57
|
height: 18rpx;
|
|
58
58
|
box-shadow: 0px 0px 8rpx rgba(255, 255, 255, 0.3);
|
|
59
59
|
border-radius: 50%;
|
|
60
|
-
background: #
|
|
60
|
+
background: #ffffff;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
.weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(odd) {
|
|
64
|
-
background: #
|
|
64
|
+
background: #ffee52;
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
.weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(even) {
|
|
68
|
-
background: #
|
|
68
|
+
background: #ffffff;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
.weda-lottery .weda-lottery__dot-horizontal .weda-lottery__dot-item {
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
position: relative;
|
|
120
120
|
width: 100%;
|
|
121
121
|
box-sizing: border-box;
|
|
122
|
-
background: linear-gradient(180deg, #
|
|
122
|
+
background: linear-gradient(180deg, #dd0d00 0%, #d80027 100%);
|
|
123
123
|
border: 2rpx solid rgba(255, 255, 255, 0.25);
|
|
124
124
|
box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
|
|
125
125
|
border-radius: 20rpx;
|
|
@@ -142,20 +142,20 @@
|
|
|
142
142
|
height: calc((100% - 64rpx) / 3);
|
|
143
143
|
font-size: 0;
|
|
144
144
|
text-align: center;
|
|
145
|
-
background: #
|
|
146
|
-
box-shadow: inset 0px -4rpx 0px #
|
|
145
|
+
background: #fff8ee;
|
|
146
|
+
box-shadow: inset 0px -4rpx 0px #ffddbd;
|
|
147
147
|
border-radius: 16rpx;
|
|
148
148
|
box-sizing: border-box;
|
|
149
149
|
}
|
|
150
150
|
|
|
151
151
|
.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-actived {
|
|
152
|
-
background: #
|
|
153
|
-
box-shadow: 0px 0px 12rpx #
|
|
152
|
+
background: #fff8ee;
|
|
153
|
+
box-shadow: 0px 0px 12rpx #ffffff;
|
|
154
154
|
}
|
|
155
155
|
|
|
156
156
|
.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-selected {
|
|
157
|
-
background: #
|
|
158
|
-
box-shadow: inset 0px -4rpx 0px #
|
|
157
|
+
background: #ff6666;
|
|
158
|
+
box-shadow: inset 0px -4rpx 0px #ffa4a4;
|
|
159
159
|
}
|
|
160
160
|
|
|
161
161
|
.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:first-child {
|
|
@@ -215,8 +215,11 @@
|
|
|
215
215
|
padding: 16rpx 5rpx 16rpx 5rpx;
|
|
216
216
|
}
|
|
217
217
|
|
|
218
|
-
.weda-lottery
|
|
219
|
-
|
|
218
|
+
.weda-lottery
|
|
219
|
+
.weda-lottery__inner
|
|
220
|
+
.weda-lottery__turntable-item.is-actived
|
|
221
|
+
.weda-lottery__turntable-cell {
|
|
222
|
+
border-color: #ffe05f;
|
|
220
223
|
}
|
|
221
224
|
|
|
222
225
|
.weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell-image {
|
|
@@ -238,15 +241,18 @@
|
|
|
238
241
|
font-size: 24rpx;
|
|
239
242
|
line-height: 34rpx;
|
|
240
243
|
text-align: center;
|
|
241
|
-
color: #
|
|
244
|
+
color: #ba0000;
|
|
242
245
|
white-space: nowrap;
|
|
243
246
|
text-overflow: ellipsis;
|
|
244
247
|
overflow: hidden;
|
|
245
248
|
width: 100%;
|
|
246
249
|
}
|
|
247
250
|
|
|
248
|
-
.weda-lottery
|
|
249
|
-
|
|
251
|
+
.weda-lottery
|
|
252
|
+
.weda-lottery__inner
|
|
253
|
+
.weda-lottery__turntable-item.is-selected
|
|
254
|
+
.weda-lottery__turntable-cell-desc {
|
|
255
|
+
color: #ffffff;
|
|
250
256
|
}
|
|
251
257
|
|
|
252
258
|
.weda-lottery .weda-lottery__turntable-btn {
|
|
@@ -256,14 +262,14 @@
|
|
|
256
262
|
height: calc((100% - 64rpx) / 3);
|
|
257
263
|
top: calc((100% - 64rpx) / 3 + 32rpx);
|
|
258
264
|
left: calc((100% - 64rpx) / 3 + 32rpx);
|
|
259
|
-
background: linear-gradient(180deg, #
|
|
260
|
-
box-shadow: inset 0px -4rpx 0px #
|
|
265
|
+
background: linear-gradient(180deg, #ffee81 0%, #ffd646 100%);
|
|
266
|
+
box-shadow: inset 0px -4rpx 0px #ff7a00;
|
|
261
267
|
border-radius: 50%;
|
|
262
268
|
}
|
|
263
269
|
|
|
264
270
|
.weda-lottery .weda-lottery__turntable-btn.is-actived {
|
|
265
|
-
background: linear-gradient(180deg, #
|
|
266
|
-
box-shadow: inset 0px 4rpx 0px #
|
|
271
|
+
background: linear-gradient(180deg, #ffee81 0%, #ffd646 100%);
|
|
272
|
+
box-shadow: inset 0px 4rpx 0px #ffffff;
|
|
267
273
|
}
|
|
268
274
|
|
|
269
275
|
.weda-lottery .weda-lottery__btn-inner {
|
|
@@ -276,7 +282,7 @@
|
|
|
276
282
|
.weda-lottery .weda-lottery__btn {
|
|
277
283
|
width: 100%;
|
|
278
284
|
height: 100%;
|
|
279
|
-
background: linear-gradient(180deg, #
|
|
285
|
+
background: linear-gradient(180deg, #ff922d 0%, #ff3c76 100%);
|
|
280
286
|
box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
|
|
281
287
|
border-radius: 50%;
|
|
282
288
|
display: flex;
|
|
@@ -285,7 +291,7 @@
|
|
|
285
291
|
}
|
|
286
292
|
|
|
287
293
|
.weda-lottery .weda-lottery__turntable-btn.is-actived .weda-lottery__btn {
|
|
288
|
-
background: linear-gradient(180deg, #
|
|
294
|
+
background: linear-gradient(180deg, #ff922d 0%, #ff3c76 100%);
|
|
289
295
|
box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
|
|
290
296
|
}
|
|
291
297
|
|
|
@@ -295,13 +301,13 @@
|
|
|
295
301
|
box-sizing: border-box;
|
|
296
302
|
}
|
|
297
303
|
|
|
298
|
-
.weda-lottery .weda-lottery__btn-image
|
|
304
|
+
.weda-lottery .weda-lottery__btn-image .weda-lottery__btn-text {
|
|
299
305
|
font-weight: 600;
|
|
300
306
|
font-size: 18px;
|
|
301
307
|
line-height: 22px;
|
|
302
308
|
text-align: center;
|
|
303
|
-
color: #
|
|
304
|
-
text-shadow: 0px 0.5px 0px #
|
|
309
|
+
color: #ffffff;
|
|
310
|
+
text-shadow: 0px 0.5px 0px #e42b27;
|
|
305
311
|
max-height: 100%;
|
|
306
312
|
display: -webkit-box;
|
|
307
313
|
overflow: hidden;
|