Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -7,7 +7,7 @@
                 <li>
                     <a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
                         <img class="lazy" data-original="{{image brandIco 270 190}}">
-                        <span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandNameCn}}{{/if}}</span>
+                        <span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandName}}{{/if}}</span>
                     </a>
                 </li>
                 {{/each}}

@@ -26,8 +26,8 @@
                             {{/stateText}}
                         </div>
                         <div class="desc">
-                            <div class="brand-name">{{brandName}}</div>
-                            <div class="product-name">{{productName}}</div>
+                            <div class="brand-name"><a href="{{url}}" target="_blank">{{brandName}}</a></div>
+                            <div class="product-name"><a href="{{url}}" target="_blank">{{productName}}</a></div>
                             <p class="price">¥{{round salesPrice 2}}</p>
                         </div>
 

 {{> sign-header}}
 <div class="login-page passport-page">
     {{# passport}}
+    <form method='post' onsubmit='return false;'>
         <ul>
             <li class="clearfix">
                 <div class="title">登录 SIGN IN</div>
@@ -51,8 +52,7 @@
                     <span class="iconfont">&#xe61d;</span>
                     <em></em>
                 </span>
-
-                <a id="login-btn" class="btn login-btn">登录</a>
+                <input type="submit"  id="login-btn" class="btn login-btn"  value='登录'/>
             </li>
 
             <li class="clearfix">
@@ -93,5 +93,6 @@
             </li>
         </ul>
         <input id="country-code-hide" name="countryCode" type="hidden" value="{{countryCode}}">
+    </form>
     {{/ passport}}
 </div>

@@ -40,6 +40,7 @@ const shop = {
                     nav: nav
                 };
                 data.banner = result;
+                data.title = result.name;
                 data.shopId = result.shopId;
                 data.mores = {};
                 result.menus.forEach(m => {
@@ -110,7 +111,7 @@ const shop = {
 
         ShopData.getShopHeadData(domain, shopId, uid).then(result => {
             data.banner = result;
-
+            data.title = result.name;
             if (data.banner.banner) {
                 data.banner.banner = data.banner.banner.split('?')[0];
             }

@@ -47,7 +47,7 @@ exports.createPagination = function(pagination, options) {
 
     var template;
 
-    if (!pagination) {
+    if (!pagination || pagination.pageTotal === 1) {
         return '';
     }
 

@@ -32,6 +32,14 @@ function doCancel(ids) {
     });
 }
 
+function goodsChoose() {
+    if ($(this).parent('.goods-info', $root).hasClass('choose')) {
+        $(this).parent('.goods-info', $root).removeClass('choose');
+    } else {
+        $(this).parent('.goods-info', $root).addClass('choose');
+    }
+}
+
 
 function eventBind() {
     $('.check-all', $root).check({
@@ -45,14 +53,8 @@ function eventBind() {
         }
     });
 
-    $('.goods-img', $root).click(function() {
-        if ($(this).parent('.goods-info', $root).hasClass('choose')) {
-            $(this).parent('.goods-info', $root).removeClass('choose');
-        } else {
-            $(this).parent('.goods-info', $root).addClass('choose');
-        }
-
-    });
+    $('.choose-icon', $root).click(goodsChoose);
+    $('.goods-img', $root).click(goodsChoose);
 
     $('.btn.cancel', $root).click(function() {
         var id = $(this).parents('.goods-info').data('id');

@@ -325,3 +325,7 @@ a {
     border: 1px solid #f0f0f0;
     text-indent: 5px;
 }
+
+.mr15 {
+    margin-right: 15px;
+}

@@ -30,7 +30,8 @@
 
         .editorial-title {
             width: 100%;
-            min-height: 50px;
+            min-height: 70px;
+            line-height: 1.4;
             padding: $space;
             position: absolute;
             bottom: 0;

@@ -73,7 +73,6 @@
         .tag-bag {
             padding-right: 6px;
             margin-right: 8px;
-            font-weight: normal;
             position: relative;
 
             &:hover {
@@ -114,6 +113,7 @@
             width: 230px;
             color: #1b1b1b;
             font-size: 14px;
+            font-weight: normal;
             padding: 20px 0;
             margin-left: -86px;
             line-height: 1.5;
@@ -144,6 +144,7 @@
             width: 370px;
             padding: 18px;
             border: 1px solid #eee;
+            font-weight: normal;
             background: #fff;
             position: absolute;
             z-index: 50;
@@ -181,7 +182,7 @@
             .go-bag-btn {
                 font-size: 20px;
                 line-height: 1;
-                padding-top: 24px;
+                padding-top: 20px;
                 border-top: 1px solid #ddd;
                 text-align: center;
             }
@@ -233,6 +234,7 @@
 
             .del-good-btn {
                 cursor: pointer;
+                color: #999;
             }
         }
     }

@@ -55,6 +55,7 @@
         height: $item-height;
         width: $item-width;
         line-height: @height;
+        border: none;
     }
 
     .captcha-component {

@@ -7,11 +7,11 @@
         </div>
         <div class="info">
             <a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" class="name" target="_blank">{{product_name}}</a>
-            <p>颜色：{{color_name}} 尺码：{{size_name}}</p>
+            <span style="margin-right:15px;">颜色: {{color_name}}</span> <span>尺码: {{size_name}}</span>
         </div>
         <div class="price">
             <p>¥{{round sales_price 2}} X{{buy_number}}</p>
             <span class="del-good-btn" data-type="{{goods_type}}" data-num="{{buy_number}}" data-num="{{buy_number}}" data-sku="{{product_sku}}" data-pid="{{promotion_id}}">删除</span>
         </div>
     </dd>
-{{/ goods}}
\ No newline at end of file
+{{/ goods}}