Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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){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})}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()}}});

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

@@ -118,7 +118,6 @@ define(['template', 'native', 'config', 'address', 'api', 'user'], function (tem
 					var address_position = addressInfo.position;
 					address_position = JSON.stringify(address_position);
 				}
-
 				var param = {
 					request_from: 'weixin',
 					name: name,
@@ -133,13 +132,13 @@ define(['template', 'native', 'config', 'address', 'api', 'user'], function (tem
 					if (res.success) {
 						console.log(res);
 						console.log(cachePageData.address_detail);
-						/*$doc.trigger('spa:navigate', {
-						 hash: 'addressList',
-						 pushData: {
-						 needReload: true
-						 },
-						 callback: cachePageData.callback
-						 });*/
+						$doc.trigger('spa:navigate', {
+							hash: 'addressList',
+							pushData: {
+								dontNeedReload: true,
+								address:address
+							}
+						});
 					} else {
 						$doc.trigger('spa:openpanel', ['simpleAlert', {
 							message: res.message

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

@@ -1,94 +1,97 @@
 define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'], function ($, template, native, config, address, user, api, order) {
 
-    /* 返回上一级 */
-    function back(event, backHash) {
-        event.preventDefault();
-        $(document).trigger('spa:navigate', {
-            hash: backHash
-        });
-    }
+	/* 返回上一级 */
+	function back(event, backHash) {
+		event.preventDefault();
+		$(document).trigger('spa:navigate', {
+			hash: backHash
+		});
+	}
 
-    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);
 
-            /* 三个返回操作 */
-            $.newTouch('.back-button', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
-            }, $view);
-            $view.on('tapBackButton', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
-            });
-            $view.on('swipeRight', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
-            });
+			/* 三个返回操作 */
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event, pageData.pushData.backHash);
+			}, $view);
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event, pageData.pushData.backHash);
+			});
+			$view.on('swipeRight', function (event) {
+				back.call(this, event, pageData.pushData.backHash);
+			});
 
-            /* 点击一条地址 */
-            $.newTouch('.address-item', function (event) {
-                var addressID = $(this).data('id'),
-                    addressIndex = $(this).data('index');
-                /* 检查用户的地址是否在服务站内 */
-                api.checkAddress({
-                    address_id: addressID,
-                    user_id: user.id
-                }, function (res) {
-                    if (res.success) {
-                        /* 如果在，应该返回placeOrder页面，把数据更新的回调写在placeOrder */
-                        $view.trigger('tapBackButton');
-                        if (pageData.callback && $.isFunction(pageData.callback.onSelect)) {
-                            pageData.callback.onSelect(address.list[addressIndex], res.data.station);
-                        }
-                    } else {
-                        /* 如果不在，弹出一个对话框。 */
-                        $doc.trigger('spa:openpanel', ['simpleAlert', {
-                            message: res.message
-                        }]);
-                    }
-                });
-            }, $view);
+			/* 点击一条地址 */
+			$.newTouch('.address-item', function (event) {
+				var addressID = $(this).data('id'),
+					addressIndex = $(this).data('index');
+				/* 检查用户的地址是否在服务站内 */
+				api.checkAddress({
+					address_id: addressID,
+					user_id: user.id
+				}, function (res) {
+					if (res.success) {
+						/* 如果在，应该返回placeOrder页面，把数据更新的回调写在placeOrder */
+						$view.trigger('tapBackButton');
+						if (pageData.callback && $.isFunction(pageData.callback.onSelect)) {
+							pageData.callback.onSelect(address.list[addressIndex], res.data.station);
+						}
+					} else {
+						/* 如果不在，弹出一个对话框。 */
+						$doc.trigger('spa:openpanel', ['simpleAlert', {
+							message: res.message
+						}]);
+					}
+				});
+			}, $view);
 
-            /* 点击添加地址，跳转到addressAdd页面。不用回调，返回时刷新，简单一点。 */
-            $.newTouch('.btn-add', function (event) {
-                $doc.trigger('spa:navigate', {
-                    hash: 'addressAdd',
-                    pushData: {
-                        needReload: true
-                    }
-                });
-            }, $view);
+			/* 点击添加地址，跳转到addressAdd页面。不用回调，返回时刷新，简单一点。 */
+			$.newTouch('.btn-add', function (event) {
+				$doc.trigger('spa:navigate', {
+					hash: 'addressAdd',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
 
-            /* 点击修改地址，跳转到addressDetail页面 */
-            $.newTouch('.btn-edit', function (event) {
-                var addressID = $(this).data('id'),
-                    addressIndex = $(this).data('index');
-                $doc.trigger('spa:navigate', {
-                    hash: 'addressDetail',
-                    pushData: {
-                        addressIndex: addressIndex,
-                        addressID: addressID,
-                        needReload: true
-                    }
-                });
-            }, $view);
+			/* 点击修改地址，跳转到addressDetail页面 */
+			$.newTouch('.btn-edit', function (event) {
+				var addressID = $(this).data('id'),
+					addressIndex = $(this).data('index');
+				$doc.trigger('spa:navigate', {
+					hash: 'addressDetail',
+					pushData: {
+						addressIndex: addressIndex,
+						addressID: addressID,
+						needReload: true
+					}
+				});
+			}, $view);
 
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            var $view = this;
-            var tpl = template('address/list/index', {
-                showNavBar: !config.isWX && !config.isChubao,
-                addText: '添加地址',
-                addresses: address.list
-            });
-            $('.spa-page-body', $view).html(tpl);
+			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);
 
-            dtd.resolve();
-        },
-        afteropen: function (pageData, dtd) {
-            dtd.resolve();
-        }
-    };
+			}
+
+			dtd.resolve();
+		},
+		afteropen: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	};
 })

www/webapp/o2o/js/page/placeOrder.js

@@ -257,21 +257,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			$view.on('swipeRight', function (event) {
 				back.call(this, event);
 			});
-			/* 点击查看详情。跳转到product页面 */
-			// $.newTouch('.product-pic-o2o', function (event) {
-			// 	$doc.trigger('spa:navigate', {
-			// 		hash: 'product',
-			// 		pushData: {
-			// 			produc: product,
-			// 			needReload: true
-			// 		}
-			// 	});
-			// }, $view);
-
-			/*特效*/
-			// setInterval(function run() {
-			// 	$('.product-img').fadeToggle();
-			// }, 500);
 			/* 点击选择extra。 */
 			$.newTouch('.btn-main-service', function (event) {
 				/* on代表这一条的选中状态。如果已经选中了，就return。this的作用域是这一条extra。 */
@@ -900,7 +885,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				if (user.id.length == 0) {
 					$('.order-mobile').html('添加服务地址');
 				} else if (user.id.length != 0 && typeof(defaultAddress) !== "undefined") {
-					console.log("已登录（有地址）");
 					order.address = address.defaultAddress;
 					$('.order-username').html(defaultAddress.name);
 					$('.order-mobile').html(defaultAddress.mobile);
@@ -908,19 +892,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				} else if (user.id.length != 0 && typeof(defaultAddress) == "undefined") {
 					$('.order-mobile').html('添加服务地址');
 				}
-				/*已登录（有地址）*/
-				/*已登录（无地址）*/
-				// if (typeof(defaultAddress) == "undefined" || typeof(address.defaultAddress.length) == "undefined") {//登陆与未登录  默认地址判断
-				// 	$('.order-mobile').html('添加服务地址');
-				// }
-				// if (typeof(defaultAddress) !== "undefined") {
-				// 	console.log();
-				// 	console.log('测试');
-				// 	order.address = address.defaultAddress;
-				// 	$('.order-username').html(defaultAddress.name);
-				// 	$('.order-mobile').html(defaultAddress.mobile);
-				// 	$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail).css('text-align', 'right');
-				// }
 			}, 500);
 			var $view = this;
 			var pushData = pageData.pushData;