添加个人中心

www/webapp/o2o/build.js

@@ -11,6 +11,7 @@
     include: [
       'ratchet',
       'pageHome',
+      'pageMine',
       'pageProduct',
       'pagePlaceOrder',
       'pagePicker',

www/webapp/o2o/dist/js/build.txt

@@ -19,6 +19,7 @@ main.js
 build/template.js
 IScroll.js
 page/home.js
+page/mine.js
 model/cart.js
 model/review.js
 page/product.js

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

@@ -0,0 +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(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/dist/js/page/myCoupon.js

@@ -1 +1 @@
-define(["$","template","user","config","IScroll"],function(e,t,n,r,i){function s(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function o(e){e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new i("#myCouponScroll")},50)}return{title:"壹管家上门服务",body:"",init:function(r,i){var u=this,a=e(document);u.on("swipeRight",function(e){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},u),u.on("tapBackButton",function(e){s.call(this,e)}),e.newTouch(".btn-coupon",function(i){i.preventDefault();var s=e("#coupon-code",u).val();if(s.length<8){a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]);return}e(this).val(""),n.exchangeCoupon(s,function(i){a.trigger("spa:openloader"),i.success?n.getCouponList(n.id,function(i){a.trigger("spa:closeloader");if(i.success){var s=t("myCoupon/exchange",{coupons:n.coupons});e(".spa-page-body",u).find(".coupon-items").html(s),o(r)}a.trigger("spa:openpanel",["simpleAlert",{message:i.message}])}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:i.message}]))})},u),i.resolve()},beforeopen:function(i,s){var u=this,a=e(document);a.trigger("spa:openloader"),n.checkLogin(function(){n.getCouponList(n.id,function(s){a.trigger("spa:closeloader");if(s.success){var f=t("myCoupon/index",{coupons:n.coupons,showNavBar:!r.isWX&&!r.isChubao});e(".spa-page-body",u).html(f),o(i)}else a.trigger("spa:openpanel",["simpleAlert",{message:s.message}])})}),s.resolve(),r.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"家政服务，首选壹管家",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"}),wx.onMenuShareAppMessage({title:"家政服务，首选壹管家",desc:"全程管家，精心每一个细节！",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});
+define(["$","template","user","config","IScroll"],function(e,t,n,r,i){function s(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine",pushData:{dontNeedReload:!0}})}function o(e){e.scroll&&(e.scroll.destroy(),e.scroll=null),setTimeout(function(){e.scroll=new i("#myCouponScroll")},50)}return{title:"壹管家上门服务",body:"",init:function(r,i){var u=this,a=e(document);u.on("swipeRight",function(e){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},u),u.on("tapBackButton",function(e){s.call(this,e)}),e.newTouch(".btn-coupon",function(i){i.preventDefault();var s=e("#coupon-code",u).val();if(s.length<8){a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]);return}e(this).val(""),n.exchangeCoupon(s,function(i){a.trigger("spa:openloader"),i.success?n.getCouponList(n.id,function(i){a.trigger("spa:closeloader");if(i.success){var s=t("myCoupon/exchange",{coupons:n.coupons});e(".spa-page-body",u).find(".coupon-items").html(s),o(r)}a.trigger("spa:openpanel",["simpleAlert",{message:i.message}])}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:i.message}]))})},u),i.resolve()},beforeopen:function(i,s){var u=this,a=e(document);a.trigger("spa:openloader"),n.checkLogin(function(){n.getCouponList(n.id,function(s){a.trigger("spa:closeloader");if(s.success){var f=t("myCoupon/index",{coupons:n.coupons,showNavBar:!r.isWX&&!r.isChubao});e(".spa-page-body",u).html(f),o(i)}else a.trigger("spa:openpanel",["simpleAlert",{message:s.message}])})}),s.resolve(),r.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"家政服务，首选壹管家",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"}),wx.onMenuShareAppMessage({title:"家政服务，首选壹管家",desc:"全程管家，精心每一个细节！",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});

www/webapp/o2o/js/build/template.js

@@ -872,8 +872,21 @@ $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:3*/
-template('mine/index','<!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <title>Title</title> </head> <body> </body> </html>');/*v:1*/
+});/*v:28*/
+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 ){
+$out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">';
+$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+=$escape(userName);
+$out+='</div> <div style="width: 100%; padding-bottom: 20px; text-align: center;">余额：';
+$out+=$escape(userBalance);
+$out+='元</div> </div> <ul class="table-view" style="margin-top: 10px;"> <li class="table-view-cell"> <a class="navigate-right btn-my-order"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 我的订单 </a> </li> <li class="table-view-cell"> <a class="navigate-right btn-address-list"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 常用地址 <span class="table-view-cell-right-label">上海市天平路徐家汇</span> </a> </li> <li class="table-view-cell"> <a class="navigate-right btn-recharge"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 充值卡 </a> </li> <li class="table-view-cell"> <a class="navigate-right btn-coupon"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 代金券 </a> </li> <li class="table-view-cell"> <a class="navigate-right btn-helper"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 帮助中心 </a> </li> <li class="table-view-cell"> <a class="navigate-right btn-about"> <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/> 关于壹管家 </a> </li> </ul> <div style="width: 100%; padding-top: 100px;text-align: center; color: #b6bbc2; font-size:16px;">专属管家 服务无忧</div> </div>';
+return new String($out);
+});/*v:1*/
 template('myCoupon/cell',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,coupon=$data.coupon,isRemind=$data.isRemind,start_time_str=$data.start_time_str,end_time_str=$data.end_time_str,selected=$data.selected,$out='';$out+='<div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> ￥<span class="coupon-value">';
@@ -1857,6 +1870,7 @@ $out+=' <a href="tel:400-032-8170">400-032-8170</a> ';
 }
 $out+=' </p> </div> <div class="btn-box"> <div class="btn btn-block back-button">返回首页</div> </div> </div> ';
 return new String($out);
-});
+});/*v:3*/
+template('recharge/index','<!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <title>Title</title> </head> <body> </body> </html>');
 
 }()

www/webapp/o2o/js/main.js

@@ -53,6 +53,7 @@ require.config({
     pageRefundSuccess: './page/refundSuccess',
     pageBeautician: './page/beautician',
     pageBeauticianDetail: './page/beauticianDetail',
+    pageMine: './page/mine',
     //panel
     panelAlert: './panel/alert',
     panelActionSheet: './panel/actionSheet',
@@ -105,6 +106,19 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
     }
   };
 
+  //个人中心
+  var pageMine = {
+    route: 'mine',
+    classname: 'mine',
+    animate: 'pushInLeft',
+    view: function () {
+      var $page = this;
+      requirejs(['pageMine'], function (viewData) {
+        $doc.trigger('spa:initpage', [$page, viewData])
+      })
+    }
+  };
+
   //商品提示信息
   var pageProductInfo = {
     route: 'product-info/:type',
@@ -414,7 +428,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
     }
   };
 
-  $doc.trigger('spa:route', [pageHome, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+  $doc.trigger('spa:route', [pageHome, pageMine, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
   var panelAlert = {
     id: 'simpleAlert',

www/webapp/o2o/js/page/home.js

@@ -90,12 +90,12 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], func
                 });
             }, $view);
 
-            // 优惠券
+            // 个人中心
             $.newTouch('.btn-action-coupon', function (event) {
                 event.preventDefault();
                 user.checkLogin(function () {
                     $doc.trigger('spa:navigate', {
-                        hash: 'myCoupon'
+                        hash: 'mine'
                     });
                 });
             }, $view);

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

@@ -0,0 +1,137 @@
+define(['$', 'template', 'IScroll', 'user', 'native', 'config'], function ($, template, IScroll, user, native, config) {
+
+    /*
+     * 先定义一些模块内用到的function
+     */
+    function back(event) {
+        event.preventDefault();
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: 'home',
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
+
+    /*
+     * 模块结构：5部分。
+     * title:题目。
+     * content:不知道是什么，似乎从没用过。
+     * 以下可以当作生命周期回调，虽然并不清楚是什么时候回调的……
+     * init:根据上一个页面传来的pageData初始化本页数据，生成页面，绑定事件。
+     * beforeopen:接收上一个页面传来的数据、有需要的话重置数据
+     * afteropen:做一些网络请求。
+     * beforeclose：
+     */
+    return {
+        title: '我的',
+        body: '',
+        init: function (pageData, dtd) {
+            /* this是什么？ */
+            var $view = this;
+            var $doc = $(document);
+
+            /* 定义按钮事件。
+             * 为什么不是$(selector).onclick(function)呢？
+             */
+
+            // 返回
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+            });
+
+            $.newTouch('.back-button', function (event) {
+                back.call(this, event);
+            }, $view);
+
+            $view.on('tapBackButton', function (event) {
+                back.call(this, event);
+            });
+
+            // 我的订单
+            $.newTouch('.btn-my-order', function (event) {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'myOrder/1',
+                    pushData: {
+                        needReload: true
+                    }
+                });
+            }, $view);
+
+            // 常用地址
+            // $.newTouch('.btn-address-list', function (event) {
+            //     event.preventDefault();
+            //     $doc.trigger('spa:navigate', {
+            //         hash: 'addressList',
+            //         pushData: {
+            //             needReload: true
+            //         }
+            //     });
+            // }, $view);
+
+            // 充值卡
+            $.newTouch('.btn-address-list', function (event) {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'recharge',
+                    pushData: {
+                        needReload: true
+                    }
+                });
+            }, $view);
+
+            // 代金券
+            $.newTouch('.btn-coupon', function (event) {
+                event.preventDefault();
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: 'myCoupon'
+                    });
+                });
+            }, $view);
+
+            // 帮助中心
+            $.newTouch('.btn-helper', function () {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'help'
+                });
+            }, $view);
+
+            // 关于
+            $.newTouch('.btn-about', function () {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'about'
+                });
+            }, $view);
+
+            /* 定义按钮事件结束。*/
+
+            /* 不知道什么意思。*/
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            var tpl = template('mine/index', {
+                showNavBar: !config.isWX,
+                userName: user.name == '' ? '未登录' : user.name,
+                userBalance: user.balance,
+            });
+            $('.spa-page-body', $view).html(tpl);
+
+            /* 又是这个。不知道什么玩意…… */
+            dtd.resolve();
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+        }
+    }
+})

www/webapp/o2o/js/page/myCoupon.js

@@ -1,123 +1,122 @@
 define(['$', 'template', 'user', 'config', 'IScroll'], function ($, template, user, config, IScroll) {
-	function back(event) {
-		event.preventDefault();
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: 'mine',
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
 
-		$(document).trigger('spa:navigate', {
-			hash: '',
-			pushData: {
-        dontNeedReload: true
-      }
-		});
-	}
+    function fixScroll(pageData) {
+        if (pageData.scroll) {
+            pageData.scroll.destroy();
+            pageData.scroll = null;
+        }
 
-  function fixScroll(pageData) {
-    if (pageData.scroll) {
-      pageData.scroll.destroy();
-      pageData.scroll = null;
+        setTimeout(function () {
+            pageData.scroll = new IScroll('#myCouponScroll');
+        }, 50);
     }
 
-    setTimeout(function() {
-      pageData.scroll = new IScroll('#myCouponScroll');
-    }, 50);
-  }
+    return {
+        title: '壹管家上门服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
 
-	return {
-		title: '壹管家上门服务',
-		body: '',
-		init: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-
-			// 返回
-			$view.on('swipeRight', function (event) {
-				back.call(this, event);
-			});
+            // 返回
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+            });
 
-			$.newTouch('.back-button', function (event) {
-				back.call(this, event);
-			}, $view);
+            $.newTouch('.back-button', function (event) {
+                back.call(this, event);
+            }, $view);
 
-			$view.on('tapBackButton', function(event) {
-				back.call(this, event);
-			});
+            $view.on('tapBackButton', function (event) {
+                back.call(this, event);
+            });
 
-      // 兑换
-      $.newTouch('.btn-coupon', function(event) {
-        event.preventDefault();
-        var val = $('#coupon-code', $view).val();
-        if (val.length < 8) {
-          $doc.trigger('spa:openpanel', ['simpleAlert', {
-            message: '请输入有效的兑换码'
-          }]);
-          return;
-        } else {
-          $(this).val('');
-          user.exchangeCoupon(val, function (res) {
-            $doc.trigger('spa:openloader');
-            if (res.success) {
-              user.getCouponList(user.id, function(result){
-                $doc.trigger('spa:closeloader');
-                if (result.success) {
-                  var exchangeTpl = template('myCoupon/exchange', {
-                    coupons: user.coupons
-                  });
-                  $('.spa-page-body', $view).find('.coupon-items').html(exchangeTpl);
-                  fixScroll(pageData);
+            // 兑换
+            $.newTouch('.btn-coupon', function (event) {
+                event.preventDefault();
+                var val = $('#coupon-code', $view).val();
+                if (val.length < 8) {
+                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                        message: '请输入有效的兑换码'
+                    }]);
+                    return;
+                } else {
+                    $(this).val('');
+                    user.exchangeCoupon(val, function (res) {
+                        $doc.trigger('spa:openloader');
+                        if (res.success) {
+                            user.getCouponList(user.id, function (result) {
+                                $doc.trigger('spa:closeloader');
+                                if (result.success) {
+                                    var exchangeTpl = template('myCoupon/exchange', {
+                                        coupons: user.coupons
+                                    });
+                                    $('.spa-page-body', $view).find('.coupon-items').html(exchangeTpl);
+                                    fixScroll(pageData);
+                                }
+                                $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                    message: result.message
+                                }]);
+                            });
+                        } else {
+                            $doc.trigger('spa:closeloader');
+                            $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                message: res.message
+                            }]);
+                        }
+                    })
                 }
-                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                  message: result.message
-                }]);
-              });
-            } else {
-              $doc.trigger('spa:closeloader');
-              $doc.trigger('spa:openpanel', ['simpleAlert', {
-                message: res.message
-              }]);
-            }
-          })
-        }
-      }, $view);
+            }, $view);
 
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-      $doc.trigger('spa:openloader');
-      user.checkLogin(function () {
-        user.getCouponList(user.id, function (res) {
-          $doc.trigger('spa:closeloader');
-          if (res.success) {
-            var tpl = template('myCoupon/index', {
-              coupons: user.coupons,
-              showNavBar: !config.isWX && !config.isChubao
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            $doc.trigger('spa:openloader');
+            user.checkLogin(function () {
+                user.getCouponList(user.id, function (res) {
+                    $doc.trigger('spa:closeloader');
+                    if (res.success) {
+                        var tpl = template('myCoupon/index', {
+                            coupons: user.coupons,
+                            showNavBar: !config.isWX && !config.isChubao
+                        });
+                        $('.spa-page-body', $view).html(tpl);
+                        fixScroll(pageData);
+                    } else {
+                        $doc.trigger('spa:openpanel', ['simpleAlert', {
+                            message: res.message
+                        }]);
+                    }
+                })
             });
-            $('.spa-page-body', $view).html(tpl);
-            fixScroll(pageData);
-          } else {
-            $doc.trigger('spa:openpanel', ['simpleAlert', {
-              message: res.message
-            }]);
-          }
-        })
-      });
 
-			dtd.resolve();
-      if (config.isWX) {
-        wx.ready(function(){
-          wx.onMenuShareTimeline({
-            title: '家政服务，首选壹管家',
-            link: 'http://www.yiguanjia.me/o2o/web/index',
-            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-          });
-          wx.onMenuShareAppMessage({
-            title: '家政服务，首选壹管家',
-            desc: '全程管家，精心每一个细节！',
-            link: 'http://www.yiguanjia.me/o2o/web/index',
-            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-          });
-        });
-      }
-		}
-	}
+            dtd.resolve();
+            if (config.isWX) {
+                wx.ready(function () {
+                    wx.onMenuShareTimeline({
+                        title: '家政服务，首选壹管家',
+                        link: 'http://www.yiguanjia.me/o2o/web/index',
+                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+                    });
+                    wx.onMenuShareAppMessage({
+                        title: '家政服务，首选壹管家',
+                        desc: '全程管家，精心每一个细节！',
+                        link: 'http://www.yiguanjia.me/o2o/web/index',
+                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+                    });
+                });
+            }
+        }
+    }
 })

www/webapp/o2o/js/page/myOrder.js

@@ -1,302 +1,302 @@
 define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, template, user, config, native, IScroll) {
-	function back(event) {
-		event.preventDefault();
+    function back(event) {
+        event.preventDefault();
 
-		$(document).trigger('spa:navigate', {
-			hash: '',
-			pushData: {
-        dontNeedReload: true
-      }
-		});
-	}
+        $(document).trigger('spa:navigate', {
+            hash: 'mine',
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
 
-	function reloadData(pageData, type, more) {
-		var $view = this;
-		var $doc = $(document);
+    function reloadData(pageData, type, more) {
+        var $view = this;
+        var $doc = $(document);
 
-		$doc.trigger('spa:openloader');
-		user.getOrderList(user.id, type, function (res) {
-			$doc.trigger('spa:closeloader');
-			if (res.success) {
-        var time = new Date().getTime();
-				var tpl = template('myOrder/list', {
-					orders: user.orders[type].data,
-					hasMore: user.orders[type].hasMore,
-					type: type,
-          time: parseInt(time / 1000),
-          chubao: config.isChubao
-				});
-				$('.more-container', $view).find('.btn-more-orders').attr('data-type', type);
+        $doc.trigger('spa:openloader');
+        user.getOrderList(user.id, type, function (res) {
+            $doc.trigger('spa:closeloader');
+            if (res.success) {
+                var time = new Date().getTime();
+                var tpl = template('myOrder/list', {
+                    orders: user.orders[type].data,
+                    hasMore: user.orders[type].hasMore,
+                    type: type,
+                    time: parseInt(time / 1000),
+                    chubao: config.isChubao
+                });
+                $('.more-container', $view).find('.btn-more-orders').attr('data-type', type);
 
-				if (res.current_page >= res.sum_page) {
-					$('.more-container', $view).addClass('hide');
-				} else {
-					$('.more-container', $view).removeClass('hide');
-				}
-				// if (more) {
-				// 	$('.list-content', $view).append(tpl);
-				// } else {
-				// 	$('.list-content', $view).html(tpl);
-				// }
-        $('.list-content', $view).html(tpl);
+                if (res.current_page >= res.sum_page) {
+                    $('.more-container', $view).addClass('hide');
+                } else {
+                    $('.more-container', $view).removeClass('hide');
+                }
+                // if (more) {
+                // 	$('.list-content', $view).append(tpl);
+                // } else {
+                // 	$('.list-content', $view).html(tpl);
+                // }
+                $('.list-content', $view).html(tpl);
 
-        setTimeout(function() {
-					pageData.scroll = new IScroll('#myOrderScroll');
-				}, 50);
+                setTimeout(function () {
+                    pageData.scroll = new IScroll('#myOrderScroll');
+                }, 50);
 
-				// if (pageData.scroll) {
-				// 	pageData.scroll.refresh();
-				// }
-			} else {
-				$doc.trigger('spa:openpanel', ['simpleAlert', {
-					message: res.message
-				}]);
-			}
-		}, more)
-	}
+                // if (pageData.scroll) {
+                // 	pageData.scroll.refresh();
+                // }
+            } else {
+                $doc.trigger('spa:openpanel', ['simpleAlert', {
+                    message: res.message
+                }]);
+            }
+        }, more)
+    }
 
-  var t = 0;
-	return {
-		title: '壹管家上门服务',
-		body: '',
-		init: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
+    var t = 0;
+    return {
+        title: '壹管家上门服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
 
-			//返回
-			$view.on('swipeRight', function (event) {
-				back.call(this, event);
-			});
+            //返回
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+            });
 
-			$.newTouch('.back-button', function (event) {
-				back.call(this, event);
-			}, $view);
+            $.newTouch('.back-button', function (event) {
+                back.call(this, event);
+            }, $view);
 
-			$view.on('tapBackButton', function(event) {
-				back.call(this, event);
-			});
+            $view.on('tapBackButton', function (event) {
+                back.call(this, event);
+            });
 
-			// tab切换
-			$.newTouch('.order-type-control .control-item', function(event) {
-				var orderType = $(this).data('order-type');
-        var i = $(this).index();
-        t = parseFloat(i) + 1;
-				reloadData.call($view, pageData, orderType);
-			}, $view);
+            // tab切换
+            $.newTouch('.order-type-control .control-item', function (event) {
+                var orderType = $(this).data('order-type');
+                var i = $(this).index();
+                t = parseFloat(i) + 1;
+                reloadData.call($view, pageData, orderType);
+            }, $view);
 
-      // 详情 OrderDetail
-      $.newTouch('.btn-order-detail', function(event) {
-        var id = $(this).attr('data-order-id');
-        var i = $(this).parents('.table-view').index();
-        $doc.trigger('spa:navigate', {
-          hash: 'OrderDetail/' + id,
-          pushData: {
-            index: i
-          }
-        });
-      }, $view);
+            // 详情 OrderDetail
+            $.newTouch('.btn-order-detail', function (event) {
+                var id = $(this).attr('data-order-id');
+                var i = $(this).parents('.table-view').index();
+                $doc.trigger('spa:navigate', {
+                    hash: 'OrderDetail/' + id,
+                    pushData: {
+                        index: i
+                    }
+                });
+            }, $view);
 
-			// 更多
-			$.newTouch('.btn-more-orders', function (event) {
-				var orderType = $(this).attr('data-type');
-				reloadData.call($view, pageData, orderType, true);
-			}, $view);
+            // 更多
+            $.newTouch('.btn-more-orders', function (event) {
+                var orderType = $(this).attr('data-type');
+                reloadData.call($view, pageData, orderType, true);
+            }, $view);
 
-			// 去支付
-			$.newTouch('.order-btn-pay', function(event) {
-				event.preventDefault();
+            // 去支付
+            $.newTouch('.order-btn-pay', function (event) {
+                event.preventDefault();
 
-				$doc.trigger('spa:navigate', {
-					hash: 'pay',
-					pushData: {
-						animate: 'slideInUp',
-						orderID: $(this).data('order-id'),
-						backHash: 'myOrder/1'
-					}
-				});
-			}, $view);
+                $doc.trigger('spa:navigate', {
+                    hash: 'pay',
+                    pushData: {
+                        animate: 'slideInUp',
+                        orderID: $(this).data('order-id'),
+                        backHash: 'myOrder/1'
+                    }
+                });
+            }, $view);
 
-			// 取消
-			$.newTouch('.order-btn-cancel', function(event) {
-				event.preventDefault();
-				var orderID = $(this).attr('data-order-id');
-				$doc.trigger('spa:openloader');
-				user.cancelOrder(orderID, function(res) {
-					$doc.trigger('spa:closeloader');
-					if (res.success) {
-						reloadData.call($view, pageData, 1);
-						$doc.trigger('spa:openpanel', ['simpleAlert', {
-							message: '取消订单成功'
-						}]);
-					} else
-						$doc.trigger('spa:openpanel', ['simpleAlert', {
-							message: res.message
-						}]);
-				})
-			}, $view);
+            // 取消
+            $.newTouch('.order-btn-cancel', function (event) {
+                event.preventDefault();
+                var orderID = $(this).attr('data-order-id');
+                $doc.trigger('spa:openloader');
+                user.cancelOrder(orderID, function (res) {
+                    $doc.trigger('spa:closeloader');
+                    if (res.success) {
+                        reloadData.call($view, pageData, 1);
+                        $doc.trigger('spa:openpanel', ['simpleAlert', {
+                            message: '取消订单成功'
+                        }]);
+                    } else
+                        $doc.trigger('spa:openpanel', ['simpleAlert', {
+                            message: res.message
+                        }]);
+                })
+            }, $view);
 
-			// 去评价
-			$.newTouch('.order-btn-review', function(event) {
-				var obj = $(this);
-				if (obj.hasClass('disable')) {
-					return false;
-				}
-				var orderID = obj.data('order-id');
-				$doc.trigger('spa:openpanel', ['postReview', {
-					orderID: orderID,
-					didPostReview: function() {
-						obj.addClass('disable').text('已评价');
-					}
-				}]);
-			}, $view);
+            // 去评价
+            $.newTouch('.order-btn-review', function (event) {
+                var obj = $(this);
+                if (obj.hasClass('disable')) {
+                    return false;
+                }
+                var orderID = obj.data('order-id');
+                $doc.trigger('spa:openpanel', ['postReview', {
+                    orderID: orderID,
+                    didPostReview: function () {
+                        obj.addClass('disable').text('已评价');
+                    }
+                }]);
+            }, $view);
 
-      // 申请退款
-      $.newTouch('.order-btn-refund', function(event) {
-        var html = '<a href="tel:4000328170">4000328170</a>';
-        if ($(this).hasClass('btn-alert-info')) {
-          $doc.trigger('spa:openpanel', ['simpleAlert', {
-            message: '预约时间两个小时内申请退款将扣除50%订单金额。确定退款请电话联系客服。',
-            html: config.isWX ? html: '',
-            buttons: [{
-              text: '取消',
-              class: 'btn-default',
-              callback: function() {
+            // 申请退款
+            $.newTouch('.order-btn-refund', function (event) {
+                var html = '<a href="tel:4000328170">4000328170</a>';
+                if ($(this).hasClass('btn-alert-info')) {
+                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                        message: '预约时间两个小时内申请退款将扣除50%订单金额。确定退款请电话联系客服。',
+                        html: config.isWX ? html : '',
+                        buttons: [{
+                            text: '取消',
+                            class: 'btn-default',
+                            callback: function () {
 
-              }
-            },{
-              text: '联系客服',
-              class: 'btn-primary',
-              callback: function() {
-                native.call('4000328170');
-              }
-            }]
-          }]);
-          return;
-        } else {
-          var orderID = $(this).attr('data-order-id');
-          $doc.trigger('spa:openpanel', ['simpleAlert', {
-            title: '申请退款',
-            message: '退款将退至您的支付账户',
-            html: '（3-10个工作日内到账）',
-            buttons: [{
-              text: '确定申请',
-              class: 'btn-primary',
-              callback: function() {
-                user.refundOrder(orderID, function(res) {
-                  if (res.success) {
-                    $('.control-item', $view).eq(2).addClass('active').siblings().removeClass('active');
-                    reloadData.call($view, pageData, 2);
-                  } else {
+                            }
+                        }, {
+                            text: '联系客服',
+                            class: 'btn-primary',
+                            callback: function () {
+                                native.call('4000328170');
+                            }
+                        }]
+                    }]);
+                    return;
+                } else {
+                    var orderID = $(this).attr('data-order-id');
                     $doc.trigger('spa:openpanel', ['simpleAlert', {
-                      message: res.message
+                        title: '申请退款',
+                        message: '退款将退至您的支付账户',
+                        html: '（3-10个工作日内到账）',
+                        buttons: [{
+                            text: '确定申请',
+                            class: 'btn-primary',
+                            callback: function () {
+                                user.refundOrder(orderID, function (res) {
+                                    if (res.success) {
+                                        $('.control-item', $view).eq(2).addClass('active').siblings().removeClass('active');
+                                        reloadData.call($view, pageData, 2);
+                                    } else {
+                                        $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                            message: res.message
+                                        }]);
+                                    }
+                                });
+                            }
+                        }, {
+                            text: '取消申请',
+                            class: 'btn-default',
+                            callback: function () {
+
+                            }
+                        }]
                     }]);
-                  }
+                }
+            }, $view);
+
+            // 追加服务
+            $.newTouch('.order-btn-append', function (event) {
+                var appendType = $(this).attr('data-type');
+                var orderID = $(this).attr('data-order-id');
+                var petName = $(this).attr('data-order-name');
+
+                var i = $(this).parents('.table-view').index();
+                $doc.trigger('spa:navigate', {
+                    hash: 'append',
+                    pushData: {
+                        appendType: appendType,
+                        orderID: orderID,
+                        petName: petName,
+                        index: i
+                    }
                 });
-              }
-            },{
-              text: '取消申请',
-              class: 'btn-default',
-              callback: function() {
+            }, $view);
 
-              }
-            }]
-          }]);
-        }
-      }, $view);
+            // 确认完成
+            $.newTouch('.order-btn-done', function (event) {
+                event.preventDefault();
+                var orderId = $(this).attr('data-order-id');
+                $doc.trigger('spa:openpanel', ['simpleAlert', {
+                    message: '确认服务已完成？',
+                    buttons: [{
+                        text: '确认',
+                        class: 'btn-primary',
+                        callback: function () {
+                            user.finishOrder(orderId, function (res) {
+                                if (res.success) {
+                                    $doc.trigger('spa:navigate', {
+                                        hash: 'order-done'
+                                    });
+                                } else {
+                                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                        message: res.message
+                                    }]);
+                                }
+                            });
+                        }
+                    }, {
+                        text: '取消',
+                        class: 'btn-default',
+                        callback: function () {
 
-      // 追加服务
-      $.newTouch('.order-btn-append', function(event) {
-        var appendType = $(this).attr('data-type');
-        var orderID = $(this).attr('data-order-id');
-        var petName = $(this).attr('data-order-name');
+                        }
+                    }]
+                }]);
+            }, $view);
 
-        var i = $(this).parents('.table-view').index();
-        $doc.trigger('spa:navigate', {
-					hash: 'append',
-					pushData: {
-            appendType: appendType,
-            orderID: orderID,
-            petName: petName,
-            index: i
-					}
-				});
-      }, $view);
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            var tpl = template('myOrder/index', {
+                showNavBar: !config.isWX && !config.isChubao,
+                type: t == 0 ? pageData.requestData[0] : t
+            });
+            $('.spa-page-body', $view).html(tpl);
 
-      // 确认完成
-      $.newTouch('.order-btn-done', function(event) {
-        event.preventDefault();
-        var orderId = $(this).attr('data-order-id');
-        $doc.trigger('spa:openpanel', ['simpleAlert', {
-          message: '确认服务已完成？',
-          buttons: [{
-            text: '确认',
-            class: 'btn-primary',
-            callback: function() {
-              user.finishOrder(orderId, function(res) {
-                if (res.success) {
-                  $doc.trigger('spa:navigate', {
-          					hash: 'order-done'
-          				});
-                } else {
-                  $doc.trigger('spa:openpanel', ['simpleAlert', {
-                    message: res.message
-                  }]);
-                }
-              });
+            if (pageData.scroll) {
+                pageData.scroll.destroy();
+                pageData.scroll = null;
             }
-          },{
-            text: '取消',
-            class: 'btn-default',
-            callback: function() {
+            var orderType = t == 0 ? pageData.requestData[0] : t;
+            // var orderType = parseFloat(pageData.requestData[0]) || 1;
+            var orderArray = [1, 3, 2];
 
+            reloadData.call(this, pageData, orderArray[orderType - 1]);
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            dtd.resolve();
+            if (config.isWX) {
+                wx.ready(function () {
+                    wx.onMenuShareTimeline({
+                        title: '家政服务，首选壹管家',
+                        link: 'http://www.yiguanjia.me/o2o/web/index',
+                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+                    });
+                    wx.onMenuShareAppMessage({
+                        title: '家政服务，首选壹管家',
+                        desc: '全程管家，精心每一个细节！',
+                        link: 'http://www.yiguanjia.me/o2o/web/index',
+                        imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
+                    });
+                });
             }
-          }]
-        }]);
-      }, $view);
-
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
-        var tpl = template('myOrder/index', {
-          showNavBar: !config.isWX && !config.isChubao,
-          type: t == 0 ? pageData.requestData[0]: t
-        });
-        $('.spa-page-body', $view).html(tpl);
-
-        if (pageData.scroll) {
-          pageData.scroll.destroy();
-          pageData.scroll = null;
+        },
+        afterclose: function (pageData, dtd) {
+            t = 0;
         }
-        var orderType = t == 0 ? pageData.requestData[0]: t;
-        // var orderType = parseFloat(pageData.requestData[0]) || 1;
-        var orderArray = [1, 3, 2];
-
-  			reloadData.call(this, pageData, orderArray[orderType - 1]);
-			dtd.resolve();
-		},
-		afteropen: function (pageData, dtd) {
-      var $view = this;
-      dtd.resolve();
-      if (config.isWX) {
-        wx.ready(function(){
-          wx.onMenuShareTimeline({
-            title: '家政服务，首选壹管家',
-            link: 'http://www.yiguanjia.me/o2o/web/index',
-            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-          });
-          wx.onMenuShareAppMessage({
-            title: '家政服务，首选壹管家',
-            desc: '全程管家，精心每一个细节！',
-            link: 'http://www.yiguanjia.me/o2o/web/index',
-            imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
-          });
-        });
-      }
-		},
-    afterclose: function(pageData, dtd) {
-      t = 0;
     }
-	}
 })

www/webapp/o2o/tpl/mine/index.html

@@ -1,10 +1,55 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
+{{ if showNavBar }}
+<header class="bar bar-nav">
+    <a class="left-button back-button">
+        <div class="icon icon-left-nav"></div>
+    </a>
+    <h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+<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;">{{userName}}</div>
+        <div style="width: 100%; padding-bottom: 20px; text-align: center;">余额：{{userBalance}}元</div>
+    </div>
+    <ul class="table-view" style="margin-top: 10px;">
+        <li class="table-view-cell">
+            <a class="navigate-right btn-my-order">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                我的订单
+            </a>
+        </li>
+        <li class="table-view-cell">
+            <a class="navigate-right btn-address-list">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                常用地址
+                <span class="table-view-cell-right-label">上海市天平路徐家汇</span>
+            </a>
+        </li>
+        <li class="table-view-cell">
+            <a class="navigate-right btn-recharge">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                充值卡
+            </a>
+        </li>
+        <li class="table-view-cell">
+            <a class="navigate-right btn-coupon">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                代金券
+            </a>
+        </li>
+        <li class="table-view-cell">
+            <a class="navigate-right btn-helper">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                帮助中心
+            </a>
+        </li>
+        <li class="table-view-cell">
+            <a class="navigate-right btn-about">
+                <img src="http://odulvej8l.bkt.clouddn.com/tab_me_pre.png" width="18px" height="18px"/>
+                关于壹管家
+            </a>
+        </li>
+    </ul>
+    <div style="width: 100%; padding-top: 100px;text-align: center; color: #b6bbc2; font-size:16px;">专属管家    服务无忧</div>
+</div>

www/webapp/o2o/tpl/recharge/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>