更新到201512021800静态资源

@@ -3762,7 +3762,7 @@ var opt = {};
 
 var paramStr = window.location.search.split('?')[1];
 
-var keyVal = paramStr.split('&');
+var keyVal = paramStr ? paramStr.split('&') : [];
 
 var i, key, val;
 
@@ -6738,6 +6738,7 @@ $confim.on('touchend', '.cancel', function() {
     $confim.hide();
 }).on('touchend', '.confim', function() {
     loading.showLoadingMask();
+    $confim.hide();
     $.ajax({
         method: 'POST',
         url: '/home/delAddress',
@@ -6750,15 +6751,15 @@ $confim.on('touchend', '.cancel', function() {
         }
         if (res.code !== 200) {
             tip.show(res.message || '网络出了点问题~');
+            loading.hideLoadingMask();
         } else {
             window.location.reload();
         }
     }).fail(function() {
         tip.show('网络出了点问题~');
+        loading.hideLoadingMask();
     }).always(function() {
         deleteId = null;
-        $confim.hide();
-        loading.hideLoadingMask();
     });
 });
 
@@ -6782,7 +6783,7 @@ $action.on('touchend', '.del', function() {
 
 $submit.on('touchend', function() {
     if (security.hasDangerInput(false)) {
-      return false;
+        return false;
     }
     $addressForm.submit();
     return false;
@@ -6792,7 +6793,6 @@ $submit.on('touchend', function() {
     $(this).removeClass('highlight');
 });
 
-
 });
 define("js/me/browse-record", ["jquery","lazyload","handlebars","source-map","hammer"], function(require, exports, module){
 /**
@@ -6930,11 +6930,11 @@ var $addressForm = $('.edit-address'),
     $submit = $('.submit'),
     $editAddressPage = $('.my-edit-address-page'),
     $addressListPage = $('.my-address-list-page'),
-    $area = $('.area'),
     $footer = $('#yoho-footer'),
     $backBtn = $('.nav-back'),
     $navTitle = $('.nav-title'),
     navTitle = $navTitle.html(),
+    $area = $('.area'),
     isSubmiting,
     currentPage = 'edit',
     newArea = [];
@@ -6957,7 +6957,7 @@ $backBtn.on('touchend', function(e) {
 
         // 恢复默认的三级选择
         $addressListPage.hide();
-        $addressListPage.find('ul').hide();
+        $addressListPage.find('ul').hide().find('li').removeClass('highlight');
         $addressListPage.children('ul').show().children('li').show();
         newArea = [];
     } else {
@@ -7026,6 +7026,12 @@ $submit.on('touchend', function() {
     $(this).removeClass('highlight');
 });
 
+$('input, textarea').on('focus', function() {
+    $footer.hide();
+}).on('blur', function() {
+    $footer.show();
+});
+
 // 省市区
 $area.on('touchend', function() {
     $editAddressPage.hide();
@@ -7036,61 +7042,61 @@ $area.on('touchend', function() {
     $navTitle.html('地区选择');
 });
 
-// touchend 在下滑的时候会触发
-// 省市区联动
-$addressListPage.find('.address').each(function(i, elem) {
-    var addressHammer = new Hammer(elem);
+// 省市区列表异步加载
+$.get('/home/locationList').then(function(html) {
+    $addressListPage.html(html);
 
-    addressHammer.on('tap', function(e) {
-        var $this = $(e.target);
+    // touchend 在下滑的时候会触发
+    // 省市区联动
+    $addressListPage.find('.address').each(function(i, elem) {
+        var addressHammer = new Hammer(elem);
 
-        newArea.push($this.children('.caption').text());
-        $this.siblings().hide();
-        $this.children('ul').show().children('li').show();
+        addressHammer.on('tap', function(e) {
+            var $this = $(e.target);
 
-        $(this).removeClass('highlight');
-        e.srcEvent.preventDefault();
-        e.srcEvent.stopPropagation();
+            newArea.push($this.children('.caption').text());
+            $this.siblings().hide();
+            $this.children('ul').show().children('li').show();
+
+            e.srcEvent.preventDefault();
+            e.srcEvent.stopPropagation();
+        });
     });
-});
 
-$addressListPage.find('.address-last').each(function(i, elem) {
-    var addressLastHammer = new Hammer(elem);
+    $addressListPage.find('.address-last').each(function(i, elem) {
+        var addressLastHammer = new Hammer(elem);
 
-    addressLastHammer.on('tap', function(e) {
-        var $this = $(e.target);
+        addressLastHammer.on('tap', function(e) {
+            var $this = $(e.target);
 
-        // 填结果到 html
-        newArea.push($this.children('.caption').text());
-        $('[name="area"]').val(newArea.join(' '));
-        $('[name="area_code"]').val($this.data('id'));
+            // 填结果到 html
+            newArea.push($this.children('.caption').text());
+            $('[name="area"]').val(newArea.join(' '));
+            $('[name="area_code"]').val($this.data('id'));
 
-        $editAddressPage.show();
-        currentPage = 'edit';
-        $navTitle.html(navTitle);
-        $footer.show();
+            $editAddressPage.show();
+            currentPage = 'edit';
+            $navTitle.html(navTitle);
+            $footer.show();
 
-        // 恢复默认的三级选择
-        $addressListPage.hide();
-        $addressListPage.find('ul').hide();
-        $addressListPage.children('ul').show().children('li').show();
-        newArea = [];
+            // 恢复默认的三级选择
+            $addressListPage.hide();
+            $addressListPage.find('ul').hide().find('li').removeClass('highlight');
+            $addressListPage.children('ul').show().children('li').show();
+            newArea = [];
 
-        e.srcEvent.preventDefault();
-        e.srcEvent.stopPropagation();
+            e.srcEvent.preventDefault();
+            e.srcEvent.stopPropagation();
+        });
     });
-});
 
-$addressListPage.on('touchstart', 'li', function() {
-    $(this).addClass('highlight');
-}).on('touchend touchcancel', 'li', function() {
-    $(this).removeClass('highlight');
-});
-
-$('input, textarea').on('focus', function() {
-    $footer.hide();
-}).on('blur', function() {
-    $footer.show();
+    $addressListPage.on('touchstart', 'li', function() {
+        $(this).addClass('highlight');
+    }).on('touchend touchcancel', 'li', function() {
+        $(this).removeClass('highlight');
+    });
+}).fail(function() {
+    tip.show('获取省市区列表失败');
 });
 
 });