xiaoe_mp_npm 1.0.44-ham7 → 1.0.44-ham8
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/miniprogram_dist/CustomPopup/index.js +4 -0
- package/miniprogram_dist/CustomPopup/index.wxml +1 -1
- package/miniprogram_dist/LiveGoodsList/index.scss +1 -1
- package/miniprogram_dist/LiveGoodsList/index.wxml +2 -0
- package/miniprogram_dist/LiveGoodsList/index.wxss +4 -4
- package/package.json +1 -1
- package/src/CustomPopup/index.js +4 -0
- package/src/CustomPopup/index.wxml +1 -1
- package/src/LiveGoodsList/index.scss +1 -1
- package/src/LiveGoodsList/index.wxml +1 -0
- package/src/LiveGoodsList/index.wxss +1 -1
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
>
|
|
23
23
|
<slot name="header"></slot>
|
|
24
24
|
</view>
|
|
25
|
-
<view class="popup-cont" style="{{popPosition == 'right' ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
|
|
25
|
+
<view class="popup-cont" style="{{popPosition == 'right' && !isLottery ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
|
|
26
26
|
<slot name="content"></slot>
|
|
27
27
|
</view>
|
|
28
28
|
<view class="popup-bottom" wx:if="{{ hasBottom }}">
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
popPosition="{{ popPosition }}"
|
|
17
17
|
round="{{ round }}"
|
|
18
18
|
customStyle="{{ customStyle }}"
|
|
19
|
+
isLottery="{{isLottery}}"
|
|
19
20
|
bind:onClose="closePop"
|
|
20
21
|
overlay="{{popPosition === 'bottom' && !overlayStyle ? false : true}}"
|
|
21
22
|
overlay-style="{{ overlayStyle }}"
|
|
@@ -41,6 +42,7 @@
|
|
|
41
42
|
src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/l1d6b73w077u.png"
|
|
42
43
|
/>
|
|
43
44
|
<image
|
|
45
|
+
wx:if="{{popPosition === 'bottom'}}"
|
|
44
46
|
class="close-icon"
|
|
45
47
|
src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/l28nnfrg0yvh.png"
|
|
46
48
|
catch:tap="closePop"
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
}
|
|
33
33
|
.goods-list-box .goods-list-box-popup-header .close-icon {
|
|
34
34
|
position: absolute;
|
|
35
|
-
top:
|
|
35
|
+
top: 20.26667vmin;
|
|
36
36
|
right: -1.33333vmin;
|
|
37
37
|
z-index: 1;
|
|
38
38
|
box-sizing: border-box;
|
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
}
|
|
122
122
|
.goods-list-box .goods-list-box-popup-header .close-icon {
|
|
123
123
|
position: absolute;
|
|
124
|
-
top:
|
|
124
|
+
top: 9.89583vmin;
|
|
125
125
|
right: -0.65104vmin;
|
|
126
126
|
z-index: 1;
|
|
127
127
|
box-sizing: border-box;
|
|
@@ -211,7 +211,7 @@
|
|
|
211
211
|
}
|
|
212
212
|
.goods-list-box .goods-list-box-popup-header .close-icon {
|
|
213
213
|
position: absolute;
|
|
214
|
-
top:
|
|
214
|
+
top: 12.06349vmin;
|
|
215
215
|
right: -0.79365vmin;
|
|
216
216
|
z-index: 1;
|
|
217
217
|
box-sizing: border-box;
|
|
@@ -301,7 +301,7 @@
|
|
|
301
301
|
}
|
|
302
302
|
.goods-list-box .goods-list-box-popup-header .close-icon {
|
|
303
303
|
position: absolute;
|
|
304
|
-
top:
|
|
304
|
+
top: 9.89583vmin;
|
|
305
305
|
right: -0.65104vmin;
|
|
306
306
|
z-index: 1;
|
|
307
307
|
box-sizing: border-box;
|
package/package.json
CHANGED
package/src/CustomPopup/index.js
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
>
|
|
23
23
|
<slot name="header"></slot>
|
|
24
24
|
</view>
|
|
25
|
-
<view class="popup-cont" style="{{popPosition == 'right' ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
|
|
25
|
+
<view class="popup-cont" style="{{popPosition == 'right' && !isLottery ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}">
|
|
26
26
|
<slot name="content"></slot>
|
|
27
27
|
</view>
|
|
28
28
|
<view class="popup-bottom" wx:if="{{ hasBottom }}">
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.goods-list-box .goods-list-box-popup{width:100vmin}.goods-list-box .box{margin:0 1.6vmin}.goods-list-box .title{margin:0;padding:4.26667vmin 2.13333vmin 2.13333vmin;color:rgba(69,90,100,0.6);font-weight:normal;font-size:2.4vmin;line-height:2.66667vmin;text-align:center}.goods-list-box .goods-list-box-popup-header{position:relative;display:flex;flex-direction:column;align-items:center;padding-top:16vmin}.goods-list-box .goods-list-box-popup-header .goods-list-box-popup-header-bg{box-sizing:border-box;width:70.66667vmin;height:17.06667vmin}.goods-list-box .goods-list-box-popup-header .lottery-title{margin-bottom:2.66667vmin;font-size:3.73333vmin;color:#fff}.goods-list-box .goods-list-box-popup-header .close-icon{position:absolute;top:
|
|
1
|
+
.goods-list-box .goods-list-box-popup{width:100vmin}.goods-list-box .box{margin:0 1.6vmin}.goods-list-box .title{margin:0;padding:4.26667vmin 2.13333vmin 2.13333vmin;color:rgba(69,90,100,0.6);font-weight:normal;font-size:2.4vmin;line-height:2.66667vmin;text-align:center}.goods-list-box .goods-list-box-popup-header{position:relative;display:flex;flex-direction:column;align-items:center;padding-top:16vmin}.goods-list-box .goods-list-box-popup-header .goods-list-box-popup-header-bg{box-sizing:border-box;width:70.66667vmin;height:17.06667vmin}.goods-list-box .goods-list-box-popup-header .lottery-title{margin-bottom:2.66667vmin;font-size:3.73333vmin;color:#fff}.goods-list-box .goods-list-box-popup-header .close-icon{position:absolute;top:20.26667vmin;right:-1.33333vmin;z-index:1;box-sizing:border-box;padding:1.33333vmin;width:6.93333vmin;height:6.93333vmin}.goods-list-box .btn{display:block;width:100%;margin:1.33333vmin 0;background-color:#fff}.goods-list-box .page-main{height:100%}.goods-list-box .goods-list{box-sizing:border-box;min-height:40vmin;display:flex;flex-direction:column;height:100%}.goods-list-box .goods-list .finished-text{display:flex;justify-content:center;color:#999;font-size:3.73333vmin;padding-bottom:2.66667vmin}.goods-list-box .goods-list .no-data{display:flex;flex-direction:column;align-items:center;padding-top:10.66667vmin}.goods-list-box .goods-list .no-data .no-data-png{width:23.46667vmin;height:23.46667vmin}.goods-list-box .goods-list .no-data .no-data-text{color:#999999;font-size:3.73333vmin;margin-top:4.26667vmin}.goods-list-box .lottery-list{padding:0 2.13333vmin}.goods-list-box .lottery-list .goods-list{background:#fff;height:calc(100% - 26.66667vmin);border-radius:2.13333vmin}@media screen and (min-width: 768px) and (orientation: portrait){.goods-list-box .goods-list-box-popup{width:48.82812vmin}.goods-list-box .box{margin:0 .78125vmin}.goods-list-box .title{margin:0;padding:2.08333vmin 1.04167vmin 1.04167vmin;color:rgba(69,90,100,0.6);font-weight:normal;font-size:1.17188vmin;line-height:1.30208vmin;text-align:center}.goods-list-box .goods-list-box-popup-header{position:relative;display:flex;flex-direction:column;align-items:center;padding-top:7.8125vmin}.goods-list-box .goods-list-box-popup-header .goods-list-box-popup-header-bg{box-sizing:border-box;width:34.50521vmin;height:8.33333vmin}.goods-list-box .goods-list-box-popup-header .lottery-title{margin-bottom:1.30208vmin;font-size:1.82292vmin;color:#fff}.goods-list-box .goods-list-box-popup-header .close-icon{position:absolute;top:9.89583vmin;right:-.65104vmin;z-index:1;box-sizing:border-box;padding:.65104vmin;width:3.38542vmin;height:3.38542vmin}.goods-list-box .btn{display:block;width:100%;margin:.65104vmin 0;background-color:#fff}.goods-list-box .page-main{height:100%}.goods-list-box .goods-list{box-sizing:border-box;min-height:40vmin;display:flex;flex-direction:column;height:100%}.goods-list-box .goods-list .finished-text{display:flex;justify-content:center;color:#999;font-size:1.82292vmin;padding-bottom:1.30208vmin}.goods-list-box .goods-list .no-data{display:flex;flex-direction:column;align-items:center;padding-top:5.20833vmin}.goods-list-box .goods-list .no-data .no-data-png{width:11.45833vmin;height:11.45833vmin}.goods-list-box .goods-list .no-data .no-data-text{color:#999999;font-size:1.82292vmin;margin-top:2.08333vmin}.goods-list-box .lottery-list{padding:0 1.04167vmin}.goods-list-box .lottery-list .goods-list{background:#fff;height:calc(100% - 13.02083vmin);border-radius:1.04167vmin}}@media screen and (min-height: 630px) and (orientation: landscape){.goods-list-box .goods-list-box-popup{width:59.52381vmin}.goods-list-box .box{margin:0 .95238vmin}.goods-list-box .title{margin:0;padding:2.53968vmin 1.26984vmin 1.26984vmin;color:rgba(69,90,100,0.6);font-weight:normal;font-size:1.42857vmin;line-height:1.5873vmin;text-align:center}.goods-list-box .goods-list-box-popup-header{position:relative;display:flex;flex-direction:column;align-items:center;padding-top:9.52381vmin}.goods-list-box .goods-list-box-popup-header .goods-list-box-popup-header-bg{box-sizing:border-box;width:42.06349vmin;height:10.15873vmin}.goods-list-box .goods-list-box-popup-header .lottery-title{margin-bottom:1.5873vmin;font-size:2.22222vmin;color:#fff}.goods-list-box .goods-list-box-popup-header .close-icon{position:absolute;top:12.06349vmin;right:-.79365vmin;z-index:1;box-sizing:border-box;padding:.79365vmin;width:4.12698vmin;height:4.12698vmin}.goods-list-box .btn{display:block;width:100%;margin:.79365vmin 0;background-color:#fff}.goods-list-box .page-main{height:100%}.goods-list-box .goods-list{box-sizing:border-box;min-height:40vmin;display:flex;flex-direction:column;height:100%}.goods-list-box .goods-list .finished-text{display:flex;justify-content:center;color:#999;font-size:2.22222vmin;padding-bottom:1.5873vmin}.goods-list-box .goods-list .no-data{display:flex;flex-direction:column;align-items:center;padding-top:6.34921vmin}.goods-list-box .goods-list .no-data .no-data-png{width:13.96825vmin;height:13.96825vmin}.goods-list-box .goods-list .no-data .no-data-text{color:#999999;font-size:2.22222vmin;margin-top:2.53968vmin}.goods-list-box .lottery-list{padding:0 1.26984vmin}.goods-list-box .lottery-list .goods-list{background:#fff;height:calc(100% - 15.87302vmin);border-radius:1.26984vmin}}@media screen and (min-height: 768px) and (orientation: landscape){.goods-list-box .goods-list-box-popup{width:48.82812vmin}.goods-list-box .box{margin:0 .78125vmin}.goods-list-box .title{margin:0;padding:2.08333vmin 1.04167vmin 1.04167vmin;color:rgba(69,90,100,0.6);font-weight:normal;font-size:1.17188vmin;line-height:1.30208vmin;text-align:center}.goods-list-box .goods-list-box-popup-header{position:relative;display:flex;flex-direction:column;align-items:center;padding-top:7.8125vmin}.goods-list-box .goods-list-box-popup-header .goods-list-box-popup-header-bg{box-sizing:border-box;width:34.50521vmin;height:8.33333vmin}.goods-list-box .goods-list-box-popup-header .lottery-title{margin-bottom:1.30208vmin;font-size:1.82292vmin;color:#fff}.goods-list-box .goods-list-box-popup-header .close-icon{position:absolute;top:9.89583vmin;right:-.65104vmin;z-index:1;box-sizing:border-box;padding:.65104vmin;width:3.38542vmin;height:3.38542vmin}.goods-list-box .btn{display:block;width:100%;margin:.65104vmin 0;background-color:#fff}.goods-list-box .page-main{height:100%}.goods-list-box .goods-list{box-sizing:border-box;min-height:40vmin;display:flex;flex-direction:column;height:100%}.goods-list-box .goods-list .finished-text{display:flex;justify-content:center;color:#999;font-size:1.82292vmin;padding-bottom:1.30208vmin}.goods-list-box .goods-list .no-data{display:flex;flex-direction:column;align-items:center;padding-top:5.20833vmin}.goods-list-box .goods-list .no-data .no-data-png{width:11.45833vmin;height:11.45833vmin}.goods-list-box .goods-list .no-data .no-data-text{color:#999999;font-size:1.82292vmin;margin-top:2.08333vmin}.goods-list-box .lottery-list{padding:0 1.04167vmin}.goods-list-box .lottery-list .goods-list{background:#fff;height:calc(100% - 13.02083vmin);border-radius:1.04167vmin}}
|