jmx 8 жил өмнө
parent
commit
148f97ca85

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

@@ -872,7 +872,7 @@ $out+='"/> ';
 });
 $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:28*/
+});/*v:29*/
 template('mine/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,userName=$data.userName,userBalance=$data.userBalance,$out='';if(showNavBar ){
@@ -880,7 +880,7 @@ $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div cl
 $out+=$escape(title);
 $out+='</h1> </header> ';
 }
-$out+=' <div style="width: 100%; color: #59616c; font-size:18px;"> <div style="width: 100%;"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" style="width: 100%;"/> <div style="width: 100%; padding-top: 20px; padding-bottom: 20px; text-align: center;">';
+$out+=' <div style="width: 100%; color: #59616c; font-size:18px;" id="mine-scroll"> <div style="width: 100%;"> <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" style="width: 100%;"/> <div style="width: 100%; padding-top: 20px; padding-bottom: 20px; text-align: center;">';
 $out+=$escape(userName);
 $out+='</div> <div style="width: 100%; padding-bottom: 20px; text-align: center;">余额:';
 $out+=$escape(userBalance);

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

@@ -246,7 +246,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
                     /* 建立IScroll */
                     setTimeout(function () {
                         pageData.scroll = new IScroll('#homeScroll');
-                    }, 200);
+                    }, 500);
                 });
             }
 

+ 4 - 0
www/webapp/o2o/js/page/mine.js

@@ -127,6 +127,10 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config'], function ($, te
             });
             $('.spa-page-body', $view).html(tpl);
 
+            setTimeout(function () {
+                pageData.scroll = new IScroll('#mine-scroll');
+            }, 500);
+
             /* 又是这个。不知道什么玩意…… */
             dtd.resolve();
         },

+ 1 - 1
www/webapp/o2o/tpl/mine/index.html

@@ -6,7 +6,7 @@
     <h1 class="title">{{title}}</h1>
 </header>
 {{ /if }}
-<div style="width: 100%; color: #59616c; font-size:18px;">
+<div style="width: 100%; color: #59616c; font-size:18px;" id="mine-scroll">
     <div style="width: 100%;">
         <img src="http://odulvej8l.bkt.clouddn.com/Home_image%281%29.png" style="width: 100%;"/>
         <div style="width: 100%; padding-top: 20px; padding-bottom: 20px; text-align: center;">{{userName}}</div>