Merge remote-tracking branch 'origin/release/5.5' into gray

@@ -40,10 +40,12 @@ $area.on('click', function() {
 $btnSure.on('click', function() {
 $btnSure.on('click', function() {
     $.post('/home/orders/changeAddress', $areaForm.serialize(), function(result) {
     $.post('/home/orders/changeAddress', $areaForm.serialize(), function(result) {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
-            tip.show(result.msg);
+            if (result.data && result.data.is_modified === 'Y') {
+                tip.show(result.data.tips);
+            }
             location.href = document.referrer;
             location.href = document.referrer;
         } else {
         } else {
-            tip.show('系统错误，请重试！');
+            tip.show((result && result.message) || '系统错误，请重试！');
         }
         }
     });
     });
 });
 });