用户地址选择

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})}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){u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0}})},r),e.newTouch(".btn-edit",function(t){var n=e(this).data("id"),r=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:r,addressID:n,needReload:!0}})},r),n.resolve()},beforeopen:function(n,s){if(!n.pushData.dontNeedReload){var o=this,u=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",o).html(u)}s.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={};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()}}});

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

@@ -130,8 +130,6 @@ define(['template', 'native', 'config', 'address', 'api', 'user'], function (tem
 				address.editAddress(param, function (res) {
 					$doc.trigger('spa:closeloader');
 					if (res.success) {
-						console.log(res);
-						console.log(cachePageData.address_detail);
 						$doc.trigger('spa:navigate', {
 							hash: 'addressList',
 							pushData: {
@@ -169,7 +167,6 @@ define(['template', 'native', 'config', 'address', 'api', 'user'], function (tem
 			var $view = this;
 			var $doc = $(document);
 			var pushData = pageData.pushData;
-			console.log(address);
 			cachePageData.needReload = pushData.needReload;
 			if (cachePageData.needReload) {
 				pushData.needReload = false;

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

@@ -1,5 +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();
@@ -7,6 +6,7 @@ define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'],
 			hash: backHash
 		});
 	}
+	var cachePageData = {}; //page内部的数据传递
 
 	return {
 		title: '壹管家上门服务',
@@ -14,7 +14,6 @@ define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'],
 		init: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
-
 			/* 三个返回操作 */
 			$.newTouch('.back-button', function (event) {
 				back.call(this, event, pageData.pushData.backHash);
@@ -50,43 +49,68 @@ define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'],
 				});
 			}, $view);
 
-			/* 点击添加地址，跳转到addressAdd页面。不用回调，返回时刷新，简单一点。 */
+			// 新增地址
 			$.newTouch('.btn-add', function (event) {
+				console.log(cachePageData.callback);
 				$doc.trigger('spa:navigate', {
 					hash: 'addressAdd',
 					pushData: {
 						needReload: true
-					}
+					},
+					callback: cachePageData.callback
 				});
 			}, $view);
 
-			/* 点击修改地址，跳转到addressDetail页面 */
+			// 修改地址
 			$.newTouch('.btn-edit', function (event) {
-				var addressID = $(this).data('id'),
+				var $addressItem = $(this),
+					addressID = $(this).data('id'),
 					addressIndex = $(this).data('index');
+
 				$doc.trigger('spa:navigate', {
 					hash: 'addressDetail',
 					pushData: {
 						addressIndex: addressIndex,
 						addressID: addressID,
 						needReload: true
+					},
+					callback: {
+						onSelect: function (addressID) {
+
+						}
 					}
 				});
 			}, $view);
-
 			dtd.resolve();
 		},
-		beforeopen: function (pageData, dtd) {
-			if (!pageData.pushData.dontNeedReload) {
-				var $view = this;
-				var tpl = template('address/list/index', {
-					showNavBar: !config.isWX && !config.isChubao,
-					addText: '添加地址',
-					addresses: address.list
-				});
-				$('.spa-page-body', $view).html(tpl);
-
-			}
+		beforeopen: function(pageData, dtd) {
+			var $view = this;
+			var $doc = $(document);
+			var pushData = pageData.pushData;
+			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) {
+				if (res.success) {
+					var tpl = template('address/list/index', {
+						showNavBar: !config.isWX && !config.isChubao,
+						addText: '添加地址',
+						addresses: address.list
+					});
+					$('.spa-page-body', $view).html(tpl);
+					if (cachePageData.scroll) {
+						cachePageData.scroll.destroy();
+						cachePageData.scroll = null;
+					}
+					setTimeout(function() {
+						cachePageData.scroll = new IScroll('#addressListScroll');
+					}, 10);
+				};
+			});
+			// }
 
 			dtd.resolve();
 		},