电子票优化

@@ -11,7 +11,7 @@
         <p class="name row">{{name}}</p>
         <p class="row">
             {{#if color}}
-                <span class="color">
+                <span class="color{{#if tickets}} date{{/if}}">
                     {{#if tickets}}日期{{else}}颜色{{/if}}:{{color}}
                 </span>
             {{/if}}

@@ -25,7 +25,7 @@ const transPrice = (price, isSepcialZero) => {
  * 格式化订单商品
  * @private
  */
-const _formatOrderGoods = (orderGoods, count, haveLink, tickets) => {
+const _formatOrderGoods = (orderGoods, count, haveLink) => {
     let result = [];
 
     _.forEach(orderGoods, value => {
@@ -79,7 +79,7 @@ const _formatOrderGoods = (orderGoods, count, haveLink, tickets) => {
         count += parseInt(value.buy_number, 10);
 
         /* 门票 */
-        if (tickets) {
+        if (value.goods_type === 'ticket') {
 
             /* 展览票不显示区域 */
             if (value.product_skn === TICKETS.SINGLE_TICKETS_SKN) {

@@ -153,7 +153,6 @@ const orderDetailData = (uid, orderCode) => {
         uid: uid,
         order_code: orderCode
     }).then(result => {
-
         if (result && result.code === 200) {
             let orderDetail = camelCase(result.data);
             let goods = [];
@@ -185,7 +184,8 @@ const orderDetailData = (uid, orderCode) => {
                     size: data.sizeName,
                     payPrice: data.realPayPrice,
                     salePrice: parseFloat(data.salesPrice).toFixed(2),
-                    count: count
+                    count: count,
+                    tickets: data.goodsType === 'ticket'
 
                     // isVipPrice: data.discountTag === 'V',
                     // isStudebt: data.discountTag === 'S'

@@ -768,7 +768,8 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
     }).then(result => {
         // 虚拟商品（门票）
         if (origin.attribute * 1 === 3) {
-            result.tickets = true;
+            result.cartInfo.addToCartUrl = false;
+            result.tickets = result.cartInfo.tickets = true;
             result.ticketsConfirm = helpers.urlFormat('/cart/index/ticketsConfirm');
 
             // 展览票

@@ -11,7 +11,7 @@
         <p class="name row">{{name}}</p>
         <p class="row">
             {{#if color}}
-                <span class="color">
+                <span class="color{{#if tickets}} date{{/if}}">
                     {{#if tickets}}日期{{else}}颜色{{/if}}:{{color}}
                 </span>
             {{/if}}

@@ -11,7 +11,7 @@
         <p class="name row">{{name}}</p>
         <p class="row">
             {{#if color}}
-                <span class="color">
+                <span class="color{{#if tickets}} date{{/if}}">
                     {{#if tickets}}日期{{else}}颜色{{/if}}:{{color}}
                 </span>
             {{/if}}

@@ -31,7 +31,7 @@
             <span class="btn del">删除订单</span>
         {{else if lookQrcode}}
             <a class="locHref" href="{{link}}">
-                <span class="btn check-logistics">查看二维码</span>
+                <span class="btn check-logistics check-ewm">查看二维码</span>
             </a>
         {{else if afterService}}
             <span class="btn after-sales">申请售后</span>

@@ -19,7 +19,10 @@
         <div class="tip{{#unless @root.isCollect}} opa{{/unless}}">{{#if @root.isCollect}}已收藏{{else}}收藏{{/if}}</div>
     </a>
     {{#if addToCartUrl}}
-        <a id="addtoCart" href="javascript:;" class="addto-cart add-to-cart-url">{{#if tickets}}立即购买{{else}}加入购物车{{/if}}</a>
+        <a id="addtoCart" href="javascript:;" class="addto-cart add-to-cart-url">加入购物车</a>
+    {{/if}}
+    {{#if tickets}}
+        <a id="ticketsToCart" href="javascript:;" class="addto-cart add-to-cart-url">立即购买</a>
     {{/if}}
     {{#if soldOut}}
         <a id="soldOut" href="javascript:;" class="sold-out">已售罄</a>

@@ -156,7 +156,7 @@ setTimeout(() => {
 
                     let chosePanel = require('common/chose-panel-new');
 
-                    $('#addtoCart').on('touchstart', function() {
+                    $('#addtoCart, #ticketsToCart').on('touchstart', function() {
                         let productCode = $('#limitProductCode').val();
                         let seckill = $('.seckill-time').length;
 

@@ -451,6 +451,11 @@
             color: #b6b6b6;
         }
 
+        .date {
+            max-width: none !important;
+            display: block !important;
+        }
+
         .price-wrap {
             position: absolute;
             top: 20px;

@@ -400,6 +400,11 @@
             border-radius: 5PX;
             margin-left: 15px;
             margin-top: 5px;
+
+            &.check-ewm {
+                width: auto;
+                padding: 0 10px;
+            }
         }
 
         .pay {

@@ -338,6 +338,11 @@
         color: #b6b6b6;
     }
 
+    .date {
+        max-width: none !important;
+        display: block !important;
+    }
+
     .price-wrap {
         position: absolute;
         top: 0;