Merge branch 'release/1.0'

@@ -232,7 +232,7 @@ const _getRelatedData = (idList) => {
 
             return productList;
         } else {
-            logger.error('推荐商品 cood 不是 200');
+            logger.error('推荐商品 code 不是 200');
             return {};
         }
     });

@@ -7,7 +7,7 @@
 const mcHandler = require('../models/menu-crumb-handler');
 const addressModel = require('../models/address');
 const crypto = global.yoho.crypto;
-const config = global.yoho.config
+const config = global.yoho.config;
 const logger = global.yoho.logger;
 
 const _ = require('lodash');
@@ -85,7 +85,8 @@ const addAddressData = (req, res, next) => {
 
     addressModel.addAddressData(uid, address, areaCode, consignee, mobile, phone, isInit).then(result => {
         if (result.data && result.data.address_id) {
-            result.data.aid = crypto.encryption(config.crypto.common, result.data.address_id + '');
+            result.data.address_id = crypto.encryption(config.crypto.common, result.data.address_id + '');
+            result.data.aid = result.data.address_id;
         }
 
         res.send(result);

@@ -5,6 +5,7 @@
             <span class="num">您共收藏了{{total}}个品牌</span>
             <div class="brands-list clearfix">
                 {{#each brandList}}
+                    {{#if status}}
                     <div class="brand-raw clearfix">
                         <div class="check">
                             {{> icon/checkbox}}
@@ -71,6 +72,7 @@
                             {{/if}}
                         </div>
                     </div>
+                    {{/if}}
                 {{/each}}
             </div>