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

 require 'compass/import-once/activate'
+
+# autoprefixer自动加浏览器前缀
+# 需要先安装, gem install autoprefixer-rails
+
+# require 'autoprefixer-rails'
+#
+# on_stylesheet_saved do |file|
+#   css = File.read(file)
+#   map = file + '.map'
+#   browsers = ['> 1%', 'ie 8']
+#
+#   if File.exists? map
+#     result = AutoprefixerRails.process(css,
+#       from: file,
+#       to:   file,
+#       browsers: browsers,
+#       map:  { prev: File.read(map), inline: false })
+#     File.open(file, 'w') { |io| io << result.css }
+#     File.open(map,  'w') { |io| io << result.map }
+#   else
+#     File.open(file, 'w') { |io| io << AutoprefixerRails.process(css, browsers) }
+#   end
+# end
+
 # Require any additional compass plugins here.
 
 # Set this to the root of your project when deployed:
@@ -25,4 +49,4 @@ line_comments = false
 # preferred_syntax = :sass
 # and then run:
 # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
-Encoding.default_external = "utf-8"
\ No newline at end of file
+Encoding.default_external = "utf-8"

@@ -45,4 +45,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

@@ -35,6 +35,7 @@
 
         .sum-cost {
             color: #e01;
+            margin-left: 5px;
         }
 
         .order-opt {

@@ -31,6 +31,15 @@ $basicBtnC:#eb0313;
             margin-bottom: pxToRem(20px);
             font-size: pxToRem(24px);
             line-height: pxToRem(36px);
+
+            b {
+                font-weight: bold;
+            }
+
+            i {
+                font-style: italic;
+            }
+
             &.table {
                 @include flexbox((
                     display: box,
@@ -208,18 +217,19 @@ $basicBtnC:#eb0313;
             height: auto;
             li {
                 float: left;
+                img {
+                    height: auto;
+                }
             }
         }
     }
     .goodsName {
         box-sizing: border-box;
         width: 100%;
-        min-height: pxToRem(88px);
         font-size: pxToRem(28px);
         color: #fff;
-        padding-left: pxToRem(28px);
-        padding-right: pxToRem(28px);
-        line-height: pxToRem(36px);
+        padding: pxToRem(20px) pxToRem(28px);
+        line-height: pxToRem(48px);
         background-color: #515150;
     }
     .goodsSubtitle {
@@ -278,14 +288,14 @@ $basicBtnC:#eb0313;
             line-height: pxToRem(88px);
         }
     }
-    .goodsName {
-        // width: 100%;
-        display: table;
-        span {
-            display: table-cell;
-            vertical-align: middle;
-        }
-    }
+    // .goodsName {
+    //     // width: 100%;
+    //     display: table;
+    //     span {
+    //         display: table-cell;
+    //         vertical-align: middle;
+    //     }
+    // }
     .vip-level {
         box-sizing: box-border;
         padding-left: pxToRem(28px);
@@ -360,21 +370,28 @@ $basicBtnC:#eb0313;
         }
     }
     .enter-store {
-        min-height: pxToRem(100px);
-        display: table;
+        position: relative;
+        padding: 0 pxToRem(180px) 0 pxToRem(114px);
+        line-height: pxToRem(84px);
         background-color: #fff;
-        a {
-            display: table-cell;
-            vertical-align: middle;
-            text-align: left;
-        }
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
         .store-logo {
-            // padding-right: 35rem/$pxConvertRem;
+            position: absolute;
+            left: 0;
+            top: 1px;
+            width: pxToRem(68px);
+            height: pxToRem(84px);
+            margin-left: pxToRem(30px);
+            font-size: 0;
+            text-align: center;
             img {
+                display: inline-block;
                 width: auto;
                 height: pxToRem(68px);
-                margin-left: 0;
-                margin-right: pxToRem(-25px);
+                vertical-align: middle;
             }
         }
         .store-name {
@@ -382,6 +399,10 @@ $basicBtnC:#eb0313;
             color: $mainFontC;
         }
         .store-link {
+            position: absolute;
+            right: 0;
+            top: 1px;
+            padding-right: pxToRem(30px);
             font-size: pxToRem(28px);
             color: $subFontC;
             text-align: right;
@@ -424,7 +445,7 @@ $basicBtnC:#eb0313;
                 margin: 0 pxToRem(100px) 0 pxToRem(115px);
                 color: #fff;
                 background-color: $basicBtnC;
-                font-size: pxToRem(40px);
+                font-size: pxToRem(32px);
                 line-height: pxToRem(80px);
                 text-align: center;
             }

@@ -38,8 +38,8 @@
     <div class="price-date">
         {{# goodsPrice}}
         <div class="goodsPrice">
-            <h1 class="currentPrice">{{currentPrice}}</h1>
-            <h1 class="previousPrice">{{previousPrice}}</h1>
+            <h1 class="currentPrice">¥{{currentPrice}}</h1>
+            <h1 class="previousPrice">¥{{previousPrice}}</h1>
         </div>
         {{/ goodsPrice}}
 
@@ -57,7 +57,7 @@
         <li class="icons-item {{#if currentLevel}}current-level{{/if}}">
             <span class="vip-img " style="background-size:contain;">
             </span>
-            <span class="vip-price ">{{text}}</span>
+            <span class="vip-price ">¥{{text}}</span>
         </li>
         {{/ list}} 
     </ul>