Ver Código Fonte

修复轮播在android小米手机样式问题,轮播中间停止问题,优化表单与列表展示

guohh 8 anos atrás
pai
commit
82c4e63bb5

+ 65 - 6
demo/newform.html

@ -19,13 +19,15 @@
19 19
    </div>
20 20
    <div class="ui-col">
21 21
        <section id="form">
22
            <br>
22
            <div class="demo-desc">
23
                表单输入
24
            </div>
23 25
            <div class="ui-list ui-list-form">
24 26
                <ul>
25 27
                    <li class="ui-list-item">
26 28
                        <div class="ui-list-item-inner">
27 29
                            <div class="ui-list-item-label">
28
                                用户名
30
                                用户名
29 31
                            </div>
30 32
                            <div class="ui-list-item-input-wrap">
31 33
                                <input class="ui-list-item-input" type="text"  placeholder="请输入用户名">
@ -35,7 +37,7 @@
35 37
                    <li class="ui-list-item">
36 38
                        <div class="ui-list-item-inner">
37 39
                            <div class="ui-list-item-label">
38
                                密码
40
                                密码
39 41
                            </div>
40 42
                            <div class="ui-list-item-input-wrap">
41 43
                                <input class="ui-list-item-input" type="password" placeholder="请输入密码">
@ -45,7 +47,7 @@
45 47
                    <li class="ui-list-item">
46 48
                        <div class="ui-list-item-inner">
47 49
                            <div class="ui-list-item-label">
48
                                性别
50
                                性别
49 51
                            </div>
50 52
                            <div class="ui-list-item-input-wrap">
51 53
                                <input class="ui-list-item-input" type="text"  placeholder="性别">
@ -55,7 +57,7 @@
55 57
                    <li class="ui-list-item">
56 58
                        <div class="ui-list-item-inner">
57 59
                            <div class="ui-list-item-label">
58
                                开关
60
                                开关
59 61
                            </div>
60 62
                            <div class="ui-list-item-input-wrap">
61 63
                                <label class="ui-switch">
@ -67,7 +69,7 @@
67 69
                    <li class="ui-list-item">
68 70
                        <div class="ui-list-item-inner">
69 71
                            <div class="ui-list-item-label">
70
                                内容输入
72
                                内容输入
71 73
                            </div>
72 74
                            <div class="ui-list-item-input-wrap">
73 75
                               <textarea class="ui-list-item-textarea" placeholder="文本内容"></textarea>
@ -76,6 +78,63 @@
76 78
                    </li>
77 79
                </ul>
78 80
            </div>
81
            <div class="demo-desc">
82
                表单展示
83
            </div>
84
            <div class="ui-list ui-list-form">
85
                <ul>
86
                    <li class="ui-list-item">
87
                        <div class="ui-list-item-inner">
88
                            <div class="ui-list-item-label">
89
                                用户名
90
                            </div>
91
                            <div class="ui-list-item-input-wrap">
92
                                光头强
93
                            </div>
94
                        </div>
95
                    </li>
96
                    <li class="ui-list-item">
97
                        <div class="ui-list-item-inner">
98
                            <div class="ui-list-item-label">
99
                                密码
100
                            </div>
101
                            <div class="ui-list-item-input-wrap">
102
                                12345678
103
                            </div>
104
                        </div>
105
                    </li>
106
                    <li class="ui-list-item">
107
                        <div class="ui-list-item-inner">
108
                            <div class="ui-list-item-label">
109
                                性别
110
                            </div>
111
                            <div class="ui-list-item-input-wrap">
112
113
                            </div>
114
                        </div>
115
                    </li>
116
                    <li class="ui-list-item">
117
                        <div class="ui-list-item-inner">
118
                            <div class="ui-list-item-label">
119
                                开关
120
                            </div>
121
                            <div class="ui-list-item-input-wrap">
122
123
                            </div>
124
                        </div>
125
                    </li>
126
                    <li class="ui-list-item">
127
                        <div class="ui-list-item-inner">
128
                            <div class="ui-list-item-label">
129
                                内容输入
130
                            </div>
131
                            <div class="ui-list-item-input-wrap">
132
                                用户输入的文本内容用户输入的文本内容用户输入的文本内容用户输入的文本内容用户输入的文本内容
133
                            </div>
134
                        </div>
135
                    </li>
136
                </ul>
137
            </div>
79 138
        </section>
80 139
    </div>
81 140

+ 28 - 20
demo/static/view/list.html

@ -129,11 +129,13 @@
129 129
                                <img src="../../img/01.jpg" alt="" />
130 130
                            </div>
131 131
                            <div class="ui-list-item-inner">
132
                                <div class="ui-list-item-title">
133
                                    列表项
134
                                </div>
135
                                <div class="ui-list-item-after">
136
                                    标签
132
                                <div class="ui-list-item-title-row">
133
                                    <div class="ui-list-item-title">
134
                                        列表项
135
                                    </div>
136
                                    <div class="ui-list-item-after">
137
                                        标签
138
                                    </div>
137 139
                                </div>
138 140
                            </div>
139 141
                        </a>
@ -144,11 +146,13 @@
144 146
                                <img src="../../img/01.jpg" alt="" />
145 147
                            </div>
146 148
                            <div class="ui-list-item-inner">
147
                                <div class="ui-list-item-title">
148
                                    列表项
149
                                </div>
150
                                <div class="ui-list-item-after">
151
                                    标签
149
                                <div class="ui-list-item-title-row">
150
                                    <div class="ui-list-item-title">
151
                                        列表项
152
                                    </div>
153
                                    <div class="ui-list-item-after">
154
                                        标签
155
                                    </div>
152 156
                                </div>
153 157
                            </div>
154 158
                        </a>
@ -159,11 +163,13 @@
159 163
                                <img src="../../img/01.jpg" alt="" />
160 164
                            </div>
161 165
                            <div class="ui-list-item-inner">
162
                                <div class="ui-list-item-title">
163
                                    列表项
164
                                </div>
165
                                <div class="ui-list-item-after">
166
                                    标签
166
                                <div class="ui-list-item-title-row">
167
                                    <div class="ui-list-item-title">
168
                                        列表项
169
                                    </div>
170
                                    <div class="ui-list-item-after">
171
                                        标签
172
                                    </div>
167 173
                                </div>
168 174
                            </div>
169 175
                        </a>
@ -174,11 +180,13 @@
174 180
                                <img src="../../img/01.jpg" alt="" />
175 181
                            </div>
176 182
                            <div class="ui-list-item-inner">
177
                                <div class="ui-list-item-title">
178
                                    列表项
179
                                </div>
180
                                <div class="ui-list-item-after">
181
                                    标签
183
                                <div class="ui-list-item-title-row">
184
                                    <div class="ui-list-item-title">
185
                                        列表项
186
                                    </div>
187
                                    <div class="ui-list-item-after">
188
                                        标签
189
                                    </div>
182 190
                                </div>
183 191
                            </div>
184 192
                        </a>

+ 4 - 4
src/js/hammerCarousel.js

@ -6,14 +6,14 @@
6 6
// 理想是移除carousel.js的实现,用hammerCarousel.js实现所有相关功能
7 7
8 8
(function (ipu, $, Hammer) {
9
    function Carousel(navSlt, options) {
9
    function HammerCarousel(navSlt, options) {
10 10
        this.options = options = $.extend({}, this.defaultOptions, options);
11 11
        this.el = $(navSlt).get(0);
12 12
        this._init();
13 13
    }
14 14
15 15
    // 直接替换掉了prototype对象,可能不是个好选择
16
    Carousel.prototype = {
16
    HammerCarousel.prototype = {
17 17
        defaultOptions: {
18 18
            index: null,        // 默认显示第几个项,其实挺没用的,默认显示第一个,用户再调用一下显示第几个,作用一样现在。
19 19
            autoPlay: false,    // 是否自动轮播
@ -208,13 +208,13 @@
208 208
                    index = this.size;
209 209
                }
210 210
                this._show(index);
211
            } else {
211
            } else if (ev.type == 'panmove'){
212 212
                this.move(delta);
213 213
            }
214 214
        }
215 215
    };
216 216
217 217
    ipu.hammerCarousel = function (slt, options) {
218
        return new Carousel(slt, options);
218
        return new HammerCarousel(slt, options);
219 219
    };
220 220
})(ipu || window, jQuery,  Hammer);

+ 1 - 1
src/sass/ipu/base/mixin.scss

@ -164,7 +164,7 @@
164 164
    display: -webkit-flex;
165 165
    display: flex;
166 166
}
167
// 子项空间分配比率
167
// 子项空间分配比率,理论上基础尺寸应该为0,如宽度或高度为0
168 168
@mixin flex-grow($growNum){
169 169
    -webkit-box-flex: $growNum;
170 170
    -webkit-flex-grow: $growNum;

+ 0 - 1
src/sass/ipu/carousel.scss

@ -42,7 +42,6 @@
42 42
        position: relative;
43 43
        display: inline-block;
44 44
        width: 100%;
45
        height: 100%;
46 45
        font-size:$fs-m;
47 46
        vertical-align: top;
48 47
        white-space: normal;

+ 3 - 0
src/sass/ipu/layout/list.scss

@ -64,6 +64,7 @@
64 64
    @include flex-grow(1);
65 65
    @include flex();
66 66
    font-size: .17rem;
67
    width: 0;
67 68
}
68 69
.ui-list-item-media{
69 70
    padding: $ptb-item-media 0;
@ -92,9 +93,11 @@
92 93
.ui-list-form{
93 94
    .ui-list-item-label{
94 95
        width: 35%;
96
        color:#666;
95 97
    }
96 98
    .ui-list-item-input-wrap{
97 99
        @include flex-grow(1);
100
        width: 0%;
98 101
        .ui-list-item-input, .ui-list-item-textarea{
99 102
            display: block;
100 103
            box-sizing: border-box;