Merge branch 'feature/vipdouble' into release/180420

 {{# list}}
 <div class="grade-bill">
     <div class="grade-bill-left">
-        <div class="order">{{desc}}</div>
+        <div class="order"><span>{{desc}}</span>{{#if activityInfoTitle}}<span class="order-tip">({{activityInfoTitle}}</span><span class="order-tip-end">)</span>{{/if}}</div>
         <div class="time">{{createTimeStr}}</div>
     </div>
     <div class="grade-bill-right">

@@ -142,6 +142,24 @@
 
             .grade-bill-left > .order {
                 font-size: 22px;
+                white-space: nowrap;
+                width: 100%;
+                height: 40px;
+                line-height: 40px;
+
+                .order-tip,
+                .order-tip-end {
+                    font-size: 18px;
+                    color: #4a90e2;
+                    font-weight: 300;
+                }
+
+                .order-tip {
+                    max-width: 260px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    margin-left: 10px;
+                }
             }
 
             .grade-bill-left > .time {