Merge remote-tracking branch 'origin/release/1.0' into release/1.0

-/**
- * Created by TaoHuang on 2016/7/18.
- */

-/**
- * Created by TaoHuang on 2016/7/19.
- */

@@ -40,18 +40,13 @@ const index = uid => {
             let packageList = shopping.package_list;
 
             _.forEach(goods, theGoods => {
-                let splitName = theGoods.product_name.split(' ');
-
-                // split brand name form product_name
-                theGoods.brandName = splitName.shift();
-                theGoods.name = splitName.join(' ');
 
                 // format goods link
                 theGoods.link = helper.urlFormat(
                     `/product/pro_${theGoods.product_id}_${theGoods.goods_id}/${theGoods.cn_alphabet}.html`);
 
-                // TODO：format brand url
-                // theGoods.brandUrl = helper.urlFormat(`/product/shop/${theGoods.brand_name}`);
+                // format brand url
+                theGoods.brandUrl = helper.urlFormat(`/product/shop/${theGoods.brand_domain}`);
 
                 // 处理商品是否是赠品
                 if (theGoods.goods_type === 'gift') {

@@ -94,8 +94,8 @@
                                         {{/if}}
                                     </a>
                                     <p class="brand-and-name inline-block">
-                                        <a class="brand-name" href="{{brandUrl}}" target="_blank">{{brandName}}</a>
-                                        <a class="name" href="{{link}}" target="_blank">{{name}}</a>
+                                        <a class="brand-name" href="{{brandUrl}}" target="_blank">{{brand_name}}</a>
+                                        <a class="name" href="{{link}}" target="_blank">{{product_name}}</a>
                                     </p>
                                     <p class="color-size">
                                         <span class="color">颜色：{{color_name}}</span>

@@ -5,7 +5,8 @@
  */
 
 var $ = require('yoho-jquery'),
-    lazyLoad = require('yoho-jquery-lazyload'),
+
+    // lazyLoad = require('yoho-jquery-lazyload'),
     dialog = require('../plugins/dialog');
 
 var _alert = dialog.Alert;
@@ -13,7 +14,7 @@ var _alert = dialog.Alert;
 require('../common/header');
 require('../common/return-top');
 
-lazyLoad($('.content-msg img.lazy'));
+// lazyLoad($('.content-msg img.lazy'));
 
 $('.editorial-index-page').on('click', '.like-icon', function() {
     var $this = $(this),