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

@@ -7,7 +7,7 @@
                     <h5>品牌介绍</h5>
                     <h5>品牌介绍</h5>
                 </div>
                 </div>
                 <div class="brand-info-content nano">
                 <div class="brand-info-content nano">
-                    <div class="nano-content">{{{info}}}</div>
+                    <div class="nano-content"><div class="width780">{{{info}}}</div></div>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>

@@ -44,7 +44,8 @@
                     <span class="iconfont tools-icon icon-bag">&#xe64b;</span>
                     <span class="iconfont tools-icon icon-bag">&#xe64b;</span>
                         购物袋
                         购物袋
                     </a>
                     </a>
-                    <div class="mini-bag-box sub-wrapper bag-empty">
+                    <div class="mini-bag-box-wrap">
+                        <div class="mini-bag-box sub-wrapper">
                         <div class="bag-goods">
                         <div class="bag-goods">
                             <div class="mini-goods-list-wrap nano"><div class="nano-content"><dl class="mini-goods-list"></dl></div></div>
                             <div class="mini-goods-list-wrap nano"><div class="nano-content"><dl class="mini-goods-list"></dl></div></div>
                             <div class="go-bag-btn">
                             <div class="go-bag-btn">
@@ -59,6 +60,7 @@
                             </p>
                             </p>
                         </div>
                         </div>
                     </div>
                     </div>
+                    </div>
                 </li>
                 </li>
             </ul>
             </ul>
         </div>
         </div>

@@ -47,6 +47,7 @@ function refreshBag() {
         return;
         return;
     }
     }
     this.time = time;
     this.time = time;
+    $('.tag-bag .sub-wrapper').hide();
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/shopping/cart/data',
         url: '/shopping/cart/data',
@@ -64,6 +65,7 @@ function refreshBag() {
                     $bagGoodsList.empty();
                     $bagGoodsList.empty();
                     $miniBag.addClass('bag-empty');
                     $miniBag.addClass('bag-empty');
                 }
                 }
+                $('.tag-bag .sub-wrapper').show();
                 $('.mini-goods-list-wrap.nano').nanoScroller({disableResize: true});
                 $('.mini-goods-list-wrap.nano').nanoScroller({disableResize: true});
             }
             }
         }
         }

@@ -290,6 +290,10 @@ $(function() {
 
 
         $('.set').hide();
         $('.set').hide();
         $(this).find('.set').css('display', 'inline-block');
         $(this).find('.set').css('display', 'inline-block');
+    });
 
 
+    $('.table-body').on('mouseout',function(){
+        var tmpset=$(this).find('.set');
+        if(tmpset.css('display')== 'inline-block')tmpset.hide();
     });
     });
 });
 });

@@ -7,6 +7,7 @@
     min-width: 420px;
     min-width: 420px;
     background: #ffffff;
     background: #ffffff;
     z-index: 1001;
     z-index: 1001;
+    padding-right: 0;
     /*border: 1px solid #8f8f8f;*/
     /*border: 1px solid #8f8f8f;*/
 
 
     .close {
     .close {

@@ -86,11 +86,15 @@
                 color: #9a9a9a;
                 color: #9a9a9a;
             }
             }
 
 
-            &:hover .sub-wrapper {
+            &:hover .mini-bag-box-wrap {
                 display: block;
                 display: block;
             }
             }
         }
         }
 
 
+        .mini-bag-box-wrap{
+            display: none;
+        }
+
         .tools-icon {
         .tools-icon {
             width: 20px;
             width: 20px;
             height: 20px;
             height: 20px;

@@ -117,6 +117,9 @@
 
 
         .table-body {
         .table-body {
             height: 53px;
             height: 53px;
+            &:hover{
+                background-color: #eee;
+            }
         }
         }
 
 
         .table-body td {
         .table-body td {
@@ -124,22 +127,22 @@
         }
         }
 
 
         .width-name {
         .width-name {
-            width: 70px;
+            width: 80px;
             word-break: break-all;
             word-break: break-all;
         }
         }
 
 
         .width-address {
         .width-address {
-            width: 165px;
+            width: 175px;
             word-break: break-all;
             word-break: break-all;
         }
         }
 
 
         .width-fulladdress {
         .width-fulladdress {
-            width: 260px;
+            width: 270px;
             word-break: break-all;
             word-break: break-all;
         }
         }
 
 
         .width-mobile {
         .width-mobile {
-            width: 120px;
+            width: 140px;
 
 
             p:first-child {
             p:first-child {
                 margin-bottom: 5px;
                 margin-bottom: 5px;

@@ -278,6 +278,10 @@
             width: 100%;
             width: 100%;
         }
         }
 
 
+        .width780{
+            width:780px;
+        }
+
         .brand-info-title {
         .brand-info-title {
             text-align: left;
             text-align: left;
             margin: 20px 0 50px;
             margin: 20px 0 50px;