默认地址

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})}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");console.log(n),console.log(r),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

@@ -169,7 +169,7 @@ define(['template', 'native', 'config', 'address', 'api', 'user'], function (tem
 			var $view = this;
 			var $doc = $(document);
 			var pushData = pageData.pushData;
-			console.log(address);
+			console.log(pushData);
 			cachePageData.needReload = pushData.needReload;
 			if (cachePageData.needReload) {
 				pushData.needReload = false;

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

@@ -64,6 +64,8 @@ define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'],
 			$.newTouch('.btn-edit', function (event) {
 				var addressID = $(this).data('id'),
 					addressIndex = $(this).data('index');
+				console.log(addressID);
+				console.log(addressIndex);
 				$doc.trigger('spa:navigate', {
 					hash: 'addressDetail',
 					pushData: {

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

@@ -233,8 +233,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				 * var tpl = template(html文件路径，数据)
 				 */
 				var tpl = template('home/index', {
-					// showNavBar: !config.isWX && !config.isChubao
-					showNavBar: true
+					showNavBar: !config.isWX && !config.isChubao
 				});
 				/*
 				 * jQuery：

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

@@ -293,7 +293,6 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 							onSelect: function (address, station) {
 								order.set('address', address, true);
 								order.set('stationID', station, true);
-
 								var addressStr = '';
 								if (order.address.address.poi) {
 									addressStr = order.address.address.city + order.address.address.area + order.address.address.poi.name + order.address.address.detail
@@ -884,10 +883,20 @@ 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") {
-					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');
+					api.checkAddress({
+						address_id: defaultAddress.address_id,
+						user_id: user.id
+					}, function (res) {
+						if (res.success) {
+							order.address = address.defaultAddress;
+							order.stationID = res.data.station;
+							$('.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');
+						} else {
+							$('.order-mobile').html('添加服务地址');
+						}
+					})
 				} else if (user.id.length != 0 && typeof(defaultAddress) == "undefined") {
 					$('.order-mobile').html('添加服务地址');
 				}
@@ -910,8 +919,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					/* 环境，目前只决定是否显示保洁师 */
 					env: config,
 					/* 环境 */
-					// showNavBar: !config.isWX && !config.isChubao,
-					showNavBar: true,
+					showNavBar: !config.isWX && !config.isChubao,
 					imgSrc: product.imgSrc,
 					/* 标题栏的标题 */
 					title: product.name,
@@ -937,31 +945,31 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 
 				/* 软键盘相关操作时对IScroll的补偿 */
 				fixScroll(pageData);
-			/*	$('.order-memo', $view).focus(function (event) {
-					alert("触发focus事件");
-					var that = this;
-					checkScroll(pageData, function () {
-						if (pageData.scroll) {
-							pageData.scroll.scrollToElement(that, 0);
-
-						}
-					});
-				});
-				$('.order-memo', $view).on('closeKeyboard', function (event) {
-					alert("触发closeKeyboard事件");
-					checkScroll(pageData);
-					$(this).blur();
-				});
-				$('.order-memo', $view).blur(function (event) {
-					alert("触发blur事件");
-					checkScroll(pageData);
-				});*/
+				/*	$('.order-memo', $view).focus(function (event) {
+				 alert("触发focus事件");
+				 var that = this;
+				 checkScroll(pageData, function () {
+				 if (pageData.scroll) {
+				 pageData.scroll.scrollToElement(that, 0);
+
+				 }
+				 });
+				 });
+				 $('.order-memo', $view).on('closeKeyboard', function (event) {
+				 alert("触发closeKeyboard事件");
+				 checkScroll(pageData);
+				 $(this).blur();
+				 });
+				 $('.order-memo', $view).blur(function (event) {
+				 alert("触发blur事件");
+				 checkScroll(pageData);
+				 });*/
 
 				/* 填写备注时，提交按钮失焦 */
 				/*$('#order-form', $view).on('submit', function (event) {
-					$(this).blur();
-					return false;
-				});*/
+				 $(this).blur();
+				 return false;
+				 });*/
 			}
 			dtd.resolve();
 		},

www/webapp/o2o/js/page/product.js

@@ -213,8 +213,7 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 							// picLists: cachePageData.product.pics,
 							picLists: dataArray,
 							commentCounts: commentCounts,
-							// showNavBar: !config.isWX && !config.isChubao,
-							showNavBar: true
+							showNavBar: !config.isWX && !config.isChubao,
 							// isShowVideo: isShowVideo()
 						});
 						$('.spa-page-body', $view).html(tpl);

www/webapp/o2o/tpl/address/detail/index.html

@@ -4,7 +4,7 @@
     <div class="icon icon-left-nav"></div>
   </a>
   {{if !add}}
-  <a class="right-button btn-delete" data-id="{{address.address_id}}">删除</a>
+  <!--<a class="right-button btn-delete" data-id="{{address.address_id}}">删除</a>-->
   {{/if}}
   <h1 class="title">{{title}}</h1>
 </header>

www/webapp/o2o/tpl/placeOrder/index.html

@@ -83,7 +83,7 @@
 							</li>
 							<li class="table-view-cell memo">
 								<form class="input-group" id="order-form">
-									<input type="text" class="order-memo" id="order-memo" placeholder="（备注1）可填写附加要求">
+									<input type="text" class="order-memo" id="order-memo" placeholder="（备注2）可填写附加要求">
 								</form>
 							</li>
 						</ul>