添加个人中心

www/webapp/o2o/dist/js/page/mine.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),t.preventDefault(),e(document).trigger("spa:navigate",{hash:"home",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document),f=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",u).html(f),setTimeout(function(){i.scroll=new n("#mine-scroll")},500),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","native","config"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),t.preventDefault(),e(document).trigger("spa:navigate",{hash:"home",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},i),i.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(n,i){var o=this,u=e(document),a=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance});e(".spa-page-body",o).html(a),i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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:29*/
+});/*v:33*/
 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;" 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+=' <div id="mineScroll" style="width: 100%; height: 100%;color: #59616c; font-size:18px; overflow-y: auto;"> <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);

www/webapp/o2o/js/page/mine.js

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

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;" id="mine-scroll">
+<div id="mineScroll" style="width: 100%; height: 100%;color: #59616c; font-size:18px; overflow-y: auto;">
     <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>