Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -2,31 +2,32 @@
      
      .newbrand-search {
         width: 93.75%;
-        height: 30px;
-        padding: 7px 3.125%;
+        height: 60rem / $pxConvertRem;
+        padding: 14rem / $pxConvertRem 3.125%;
         background-color: #f8f8f8;
         left: 0;
-        top: 44px;
+        top: 88rem / $pxConvertRem;
         position: fixed;
         z-index: 2;
         .search-box {
             position: relative;
-            height: 30px;
+            height: 60rem / $pxConvertRem;
             background-color: #FFF;
-            border-radius: 15px;
-            padding: 0 16px 0 26px;
+            border-radius: 30rem / $pxConvertRem;
+            padding: 0 32rem / $pxConvertRem 0 52rem / $pxConvertRem;
  
              .search-input {
                  width: 100%;
-                 height: 30px;
+                 height: 60rem / $pxConvertRem;
                  border: 0;       
              }
              
             .search-icon {
                 position: absolute;
-                font-size: 12px;
-                top: 16px;
-                left: 24px;
+                font-size: 24rem / $pxConvertRem;
+                top: 20rem / $pxConvertRem;
+                left: 24rem / $pxConvertRem;
+                color: #bdbdbd;
             }
     
         }
@@ -62,50 +63,53 @@
             color: #999999;
             font-weight: bold;
             position: relative;
-
             h2 {       
-                width: 100%;
-                height: 25px;
-                line-height: 25px;
-                font-size: 17px;
+                // width: 100%;
+                padding: 0 20rem / $pxConvertRem;
+                height: 50rem / $pxConvertRem;
+                line-height: 50rem / $pxConvertRem;
+                font-size: 34rem / $pxConvertRem;
                 border-top: 1px solid #e6e6e6;
                 background-color: #f4f4f4;
             }
         }
  
-          p {
-                cursor: pointer;
-                height: 25px;
-                padding-right: 10px;
-                a {
-                    display: block;
-                    font-size: 17px;
-                    border-bottom: 1px solid #f3f3f3;
-                    border-top: 1px solid #f9f9f9;                    
-                    i {
-                        position: relative;
-                        top: 1px;
-                        color: #ff0000;
-                        padding-left: 16px;
-                    }
+        p {
+            cursor: pointer;
+            // height: 50rem / $pxConvertRem;
+            padding: 0 20rem / $pxConvertRem;
+            a {
+                display: block;
+                padding-top: 10rem / $pxConvertRem;
+                height: 76rem / $pxConvertRem;
+                line-height: 76rem / $pxConvertRem;
+                font-size: 34rem / $pxConvertRem;
+                border-bottom: 1px solid #f3f3f3;
+                border-top: 1px solid #f9f9f9;                    
+                i {
+                    position: relative;
+                    top: 1px;
+                    color: #ff0000;
+                    padding-left: 32rem / $pxConvertRem;
                 }
             }
+        }
     }
 
        .right-bar {
           
-            width: 30px;
-            top: 120px !important;
+            width: 60rem / $pxConvertRem;
+            top: 240rem / $pxConvertRem !important;
             overflow: hidden;
             position: fixed;
-            right: 1px;
-            border-radius: 6px;
+            right: 2rem / $pxConvertRem;
+            border-radius: 12rem / $pxConvertRem;
             background: rgba(0,0,0,.8);  
             z-index: 2;      
              b {
-                height: 16px;
+                height: 32rem / $pxConvertRem;
          
-                line-height: 14px;
+                line-height: 28rem / $pxConvertRem;
                 text-align: center;
                 display: block;
                 color: #999999;
@@ -114,6 +118,6 @@
         }
         
         .con {       
-            padding-top: 5px;    
+            padding-top: 10rem / $pxConvertRem;    
         }
 }
\ No newline at end of file

@@ -16,9 +16,10 @@
                 opacity: 0.5;
                 margin: 0 (9rem / $pxConvertRem);
                 border-radius: 50%;
-            }
-            span.swiper-pagination-bullet-active {
-                opacity: 1;
+                &.swiper-pagination-bullet-active {
+                    background: #fff;
+                    opacity: 1;
+                }
             }
         }
     }

@@ -23,7 +23,7 @@
                             {{# content}}
                                 {{#if text}}
                                     <div class="post-block text-block">
-                                        {{text}}
+                                        {{{text}}}
                                     </div>
                                 {{/if}}
 

@@ -144,7 +144,7 @@ class HomeModel
                 Cache::set(CacheConfig::KEY_ACTION_BOYS_INDEX, $result);
             }
         }
-
+        
         return $result;
     }
 

@@ -144,7 +144,7 @@ class DetailController extends AbstractAction
                 $data['relatedInfo'][] = $value;
             }
         }
-
+        
         $this->_view->display('index', $data);
         
         $detail = array();