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

@@ -8,7 +8,7 @@
                     <a href="{{url}}" target="_blank">
                         <img class="lazy-img" data-original="{{image src 395 495}}" alt="{{alt}}">
                     </a>
-                    <p class="editorial-title">{{title}}</p>
+                    <div class="editorial-title"><div><p>{{title}}</p></div></div>
                 </span>
             {{/ big}}
         </div>
@@ -18,7 +18,7 @@
                     <a href="{{url}}" target="_blank">
                         <img class="lazy-img"  data-original="{{image src 360 240}}" alt="{{alt}}">
                     </a>
-                    <p class="editorial-title">{{title}}</p>
+                    <div class="editorial-title"><div><p>{{title}}</p></div></div>
                 </span>
             {{/ small}}
         </div>

@@ -344,7 +344,7 @@ const _setRefundDetailData = (data) => {
             resData.refundSure = {
                 mode: data.return_amount_mode_name,
                 account: data.return_amount_mode_name,
-                amount: data.return_amount_total,
+                amount: data.return_amount,
                 coin: parseInt(data.return_yoho_coin * 100, 10)
             };
             break;

@@ -19,7 +19,7 @@
         </div>
         {{^}}
         <div class="page page-pre">
-            <span class="iconfont ">&#xe607;</span>
+            <span class="iconfont">&#xe607;</span>
         </div>
         {{/isEqual}}
         {{#isEqual page pageTotal}}

@@ -32,8 +32,8 @@ exports.createPagination = function(pagination, options) {
         n,                                              // page number ?page=n
         queryParams = '',                               // paginate with query parameter
         page = parseInt(pagination.page, 10),           // current page number
-        leftText = '<i class="iconfont">&#xe62c;</i>',  // prev
-        rightText = '<i class="iconfont">&#xe629;</i>', // next
+        leftText = '<i class="iconfont">&#xe607;</i>',  // prev
+        rightText = '<i class="iconfont">&#xe61e;</i>', // next
         paginationClass = 'blk-pagination';             // pagination <ul> default class
 
     var pageCount,

@@ -11,7 +11,9 @@ module.exports = () => {
         let isMobile = /(nokia|iphone|android|ipad|motorola|^mot\-|softbank|foma|docomo|kddi|up\.browser|up\.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam\-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte\-|longcos|pantech|gionee|^sie\-|portalmmm|jig\s browser|hiptop|^ucweb|^benq|haier|^lct|opera\s*mobi|opera\*mini|320x320|240x320|176x220)/i.test(req.get('user-agent')); // eslint-disable-line
 
         if (isMobile) {
-            return res.redirect(`//m.yohobuy.com${req.url}`);
+            // return res.redirect(`//m.yohobuy.com${req.url}`);
+            // http://jira.yoho.cn:8888/browse/BLK-2051
+            return res.redirect('//www.yohoshow.com/about/index/blkqr');
         }
         next();
     };

@@ -324,6 +324,7 @@ a {
     height: 26px;
     border: 1px solid #f0f0f0;
     text-indent: 5px;
+    width: 210px;
 }
 
 .mr15 {

@@ -30,14 +30,28 @@
 
         .editorial-title {
             width: 100%;
-            min-height: 70px;
-            line-height: 1.4;
-            padding: $space;
+            height: 70px;
             position: absolute;
             bottom: 0;
             background-color: rgba(0, 0, 0, 0.5);
             color: #fff;
             font-size: 14px;
+            line-height:70px;
+            padding: 0 $space;
+
+            div{
+                line-height: 1.6;
+                display: inline-block;
+                vertical-align: middle;
+            }
+
+            p{
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+                word-break: break-all;
+                overflow: hidden;
+            }
         }
 
         img {

@@ -82,7 +82,7 @@
                 height: 100%;
                 float: left;
                 padding: 25px 0 25px $space;
-                border: 1px solid #404040;
+                border: 1px solid #bbb;
                 border-left: none;
 
                 p,

@@ -43,7 +43,7 @@
     }
 
     .confirm-cancel {
-        background: #f8f8f8;
+        background: #fff;
         color: #1b1b1b;
     }
 

@@ -8,15 +8,18 @@
         padding-right: 2px;
         display: inline-block;
         position: relative;
+        height:54px;
+        line-height: 52px;
 
         .iconfont {
             font-size: 18px;
-            position: relative;
-            top: -2px;
+            /*position: relative;
+            top: -2px;*/
+            vertical-align: sub;
         }
 
         a {
-            vertical-align: top;
+            vertical-align: middle;
         }
 
         .yoho-group {
@@ -368,6 +371,10 @@
             .clear-input {
                 display: none;
             }
+
+            form{
+                border-bottom: 1px solid #fff;
+            }
         }
 
         .search-hint {

@@ -40,10 +40,14 @@
 
     i {
         font-size: 12px;
+        position: relative;
+        top:-1px;
     }
 
     .pre-page,
     .next-page {
-        line-height: 24px;
+        line-height: 22px;
+        width: 24px;
+        height:24px;
     }
 }

@@ -362,8 +362,10 @@
         .tag-icon {
             float: left;
             margin: 0 12px 0 0;
-            font-size: 20px;
+            font-size: 18px;
             font-style: normal;
+            position: relative;
+            top:6px;
         }
 
         ul {
@@ -406,7 +408,12 @@
         margin-left: 30px;
 
         a {
-            color: #afafaf;
+            color: #999;
+            font-size: 12px;
+        }
+
+        span{
+            font-size: 14px;
         }
     }
 
@@ -444,6 +451,7 @@
             line-height: 18px;
             color: #535353;
             border: 1px solid #e7e7e7;
+            font-family: BrownStd, "黑体";
         }
     }
 
@@ -461,7 +469,7 @@
     }
 
     .publish-btn {
-        margin-top: 10px;
+        margin-top: 20px;
         float: left;
         width: 100px;
         height: 30px;
@@ -485,6 +493,7 @@
         width: 100%;
         overflow: hidden;
         margin-bottom: 80px;
+        margin-top: 44px;
 
         h4 {
             font-size: 14px;
@@ -554,7 +563,7 @@
                 .comment-content {
                     margin-top: 10px;
                     line-height: 16px;
-                    font-size: 12px;
+                    font-size: 14px;
                     word-wrap: break-word;
                 }
 

@@ -23,16 +23,17 @@
     }
     .progress-text {
         margin-left: 62px;
+        font-size: 14px;
 
         span {
-            padding: 0 50px;
+            padding: 0 55px;
         }
         .gray-text {
             color: #d3d3d3;
-            padding: 0 38px;
+            padding: 0 42px;
         }
         .pad66{
-            padding-left: 66px;
+            padding-left: 71px;
         }
     }
     .operate1,
@@ -86,7 +87,7 @@
                 height: 26px;
             }
             .submit {
-                margin-left: 150px;
+                margin-left: 175px;
             }
         }
     }

@@ -102,6 +102,7 @@
             > p {
                 line-height: 50px;
                 text-align: left;
+                font-size: 14px;
             }
 
             .title {
@@ -138,6 +139,8 @@
                 border: 1px solid #f0f0f0;
                 font-weight: bold;
                 cursor: pointer;
+                font-size: 14px;
+
                 &:last-child{
                     margin-right: 0;
                 }
@@ -448,7 +451,7 @@
             }
 
             img {
-                margin-top: -5px;
+                margin-top: -6px;
                 display: inline-block;
                 border: 1px solid #fff;
                 border-radius: 50%;

@@ -189,12 +189,13 @@ $hoverColor: #379ed6;
             }
 
             .size-item {
-                height: 20px;
+                height: 34px;
                 border: 1px solid #e8e8e8;
                 display: inline-block;
                 text-align: center;
                 font-size: 12px;
-                padding: 4px;
+                padding: 0 12px;
+                line-height: 34px;
 
                 &.disabled {
                     color: #f0f0f0;

@@ -2,13 +2,15 @@
     .edit-color-size {
         position: absolute;
         left: 190px;
-        width: 354px;
+        width: 356px;
         border: 2px solid #bbb;
         top: -113px;
         *top: -113px;
         background: #fff;
         z-index: 1000;
-        padding: 25px 20px;
+        padding: 20px 19px;
+        font-size: 14px;
+
 
         .indicator {
             position: absolute;
@@ -37,8 +39,10 @@
         }
 
         .active {
-            background-color: #444;
-            color: #fff;
+            /*background-color: #444;
+            color: #fff;*/
+            border: 2px solid #1d1d1d !important;
+            box-sizing: border-box;
         }
 
         .current-color {
@@ -54,8 +58,14 @@
             float: left;
 
             .img-preview {
-                margin: 20px 0;
+                margin: 0;
+                width: 118px;
+                height:160px;
             }
         }
+
+        .firstletter{
+            color: #c1c1c1;
+        }
     }
 }

@@ -3,7 +3,7 @@
     <div class="content">
         <div class="left">
             <div class="default-color mb20">
-                <span class="color-label mr10">Color: </span><span class="selected-color">{{defaultColor}}</span>
+                <span class="color-label mr10 firstletter">Color: </span><span class="selected-color">{{defaultColor}}</span>
             </div>
 
             <div class="colors-list mb20">
@@ -21,13 +21,13 @@
             {{#each colors}}
                 <div class="sizes-list {{#if active}}current-sizes{{/if}}" id="{{proId}}-color-{{@index}}" style="display: {{#if active}}block{{^}}none{{/if}};">
                     <div class="default-size mb20">
-                        <span class="size-label mr10">Size: </span><span>{{../defaultSize}}</span>
+                        <span class="size-label mr10 firstletter">Size: </span><span>{{../defaultSize}}</span>
                     </div>
 
                     <div class="sizes-list mb10">
                         {{#each sizes}}
                             <span class="size-item mr10 mb10{{#if sizeFocus}} current active{{/if}}{{#isEqual num 0}} disabled{{/isEqual}}"
-                                    data-sku="{{sku}}">{{name}}</span> 
+                                    data-sku="{{sku}}">{{name}}</span>
                         {{/each}}
                     </div>
                 </div>
@@ -42,4 +42,4 @@
             <img src="{{image defaultImg 100 134}}" class="img-preview" title="{{defaultColor}}"/>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>