Merge branch 'gray' into 'master'

解決地址选择为空的问题

冒泡导致地址ID没有正确获取

See merge request !2

@@ -189,12 +189,12 @@ function bindAddressListEvent(html) {
 }
 
 // 读取省市区列表缓存
-if (window.localStorage && window.localStorage.getItem) {
-    chinaAddressList = window.localStorage.getItem('chinaAddressList');
-}
-if (chinaAddressList) {
-    bindAddressListEvent(chinaAddressList);
-} else {
+// if (window.localStorage && window.localStorage.getItem) {
+//     chinaAddressList = window.localStorage.getItem('chinaAddressList');
+// }
+// if (chinaAddressList) {
+//     bindAddressListEvent(chinaAddressList);
+// } else {
 
     // 省市区列表异步加载
     $.ajax({
@@ -203,10 +203,10 @@ if (chinaAddressList) {
         timeout: 60000
     }).then(function(html) {
         bindAddressListEvent(html);
-        if (window.localStorage && window.localStorage.setItem) {
-            window.localStorage.setItem('chinaAddressList', html);
-        }
+        // if (window.localStorage && window.localStorage.setItem) {
+        //     window.localStorage.setItem('chinaAddressList', html);
+        // }
     }).fail(function() {
         tip.show('获取省市区列表失败');
     });
-}
+// }

 {
   "name": "yohobuy",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -11,7 +11,7 @@
                 <ul class="address-list">
                 {{# sub}}
                         <li class="address-last" data-id="{{code}}">
-                            <span class="caption">{{caption}}</span>
+                            <span class="caption" data-id="{{code}}">{{caption}}</span>
                         </li>
                 {{/ sub}}
                 </ul>

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.2.1"
+application.version = "5.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.2.1"
+application.version = "5.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.2.1"
+application.version = "5.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.2.1"
+application.version = "5.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"