Commit 8aa940c27089d89145c9c337cf6c2d2247b768fd
1 parent
9ceb510d
Modify collection_shop static source && new interact.
Showing
3 changed files
with
179 additions
and
15 deletions
2.0/collect_shop.html
@@ -18,12 +18,12 @@ | @@ -18,12 +18,12 @@ | ||
18 | <script type="text/javascript" src="http://static.nong12.com/static/newStatic/common/js/base/jquery-2.1.3.min.js"></script> | 18 | <script type="text/javascript" src="http://static.nong12.com/static/newStatic/common/js/base/jquery-2.1.3.min.js"></script> |
19 | </head> | 19 | </head> |
20 | <body> | 20 | <body> |
21 | - <div class="m-page" id="collection"> | 21 | + <div class="m-page panel-open" id="collection"> |
22 | <header class="m-header header-light"> | 22 | <header class="m-header header-light"> |
23 | <div class="head"> | 23 | <div class="head"> |
24 | <a href="javascript:history.go(-1);" class="lt-bar"><i class="m-icon icon-back"></i></a> | 24 | <a href="javascript:history.go(-1);" class="lt-bar"><i class="m-icon icon-back"></i></a> |
25 | <h1>我的收藏</h1> | 25 | <h1>我的收藏</h1> |
26 | - <span class="rt-bar text">编辑</span> | 26 | + <span class="rt-bar text edit-btn">编辑</span> |
27 | </div> | 27 | </div> |
28 | </header> | 28 | </header> |
29 | <div class="content"> | 29 | <div class="content"> |
@@ -39,7 +39,12 @@ | @@ -39,7 +39,12 @@ | ||
39 | <div class="collection-lists supply-list inlist" id="insale"> | 39 | <div class="collection-lists supply-list inlist" id="insale"> |
40 | <ul class="m-table-view"> | 40 | <ul class="m-table-view"> |
41 | <li class="cell"> | 41 | <li class="cell"> |
42 | - <a href="#"> | 42 | + <div class="cellin"> |
43 | + <label class="labchk"> | ||
44 | + 选择 | ||
45 | + <input type="checkbox" class="m-radio"/> | ||
46 | + </label> | ||
47 | + <a href="#" class="display-block"> | ||
43 | <div class="orso"> | 48 | <div class="orso"> |
44 | <span class="title">山东白萝卜</span> | 49 | <span class="title">山东白萝卜</span> |
45 | <span class="right price">0.7元/斤</span> | 50 | <span class="right price">0.7元/斤</span> |
@@ -50,6 +55,7 @@ | @@ -50,6 +55,7 @@ | ||
50 | <span class="right">2015-03-04</span> | 55 | <span class="right">2015-03-04</span> |
51 | </div> | 56 | </div> |
52 | </a> | 57 | </a> |
58 | + </div> | ||
53 | </li> | 59 | </li> |
54 | </ul> | 60 | </ul> |
55 | </div> | 61 | </div> |
@@ -63,6 +69,11 @@ | @@ -63,6 +69,11 @@ | ||
63 | <div id="goods" class="goodlist"> | 69 | <div id="goods" class="goodlist"> |
64 | <ul class="m-table-view"> | 70 | <ul class="m-table-view"> |
65 | <li class="cell cell-extend-pic"> | 71 | <li class="cell cell-extend-pic"> |
72 | + <div class="cellin"> | ||
73 | + <label class="labchk"> | ||
74 | + 选择 | ||
75 | + <input type="checkbox" class="m-radio"> | ||
76 | + </label> | ||
66 | <a class="display-block" href="#"> | 77 | <a class="display-block" href="#"> |
67 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> | 78 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> |
68 | <h3 class="title"> | 79 | <h3 class="title"> |
@@ -79,6 +90,7 @@ | @@ -79,6 +90,7 @@ | ||
79 | 辽宁沈阳地利批发市场五号厅 | 90 | 辽宁沈阳地利批发市场五号厅 |
80 | </p> | 91 | </p> |
81 | </a> | 92 | </a> |
93 | + </div> | ||
82 | </li> | 94 | </li> |
83 | </ul> | 95 | </ul> |
84 | 96 | ||
@@ -87,6 +99,11 @@ | @@ -87,6 +99,11 @@ | ||
87 | <div id="shops" class="shoplist"> | 99 | <div id="shops" class="shoplist"> |
88 | <ul class="m-table-view"> | 100 | <ul class="m-table-view"> |
89 | <li class="cell cell-extend-pic"> | 101 | <li class="cell cell-extend-pic"> |
102 | + <div class="cellin"> | ||
103 | + <label class="labchk"> | ||
104 | + 选择 | ||
105 | + <input type="checkbox" class="m-radio"> | ||
106 | + </label> | ||
90 | <a class="display-block" href="#"> | 107 | <a class="display-block" href="#"> |
91 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> | 108 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> |
92 | <h3 class="title"> | 109 | <h3 class="title"> |
@@ -108,8 +125,14 @@ | @@ -108,8 +125,14 @@ | ||
108 | <p class="text from-label">产地直供</p> | 125 | <p class="text from-label">产地直供</p> |
109 | <i class="m-icon icon-sdrz store-label"></i> | 126 | <i class="m-icon icon-sdrz store-label"></i> |
110 | </a> | 127 | </a> |
128 | + </div> | ||
111 | </li> | 129 | </li> |
112 | <li class="cell cell-extend-pic"> | 130 | <li class="cell cell-extend-pic"> |
131 | + <div class="cellin"> | ||
132 | + <label class="labchk"> | ||
133 | + 选择 | ||
134 | + <input type="checkbox" class="m-radio"> | ||
135 | + </label> | ||
113 | <a class="display-block" href="#"> | 136 | <a class="display-block" href="#"> |
114 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> | 137 | <img src="http://img7.nong12.com/images/i3/e5f60bde9834492bab6c98f169ba4aad.jpeg" width="80" height="80" alt="" class="pic"> |
115 | <h3 class="title"> | 138 | <h3 class="title"> |
@@ -131,6 +154,7 @@ | @@ -131,6 +154,7 @@ | ||
131 | <p class="text from-label">产地直供</p> | 154 | <p class="text from-label">产地直供</p> |
132 | <i class="m-icon icon-sxsj store-label"></i> | 155 | <i class="m-icon icon-sxsj store-label"></i> |
133 | </a> | 156 | </a> |
157 | + </div> | ||
134 | </li> | 158 | </li> |
135 | </ul> | 159 | </ul> |
136 | </div> | 160 | </div> |
@@ -146,6 +170,10 @@ | @@ -146,6 +170,10 @@ | ||
146 | <!--</ul>--> | 170 | <!--</ul>--> |
147 | <!--</div>--> | 171 | <!--</div>--> |
148 | </div> | 172 | </div> |
173 | + <footer class="m-footer border-1px border-top"> | ||
174 | + <a href="#" class="m-btn btn-large">取消</a> | ||
175 | + <a href="#" class="m-btn btn-danger btn-large">立即删除</a> | ||
176 | + </footer> | ||
149 | </div> | 177 | </div> |
150 | </body> | 178 | </body> |
151 | </html> | 179 | </html> |
css/style/collection.css
@@ -79,16 +79,33 @@ | @@ -79,16 +79,33 @@ | ||
79 | width: 20%; | 79 | width: 20%; |
80 | padding: 0px; | 80 | padding: 0px; |
81 | } | 81 | } |
82 | +#collection .m-table-view { | ||
83 | + background-color: transparent; | ||
84 | +} | ||
85 | +#collection .m-table-view .cell { | ||
86 | + background-color: transparent; | ||
87 | + overflow: visible; | ||
88 | + border: 0; | ||
89 | + padding: 0; | ||
90 | +} | ||
91 | +#collection .m-table-view .cell .cellin { | ||
92 | + border: 1px solid #ddd; | ||
93 | + background-color: #fff; | ||
94 | + padding: 10px; | ||
95 | +} | ||
82 | #collection .m-table-view .cell-extend-pic { | 96 | #collection .m-table-view .cell-extend-pic { |
97 | + padding: 0; | ||
98 | +} | ||
99 | +#collection .m-table-view .cell-extend-pic .cellin { | ||
83 | padding: 15px 56px; | 100 | padding: 15px 56px; |
84 | padding-left: 95px; | 101 | padding-left: 95px; |
85 | } | 102 | } |
86 | -#collection .m-table-view .cell-extend-pic .pic { | 103 | +#collection .m-table-view .cell-extend-pic .cellin .pic { |
87 | width: 80px; | 104 | width: 80px; |
88 | height: 80px; | 105 | height: 80px; |
89 | margin-left: -90px; | 106 | margin-left: -90px; |
90 | } | 107 | } |
91 | -#collection .m-table-view .cell-extend-pic .display-block { | 108 | +#collection .m-table-view .cell-extend-pic .cellin .display-block { |
92 | margin-left: 10px; | 109 | margin-left: 10px; |
93 | } | 110 | } |
94 | #collection .m-table-view .title { | 111 | #collection .m-table-view .title { |
@@ -145,6 +162,18 @@ | @@ -145,6 +162,18 @@ | ||
145 | font-size: 13px; | 162 | font-size: 13px; |
146 | color: #999; | 163 | color: #999; |
147 | } | 164 | } |
165 | +#collection .goodlist, | ||
166 | +#collection .shoplist { | ||
167 | + background-color: #fff; | ||
168 | +} | ||
169 | +#collection .goodlist .cell, | ||
170 | +#collection .shoplist .cell { | ||
171 | + border-bottom: 1px solid #ddd; | ||
172 | +} | ||
173 | +#collection .goodlist .cell .cellin, | ||
174 | +#collection .shoplist .cell .cellin { | ||
175 | + border: 0; | ||
176 | +} | ||
148 | .supply-list { | 177 | .supply-list { |
149 | padding: 0; | 178 | padding: 0; |
150 | } | 179 | } |
@@ -170,3 +199,44 @@ | @@ -170,3 +199,44 @@ | ||
170 | .red { | 199 | .red { |
171 | color: #fa4535; | 200 | color: #fa4535; |
172 | } | 201 | } |
202 | +.labchk { | ||
203 | + width: 40px; | ||
204 | + position: absolute; | ||
205 | + left: 0; | ||
206 | + top: 0; | ||
207 | + height: 100%; | ||
208 | + z-index: -1; | ||
209 | + color: transparent; | ||
210 | +} | ||
211 | +.labchk .m-radio { | ||
212 | + position: absolute; | ||
213 | + top: 50%; | ||
214 | + left: 0; | ||
215 | + margin-top: -11px; | ||
216 | +} | ||
217 | +.m-footer { | ||
218 | + padding: 0px; | ||
219 | + height: 0px; | ||
220 | + overflow: hidden; | ||
221 | + -webkit-transition: height 0.3s; | ||
222 | + transition: height 0.3s; | ||
223 | +} | ||
224 | +.m-footer .m-btn { | ||
225 | + float: left; | ||
226 | + width: 50%; | ||
227 | + box-sizing: border-box; | ||
228 | +} | ||
229 | +.panel-open .m-footer { | ||
230 | + position: fixed; | ||
231 | + display: block; | ||
232 | + z-index: 9; | ||
233 | + height: 50px; | ||
234 | +} | ||
235 | +.panel-open .labchk { | ||
236 | + z-index: 1; | ||
237 | + left: -40px; | ||
238 | +} | ||
239 | +.panel-open .m-table-view .cellin { | ||
240 | + -webkit-transform: translate3d(50px, 0, 0); | ||
241 | + transform: translate3d(50px, 0, 0); | ||
242 | +} |
css/style/collection.less
@@ -13,18 +13,31 @@ | @@ -13,18 +13,31 @@ | ||
13 | } | 13 | } |
14 | } | 14 | } |
15 | .m-table-view { | 15 | .m-table-view { |
16 | - .cell-extend-pic{ | ||
17 | - padding: 15px 56px; | ||
18 | - padding-left:95px; | 16 | + background-color: transparent; |
17 | + .cell { | ||
18 | + background-color: transparent; | ||
19 | + overflow: visible; | ||
20 | + border: 0; | ||
21 | + padding: 0; | ||
22 | + .cellin { | ||
23 | + border: 1px solid #ddd; | ||
24 | + background-color: #fff; | ||
25 | + padding: 10px; | ||
26 | + } | ||
19 | } | 27 | } |
20 | .cell-extend-pic { | 28 | .cell-extend-pic { |
21 | - .pic{ | ||
22 | - width:80px; | ||
23 | - height:80px; | ||
24 | - margin-left: -90px; | ||
25 | - } | ||
26 | - .display-block{ | ||
27 | - margin-left:10px; | 29 | + padding: 0; |
30 | + .cellin { | ||
31 | + padding: 15px 56px; | ||
32 | + padding-left:95px; | ||
33 | + .pic{ | ||
34 | + width:80px; | ||
35 | + height:80px; | ||
36 | + margin-left: -90px; | ||
37 | + } | ||
38 | + .display-block{ | ||
39 | + margin-left:10px; | ||
40 | + } | ||
28 | } | 41 | } |
29 | } | 42 | } |
30 | .title{ | 43 | .title{ |
@@ -84,6 +97,16 @@ | @@ -84,6 +97,16 @@ | ||
84 | font-size: 13px; | 97 | font-size: 13px; |
85 | color:#999; | 98 | color:#999; |
86 | } | 99 | } |
100 | + .goodlist, | ||
101 | + .shoplist { | ||
102 | + background-color: #fff; | ||
103 | + .cell { | ||
104 | + border-bottom: 1px solid #ddd; | ||
105 | + .cellin { | ||
106 | + border: 0; | ||
107 | + } | ||
108 | + } | ||
109 | + } | ||
87 | } | 110 | } |
88 | 111 | ||
89 | .supply-list { | 112 | .supply-list { |
@@ -113,3 +136,46 @@ | @@ -113,3 +136,46 @@ | ||
113 | .red { | 136 | .red { |
114 | color: #fa4535; | 137 | color: #fa4535; |
115 | } | 138 | } |
139 | +.labchk { | ||
140 | + width: 40px; | ||
141 | + position: absolute; | ||
142 | + left: 0; | ||
143 | + top: 0; | ||
144 | + height: 100%; | ||
145 | + z-index: -1; | ||
146 | + color: transparent; | ||
147 | + .m-radio { | ||
148 | + position: absolute; | ||
149 | + top: 50%; | ||
150 | + left: 0; | ||
151 | + margin-top: -11px; | ||
152 | + } | ||
153 | +} | ||
154 | +.m-footer { | ||
155 | + padding: 0px; | ||
156 | + height: 0px; | ||
157 | + overflow: hidden; | ||
158 | + -webkit-transition: height 0.3s; | ||
159 | + transition: height 0.3s; | ||
160 | + .m-btn { | ||
161 | + float: left; | ||
162 | + width: 50%; | ||
163 | + box-sizing: border-box; | ||
164 | + } | ||
165 | +} | ||
166 | +.panel-open { | ||
167 | + .m-footer { | ||
168 | + position: fixed; | ||
169 | + display: block; | ||
170 | + z-index: 9; | ||
171 | + height: 50px; | ||
172 | + } | ||
173 | + .labchk { | ||
174 | + z-index: 1; | ||
175 | + left: -40px; | ||
176 | + } | ||
177 | + .m-table-view .cellin { | ||
178 | + -webkit-transform: translate3d(50px, 0, 0); | ||
179 | + transform: translate3d(50px, 0, 0); | ||
180 | + } | ||
181 | +} |