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

 {{# banner}}
     <div class="brand-info-wrapper">
         <div class="brand-info">
-            <div class="nano-content">
+            <div class="">
                 <div class="brand-info-title">
                     <h2>{{name}}</h2>
                     <h5>品牌介绍</h5>
                 </div>
-                <div class="brand-info-content">
-                    {{{info}}}
+                <div class="brand-info-content nano">
+                    <div class="nano-content">{{{info}}}</div>
                 </div>
             </div>
         </div>

@@ -92,6 +92,9 @@ module.exports = {
     },
     pay: {
         serviceNotify: 'http://devservice.yoho.cn:58077/'
+    },
+    crypto: {
+        common: 'yohoblk9646abcde'
     }
 };
 

@@ -39,4 +39,4 @@ if (!$cate.hasClass('big-category')) {
     $('.cateId-' + parentID).find('.plus').css('background-image', 'url(\'../img/help/minus.png\')');
 }
 
-$('.center-content').css('border-top-color', '#fff');
\ No newline at end of file
+$('.center-content').css('border-top-color', '#fff');

@@ -12,8 +12,8 @@ var Shop = {
 
         $('#brand-info').click(function() {
             Shop.brandInfoDialog().show();
-            $('.brand-info').addClass('nano');
-            $('.brand-info').nanoScroller();
+            //$('.brand-info').addClass('nano');
+            $('.brand-info-dialog .brand-info-content').nanoScroller();
         });
     },
 

@@ -182,7 +182,7 @@
             .go-bag-btn {
                 font-size: 20px;
                 line-height: 1;
-                padding-top: 20px;
+                padding-top: 22px;
                 border-top: 1px solid #ddd;
                 text-align: center;
             }

@@ -20,6 +20,7 @@
         font-size: 16px;
         color: #5cb0de;
         padding-bottom: 15px;
+        margin-top: 40px;
 
         span {
             font-size: 20px;

@@ -75,7 +75,6 @@
 
     .slide-warp {
         margin-bottom: 80px;
-        margin-top: 30px;
 
         .slide-left {
             float: left;
@@ -117,8 +116,8 @@
 
             .goods-info {
                 float: left;
-                width: 274px;
-                margin: 26px 9px;
+                width: 272px;
+                margin: 26px 10px;
                 border-width: 1px;
 
                 .desc {
@@ -290,6 +289,7 @@
             text-align: left;
             font-size: 12px;
             line-height: 20px;
+            height: 396px;
 
             p {
                 font-size: 12px;

@@ -24,6 +24,10 @@
             cursor: pointer;
             height: 52px;
         }
+
+        .title{
+            font-size: 15px;
+        }
     }
 
     .address {
@@ -154,6 +158,7 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        font-size: 14px;
     }
 
     .address-detail {
@@ -194,6 +199,7 @@
 
     .title {
         line-height: 52px;
+        font-size: 14px;
     }
 
     .chose-row {
@@ -205,6 +211,10 @@
 
             .chose-block {
                 border-color: #000;
+                font-size: 15px;
+            }
+            .tip-text{
+                font-size: 14px;
             }
         }
     }
@@ -311,6 +321,7 @@
 
         .color-size {
             width: 190px;
+            font-size: 14px;
         }
 
         .price {
@@ -420,6 +431,7 @@
             display: block;
             float: left;
             text-align: center;
+            font-size: 14px;
         }
     }
 

@@ -59,6 +59,7 @@ $fontColor: #616161;
         margin-bottom: 30px;
         height: calc(135px + 2px);
         padding: 20px 30px;
+        font-size: 14px;
 
         .row {
             height: 30px;
@@ -98,6 +99,7 @@ $fontColor: #616161;
                 color: $fontColor;
                 cursor: pointer;
                 position: relative;
+                font-size: 14px;
 
                 &.active {
                     border: 1px solid $liBorderColor;

@@ -30,8 +30,11 @@
         }
 
         .disable {
-            background: #999;
+            background: #eee;
             color: #fff;
+            &:hover {
+                background-color: #eee;
+            }
         }
 
         .input {
@@ -39,6 +42,9 @@
             width: 38px;
             height: 28px;
             text-align: center;
+            font-family: BrownStd;
+            font-weight: bold;
+            color: #1b1b1b;
         }
 
         .warning {