Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue

@@ -119,7 +119,11 @@ $submit.on('touchend', function() {
 });
 });
 
 
 // 省市区列表异步加载
 // 省市区列表异步加载
-$.get('/home/locationList').then(function(html) {
+$.ajax({
+    method: 'GET',
+    url: '/home/locationList',
+    timeout: 60000
+}).then(function(html) {
     $addressListPage.html(html);
     $addressListPage.html(html);
 
 
     // 省市区
     // 省市区
@@ -141,7 +145,7 @@ $.get('/home/locationList').then(function(html) {
             if (e.target.tagName.toLowerCase() !== 'li') {
             if (e.target.tagName.toLowerCase() !== 'li') {
                 $this = $this.parent('li');
                 $this = $this.parent('li');
             }
             }
-            newArea.push($this.children('.caption').text());
+            newArea.push($this.children('.caption').text().trim());
             $this.siblings().hide();
             $this.siblings().hide();
             $this.children('ul').show().children('li').show();
             $this.children('ul').show().children('li').show();
 
 
@@ -157,7 +161,7 @@ $.get('/home/locationList').then(function(html) {
             var $this = $(e.target);
             var $this = $(e.target);
 
 
             // 填结果到 html
             // 填结果到 html
-            newArea.push($this.children('.caption').text());
+            newArea.push($this.text().trim());
             $('[name="area"]').val(newArea.join(' '));
             $('[name="area"]').val(newArea.join(' '));
             $('[name="area_code"]').val($this.data('id'));
             $('[name="area_code"]').val($this.data('id'));