mine-3

www/webapp/o2o/css/mine.css

@@ -180,14 +180,14 @@ body {
         height: 40px;
     }
 }
-/*当其最大宽度为360*/
+/*当其最小宽度为360*/
 @media (min-width: 360px) {
     #mineScroll div .user .user-name {
         top: 9rem;
     }
     #mineScroll div .user-balance {
-        /*font-size: 1rem;
-        margin-top: 0.5rem;*/
+        font-size: 1rem;
+        margin-top: 0.5rem;
     }
     #mineScroll div .mine-type div img {
         /*width: 40px;

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

@@ -1 +1 @@
-define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll");var e=new Swiper(".swiper-container",{pagination:".swiper-pagination",nextButton:".swiper-button-next",prevButton:".swiper-button-prev",paginationClickable:!0,spaceBetween:30,centeredSlides:!0,autoplay:1500,autoplayDisableOnInteraction:!1})},500),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});
+define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},o),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll");var e=new Swiper(".swiper-container",{pagination:".swiper-pagination",nextButton:".swiper-button-next",prevButton:".swiper-button-prev",paginationClickable:!0,spaceBetween:30,centeredSlides:!0,autoplay:1500,autoplayDisableOnInteraction:!1})},500),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function(ba
     }
     User.instance = this;
     this.storagePrefix = 'user_';
-    this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c
+    this.id = ''; //57e22bb59f5160c2048b456c
     this.lastID = this.getCache('lastID', null, '');
     this.name = '';
     this.mobile = '';

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

@@ -46,7 +46,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                 native.call('4000328170');
             }, $view);
             //点击banner-1进入充值卡页
-            /*$.newTouch('.btn-banner-recharge', function (event) {
+            $.newTouch('.btn-banner-recharge', function (event) {
                 event.preventDefault();
                 $doc.trigger('spa:navigate', {
                     hash: 'recharge',
@@ -54,9 +54,9 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                         needReload: true
                     }
                 });
-            }, $view);*/
+            }, $view);
             //点击banner-2进入充值卡页面
-            /*$.newTouch('.btn-banner-coupon', function (event) {
+            $.newTouch('.btn-banner-coupon', function (event) {
                 event.preventDefault();
                 $doc.trigger('spa:navigate', {
                     hash: 'myCoupon',
@@ -64,7 +64,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                         needReload: true
                     }
                 });
-            }, $view);*/
+            }, $view);
             /* 点击产品列表的某一项 */
             $.newTouch('.btn-product', function (event) {
                 event.preventDefault();

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

@@ -115,6 +115,13 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
                     hash: 'about'
                 });
             }, $view);
+            //首页
+            $.newTouch('.btn-action-my-order', function () {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: ''
+                });
+            }, $view);
 
             /* 定义按钮事件结束。*/
 

www/webapp/o2o/js/page/pay.js

@@ -92,6 +92,10 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                 event.preventDefault();
                 back.call(this, event);
             });
+            /*$view.on('swipeRight', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            });*/
 
             dtd.resolve();
         },