jmx преди 9 години
родител
ревизия
2e647e0f38

+ 1 - 1
www/webapp/o2o/css/home.css

@@ -152,7 +152,7 @@
 
 .spa-page-home .prevent-scroll {
     width: 100%;
-    position: absolute;
+    position: fixed;
     bottom: 0;
     background-color: #2a2400;
 }

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/css/main.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
www/webapp/o2o/dist/js/build/template.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
www/webapp/o2o/dist/js/main.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


+ 3 - 3
www/webapp/o2o/js/build/.cache/home/index.js

@@ -1,10 +1,10 @@
-/*TMODJS:{"version":137,"md5":"8e4e923d7a789e8b1099e3d3d05a1d68"}*/
+/*TMODJS:{"version":138,"md5":"9d7b1dad5716de1f805abfcb4646c60f"}*/
 template('home/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,productsa=$data.productsa,product=$data.product,$index=$data.$index,$escape=$utils.$escape,productsb=$data.productsb,productsc=$data.productsc,productsd=$data.productsd,$out='';if(showNavBar ){
 $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">壹管家</h1> </header> ';
 }
-$out+=' <div class="content"> <div style="width: 100%; position: absolute; top: 0; bottom: 53px;" id="homeScroll"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
 $each(productsa,function(product,$index){
 $out+=' <img src="';
 $out+=$escape(product.desc[0].content);
@@ -36,6 +36,6 @@ $out+='" width="49%" class="btn-product" data-product-type="';
 $out+=$escape(product.type);
 $out+='"/> ';
 });
-$out+=' </div> </div> </div> <div class="prevent-scroll" style="width: 100%; height: 53px; position: absolute; bottom: 0; background-color: #2a2400;"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> ';
+$out+=' </div> </div> </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> </div> </div> ';
 return new String($out);
 });

+ 3 - 3
www/webapp/o2o/js/build/template.js

@@ -832,13 +832,13 @@ $out+=' <p class="bold">联系电话: <a class="service-telephone">021-62109097<
 }
 $out+=' <br> </div> </div> </div> ';
 return new String($out);
-});/*v:137*/
+});/*v:138*/
 template('home/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$each=$utils.$each,productsa=$data.productsa,product=$data.product,$index=$data.$index,$escape=$utils.$escape,productsb=$data.productsb,productsc=$data.productsc,productsd=$data.productsd,$out='';if(showNavBar ){
 $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">壹管家</h1> </header> ';
 }
-$out+=' <div class="content"> <div style="width: 100%; position: absolute; top: 0; bottom: 53px;" id="homeScroll"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
+$out+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content"> <div class="box main-service-box width-percent-100"> <div class="title-column-left box-container"> <div class="title-container-square"> <div class="the-main-figure"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/> </div> </div> </div> </div> <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;"> <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div> <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div> <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div> <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div> </div> <div> <div class="products-list" id="list0"> ';
 $each(productsa,function(product,$index){
 $out+=' <img src="';
 $out+=$escape(product.desc[0].content);
@@ -870,7 +870,7 @@ $out+='" width="49%" class="btn-product" data-product-type="';
 $out+=$escape(product.type);
 $out+='"/> ';
 });
-$out+=' </div> </div> </div> <div class="prevent-scroll" style="width: 100%; height: 53px; position: absolute; bottom: 0; background-color: #2a2400;"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> ';
+$out+=' </div> </div> </div> </div> </div> <div class="prevent-scroll"> <div class="box my-action">  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-my-order"> <div class="logo logo-my-order"></div> <div class="name">首页</div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-logo"> <div class="logo logo-my-logo"></div> </a> </div> </div>  <div class="width-percent-33"> <div class="title-container-square"> <a class="btn-home-action btn-action-coupon"> <div class="logo logo-coupon"></div> <div class="name">我的</div> </a> </div> </div> </div> </div> </div> </div> </div> ';
 return new String($out);
 });/*v:3*/
 template('mine/index','<!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <title>Title</title> </head> <body> </body> </html>');/*v:1*/

+ 3 - 3
www/webapp/o2o/js/page/home.js

@@ -244,9 +244,9 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
                     $('.spa-page-body', $view).html(tpl);
                     
                     /* 建立IScroll */
-                    // setTimeout(function () {
-                    //     pageData.scroll = new IScroll('#homeScroll');
-                    // }, 200);
+                    setTimeout(function () {
+                        pageData.scroll = new IScroll('#homeScroll');
+                    }, 200);
                 });
             }
 

+ 75 - 59
www/webapp/o2o/tpl/home/index.html

@@ -11,67 +11,83 @@
 </header>
 {{ /if }}
 <div class="content">
-    <div class="scroll" style="position: absolute; top: 0; bottom: 53px;">
-        <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" width="100%"/>
-        <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;">
-            <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div>
-            <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div>
-            <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div>
-            <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div>
-        </div>
-        <div>
-            <div class="products-list" id="list0">
-                {{ each productsa as product }}
-                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                     data-product-type="{{product.type}}"/>
-                {{ /each }}
-            </div>
-            <div class="products-list" id="list1" style="display: none">
-                {{ each productsb as product }}
-                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                     data-product-type="{{product.type}}"/>
-                {{ /each }}
-            </div>
-            <div class="products-list" id="list2" style="display: none">
-                {{ each productsc as product }}
-                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                     data-product-type="{{product.type}}"/>
-                {{ /each }}
-            </div>
-            <div class="products-list" id="list3" style="display: none">
-                {{ each productsd as product }}
-                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
-                     data-product-type="{{product.type}}"/>
-                {{ /each }}
-            </div>
-        </div>
-    </div>
-    <div class="prevent-scroll" style="position: absolute; bottom: 0; height: 53px;">
-        <div class="box my-action">
-            <!--首页-->
-            <div class="width-percent-33">
-                <div class="title-container-square">
-                    <a class="btn-home-action btn-action-my-order">
-                        <div class="logo logo-my-order"></div>
-                        <div class="name">首页</div>
-                    </a>
-                </div>
-            </div>
-            <!--LOGO-->
-            <div class="width-percent-33">
-                <div class="title-container-square">
-                    <a class="btn-home-action btn-action-logo">
-                        <div class="logo logo-my-logo"></div>
-                    </a>
+    <div class="box-container">
+        <div class="box-container box box-vertical">
+            <div id="homeScroll" class="scroll-container box-flex-1">
+                <div class="scroller">
+                    <div class="home-content">
+                        <div class="box main-service-box width-percent-100">
+                            <div class="title-column-left box-container">
+                                <div class="title-container-square">
+                                    <div class="the-main-figure">
+                                        <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" alt=""/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="global-msg" style="display: flex;justify-content: space-between; padding: 15px;">
+                            <div class="width-percent-25 btn-product-group global-msg-active" data-group-index="0">家庭保洁</div>
+                            <div class="width-percent-25 btn-product-group" data-group-index="1">月子服务</div>
+                            <div class="width-percent-25 btn-product-group" data-group-index="2">保姆服务</div>
+                            <div class="width-percent-25 btn-product-group" data-group-index="3">家庭产品</div>
+                        </div>
+                        <div>
+                            <div class="products-list" id="list0">
+                                {{ each productsa as product }}
+                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                                     data-product-type="{{product.type}}"/>
+                                {{ /each }}
+                            </div>
+                            <div class="products-list" id="list1" style="display: none">
+                                {{ each productsb as product }}
+                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                                     data-product-type="{{product.type}}"/>
+                                {{ /each }}
+                            </div>
+                            <div class="products-list" id="list2" style="display: none">
+                                {{ each productsc as product }}
+                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                                     data-product-type="{{product.type}}"/>
+                                {{ /each }}
+                            </div>
+                            <div class="products-list" id="list3" style="display: none">
+                                {{ each productsd as product }}
+                                <img src="{{product.desc[0].content}}" width="49%" class="btn-product"
+                                     data-product-type="{{product.type}}"/>
+                                {{ /each }}
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <!--我的-->
-            <div class="width-percent-33">
-                <div class="title-container-square">
-                    <a class="btn-home-action btn-action-coupon">
-                        <div class="logo logo-coupon"></div>
-                        <div class="name">我的</div>
-                    </a>
+            <div class="prevent-scroll">
+                <div class="box my-action">
+                    <!--首页-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-my-order">
+                                <div class="logo logo-my-order"></div>
+                                <div class="name">首页</div>
+                            </a>
+                        </div>
+                    </div>
+                    <!--LOGO-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-logo">
+                                <div class="logo logo-my-logo"></div>
+                            </a>
+                        </div>
+                    </div>
+                    <!--我的-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-coupon">
+                                <div class="logo logo-coupon"></div>
+                                <div class="name">我的</div>
+                            </a>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

Някои файлове не бяха показани, защото твърде много файлове са промени