From c66fe33df92da18f298ba3d85b2e7dde7e937caa Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Mon, 5 Nov 2018 17:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=B6=85=E5=87=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/order/orderDetail.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/oms/order/orderDetail.vue b/src/views/oms/order/orderDetail.vue
index e4ecc49a..319f4c32 100644
--- a/src/views/oms/order/orderDetail.vue
+++ b/src/views/oms/order/orderDetail.vue
@@ -72,7 +72,16 @@
           <el-col :span="4" class="table-cell">{{order.autoConfirmDay}}天</el-col>
           <el-col :span="4" class="table-cell">{{order.integration}}</el-col>
           <el-col :span="4" class="table-cell">{{order.growth}}</el-col>
-          <el-col :span="4" class="table-cell">{{order.promotionInfo}}</el-col>
+          <el-col :span="4" class="table-cell">
+            <el-popover
+              placement="top-start"
+              title="活动信息"
+              width="200"
+              trigger="hover"
+              :content="order.promotionInfo">
+              <span slot="reference">{{order.promotionInfo | formatLongText}}</span>
+            </el-popover>
+          </el-col>
         </el-row>
       </div>
       <div style="margin-top: 20px">
@@ -387,6 +396,15 @@
           return value;
         }
       },
+      formatLongText(value) {
+        if(value===undefined||value===null||value===''){
+          return '暂无';
+        }else if(value.length>8){
+          return value.substr(0, 8) + '...';
+        }else{
+          return value;
+        }
+      },
       formatPayType(value) {
         if (value === 1) {
           return '支付宝';