Merge branch 'release/2.0' into 'master'

Release/2.0



See merge request !4

@@ -13,10 +13,10 @@
         </p>
     </div>
     <div class="sub-column right-border special-column bold">
-        <p class="bold">{{buy_number}}</p>
+        <p class="bold {{#if @last}}last{{/if}}">{{buy_number}}</p>
     </div>
     <div class="sub-column special-column bold">
-        <p class="bold">¥{{goods_amount}}</p>
+        <p class="bold {{#if @last}}last{{/if}}">¥{{goods_amount}}</p>
     </div>
     {{/unless}}
     {{/order_goods}}

@@ -25,7 +25,7 @@ $(function() {
     });
 
     $('.new-guide li').each(function(key, item) {
-        if (key % 5 === 0) {
+        if (key % 4 === 0) {
             $(item).css({
                 marginLeft: 0,
                 clear: 'both'
@@ -34,7 +34,7 @@ $(function() {
     });
 
     $('.self-service li').each(function(key, item) {
-        if (key % 6 === 0) {
+        if (key % 5 === 0) {
             $(item).css({
                 marginLeft: 0,
                 clear: 'both'

@@ -167,7 +167,7 @@
 
     .new-guide {
         li {
-            margin-left: 160px;
+            margin-left: 236px;
 
             img {
                 width: 70px;
@@ -178,7 +178,7 @@
 
     .self-service {
         li {
-            margin-left: 114px;
+            margin-left: 160px;
 
             img {
                 width: 70px;

@@ -200,7 +200,7 @@
     }
 
     .good-info {
-        width: 515px !important;
+        width: 519px !important;
     }
 
     .goods-container {