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

@@ -116,11 +116,26 @@
             color: #8f8f8f;
             color: #8f8f8f;
         }
         }
     }
     }
-
-    .price-compute {
+    .activity{
         padding: 20rem / $pxConvertRem;
         padding: 20rem / $pxConvertRem;
-        border-bottom: 1px solid #e0e0e0;
         font-size: 26rem / $pxConvertRem;
         font-size: 26rem / $pxConvertRem;
+        h1{
+            font-size: 32rem / $pxConvertRem;
+        }
+        li:before {
+            content: "";
+            display: inline-block;
+            width: 4px;
+            height: 4px;
+            background-color: #000;
+            border-radius: 50%;
+            margin-right: 8rem / $pxConvertRem;
+        }
+    }
+    .price-compute {
+        padding: 20rem / $pxConvertRem;
+        border-top: 1px solid #e0e0e0;
+        font-size: 28rem / $pxConvertRem;
 
 
         .title {
         .title {
             display: inline-block;
             display: inline-block;

@@ -33,18 +33,21 @@
         {{/if}}
         {{/if}}
     </ul>
     </ul>
 {{/if}}
 {{/if}}
-
+<div class="activity">
+    <h1>以参与活动</h1>
+    <ul>
+        {{# promotionInfo}}
+            <li>{{name}}</li>
+        {{/ promotionInfo}}
+    </ul>
+</div>
 <div class="price-compute">
 <div class="price-compute">
-    <p class="sum-price">
-        <span class="title">总价</span>
-        <span id="good-totalprice">¥{{price}}</span>
+    <p>
+        <span>总价（¥{{price}}）<i>-</i></span>
+        <span>活动价(¥{{activityPrice}})</span>
     </p>
     </p>
-    <p class="activity-price">
-        <span class="title">
-            活动价
-            <i class="minus">-</i>
-        </span>
-        <span id="good-activityPrice">¥{{activityPrice}}</span>
+    <p>
+        <span><i>=</i>商品总计金额 （¥{{sumPrice}}）</span>
     </p>
     </p>
 </div>
 </div>