浏览代码

后退导航

jmx 9 年之前
父节点
当前提交
40a241eb73

文件差异内容过多而无法显示
+ 0 - 0
www/webapp/o2o/dist/js/main.js


文件差异内容过多而无法显示
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


+ 1 - 1
www/webapp/o2o/dist/js/page/mine.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","native","config","address"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.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(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",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()},i),e.newTouch(".btn-about",function(){event.preventDefault()},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(pushData.hasOwnProperty("needReset")&&pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","native","config","address"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"我的",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.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(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",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()},i),e.newTouch(".btn-about",function(){event.preventDefault()},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -100,7 +100,10 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                 event.preventDefault();
                 user.checkLogin(function () {
                     $doc.trigger('spa:navigate', {
-                        hash: 'mine'
+                        hash: 'mine',
+                        pushData: {
+                            needReset: true
+                        }
                     });
                 });
             }, $view);

+ 1 - 2
www/webapp/o2o/js/page/mine.js

@@ -128,8 +128,7 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
             var $view = this;
             var $doc = $(document);
 
-            if (pushData.hasOwnProperty('needReset') && pushData.needReset) {
-
+            if (pageData.pushData && pageData.pushData.needReset) {
                 var addressStr = '';
                 var defaultAddress = address.defaultAddress;
                 if (defaultAddress.address.poi) {

部分文件因为文件数量过多而无法显示