Merge branch 'release/5.7' into gray

@@ -17,11 +17,11 @@ module.exports = {
     cookieDomain: '.yohobuy.com',
     cookieDomain: '.yohobuy.com',
     domains: {
     domains: {
         // test3
         // test3
-        singleApi: 'http://api-test3.yohops.com:9999/',
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        serviceNotify: 'http://service-test3.yohops.com:9999/',
-        global: 'http://global-test-soa.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/',
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // serviceNotify: 'http://service-test3.yohops.com:9999/',
+        // global: 'http://global-test-soa.yohops.com:9999/',
 
 
         // prod
         // prod
         // singleApi: 'http://single.yoho.cn/',
         // singleApi: 'http://single.yoho.cn/',
@@ -31,9 +31,9 @@ module.exports = {
         // global: 'http://api-global.yohobuy.com/',
         // global: 'http://api-global.yohobuy.com/',
 
 
         // gray
         // gray
-        // singleApi: 'http://single.gray.yohops.com/',
-        // api: 'http://api.gray.yohops.com/',
-        // service: 'http://service.gray.yohops.com/',
+        singleApi: 'http://single.gray.yohops.com/',
+        api: 'http://api.gray.yohops.com/',
+        service: 'http://service.gray.yohops.com/',
 
 
         // dev
         // dev
         // api: 'http://dev-api.yohops.com:9999/',
         // api: 'http://dev-api.yohops.com:9999/',

@@ -3,7 +3,8 @@
      data-promotionid="{{promotionId}}">
      data-promotionid="{{promotionId}}">
     <code class="order-pay-mark {{#unless isReach}}order-pay-mark-white{{/unless}}">
     <code class="order-pay-mark {{#unless isReach}}order-pay-mark-white{{/unless}}">
         {{tag}}
         {{tag}}
-    </code>{{{promotionDesc}}}
+    </code>
+    <span class="title-desc">{{{promotionDesc}}}</span>
 
 
     {{> mix/cart/cart-promotion-btn}}
     {{> mix/cart/cart-promotion-btn}}
 
 

@@ -435,6 +435,14 @@
                 color: #017cf8;
                 color: #017cf8;
             }
             }
         }
         }
+
+        .title-desc {
+            max-width: 545px;
+            display: inline-block;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
     }
     }
 
 
     .cartnew-tips {
     .cartnew-tips {