address

www/webapp/o2o/dist/js/page/address/addressList.js

@@ -1 +1 @@
-define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,t.pushData.backHash)},r),r.on("tapBackButton",function(e){a.call(this,e,t.pushData.backHash)}),r.on("swipeRight",function(e){a.call(this,e,t.pushData.backHash)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){console.log(f.callback),u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:f.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),l=n.pushData;f.needReload=l.hasOwnProperty("needReload")?l.needReload:!1,f.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),f.scroll&&(f.scroll.destroy(),f.scroll=null),setTimeout(function(){f.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});
+define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f,l={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,f)},r),r.on("tapBackButton",function(e){a.call(this,e,f)}),r.on("swipeRight",function(e){a.call(this,e,f)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){console.log(l.callback),u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:l.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),c=n.pushData;f=c.backHash,f!=="mine"&&(f="placeOrder"),console.log(f),l.needReload=c.hasOwnProperty("needReload")?c.needReload:!1,l.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),l.scroll&&(l.scroll.destroy(),l.scroll=null),setTimeout(function(){l.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});

www/webapp/o2o/js/page/address/addressList.js

@@ -1,4 +1,4 @@
-define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'], function ($,template, native, config, address, user, api, order) {
+define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'], function ($, template, native, config, address, user, api, order) {
     /* 返回上一级 */
     function back(event, backHash) {
         event.preventDefault();
@@ -6,6 +6,8 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             hash: backHash
         });
     }
+
+    var hash;
     var cachePageData = {}; //page内部的数据传递
 
     return {
@@ -16,13 +18,13 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             var $doc = $(document);
             /* 三个返回操作 */
             $.newTouch('.back-button', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             }, $view);
             $view.on('tapBackButton', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             });
             $view.on('swipeRight', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             });
 
             /* 点击一条地址 */
@@ -83,17 +85,22 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             }, $view);
             dtd.resolve();
         },
-        beforeopen: function(pageData, dtd) {
+        beforeopen: function (pageData, dtd) {
             var $view = this;
             var $doc = $(document);
             var pushData = pageData.pushData;
+            hash = pushData.backHash;
+            if (hash !== 'mine') {
+                hash = 'placeOrder';
+            }
+            console.log(hash);
             cachePageData.needReload = pushData.hasOwnProperty('needReload') ? pushData.needReload : false;
             // if (cachePageData.needReload) {
             cachePageData.callback = pageData.callback;
             address.getList({
                 request_from: 'weixin',
                 user_id: user.id
-            }, function(res) {
+            }, function (res) {
                 if (res.success) {
                     var tpl = template('address/list/index', {
                         showNavBar: !config.isWX && !config.isChubao,
@@ -105,10 +112,11 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
                         cachePageData.scroll.destroy();
                         cachePageData.scroll = null;
                     }
-                    setTimeout(function() {
+                    setTimeout(function () {
                         cachePageData.scroll = new IScroll('#addressListScroll');
                     }, 10);
-                };
+                }
+                ;
             });
             // }