lilei hace 1 año
padre
commit
ac0c0779b3

+ 3 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -140,8 +140,9 @@
                   <div class="active-title">
                     {record.promo?(
                       <div>
-                        <strong style="margin-right:10px;font-size:14px;">{record.promo.promotion.title} ({record.promo.promotionRule.description})</strong>
-                        <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
+                        <strong style="font-size:14px;">{record.promo.promotion.description}</strong>
+                        <span>({record.promo.promotionRule.description})</span>
+                        <span style="margin-left:20px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
                           <a-icon title="查看活动详情" type="eye"/> 活动详情
                         </span>
                       </div>

+ 1 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -51,7 +51,7 @@
       v-if="activeList.length"
       >
         <div slot="title" style="display: inline-block;width:100%;">
-          <strong style="margin-right:10px;font-size:14px;">{{item.promotion.title}}</strong> ({{item.promotionRule.description}})
+          <strong style="margin-right:10px;font-size:14px;">{{item.promotion.description}}</strong> ({{item.promotionRule.description}})
           <span style="margin-left:20px;color:#00aaff;cursor: pointer;"  @click="(event) => {showDesc(event, item)}">
             <a-icon :type="item.showDesc ? 'eye-invisible' : 'eye'"/> 活动详情
           </span>

+ 3 - 2
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -268,8 +268,9 @@ export default {
               <div class="active-title">
                 {record.promo?(
                   <div>
-                    <strong style="margin-right:10px;font-size:14px;">{record.promo.promotion.title} ({record.promo.promotionRule.description})</strong>
-                    <span style="margin-left:10px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
+                    <strong style="font-size:14px;">{record.promo.promotion.description} </strong>
+                    <span>({record.promo.promotionRule.description})</span>
+                    <span style="margin-left:20px;color:#00aaff;cursor: pointer;" onClick={()=>_this.showDesc(record.promo)}>
                       <a-icon title="查看活动详情" type="eye"/> 活动详情
                     </span>
                   </div>