Merge branch 'feature/vipdouble' into 'gray'

Feature/vipdouble



See merge request !1333

 {{# list}}
 {{# list}}
 <div class="grade-bill">
 <div class="grade-bill">
     <div class="grade-bill-left">
     <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 class="time">{{createTimeStr}}</div>
     </div>
     </div>
     <div class="grade-bill-right">
     <div class="grade-bill-right">

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.5.35",
+  "version": "6.5.36",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -301,7 +301,7 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
 
 
-$('.nav-home').on('touchstart', function(e) {
+$('.new-nav-home').on('touchstart', function(e) {
     $('.homebuttom').toggleClass('hide');
     $('.homebuttom').toggleClass('hide');
     e.preventDefault();
     e.preventDefault();
     e.stopPropagation();
     e.stopPropagation();

@@ -142,6 +142,24 @@
 
 
             .grade-bill-left > .order {
             .grade-bill-left > .order {
                 font-size: 22px;
                 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 {
             .grade-bill-left > .time {