Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/assets/images/email-edit.svg

@@ -1,10 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>24gf-envelopeSent3备份</title>
-    <g id="生成邮件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="24gf-envelopeSent3备份">
-            <rect id="矩形" x="0" y="0" width="12" height="12"></rect>
-            <path d="M11.9527841,1.43295457 C11.9840052,1.51220972 12,1.59663525 12,1.68181821 L12.0002754,7.30025471 C11.5451441,6.40969728 10.6187733,5.8 9.55,5.8 C8.03121694,5.8 6.8,7.03121694 6.8,8.55 C6.8,9.49220801 7.27384541,10.3237435 7.99623453,10.8193048 L0.6818182,10.8181818 C0.305435654,10.8177591 0.000422742072,10.5127462 0,10.1363636 L0,1.68181821 C0,1.59663525 0.0159947858,1.51220972 0.0472159293,1.43295457 L5.51786932,6.90360797 C5.64573605,7.03148128 5.81916449,7.10332031 6,7.10332031 C6.18083551,7.10332031 6.35426395,7.03148128 6.48213068,6.90360797 L11.9527841,1.43295457 Z M11.3181814,1.04721594 C11.2389263,1.01599479 11.4033644,1 11.3181814,1 L0.6818182,1 L5.99999982,6.51786932 L11.3181814,1.04721594 Z M12,8.68571429 C12,9.96385899 10.9471487,11 9.64839089,11 C8.34963304,11 7.29678178,9.96385899 7.29678178,8.68571429 C7.29678178,7.40756958 8.34963304,6.37142857 9.64839089,6.37142857 C10.9471487,6.37142857 12,7.40756958 12,8.68571429 Z M8.34194138,9.97142857 L9.38448809,9.82871429 L8.49557985,8.94002857 L8.34194138,9.97142857 Z M10.1401385,7.32594286 L8.64529896,8.79345714 L9.53368462,9.68214286 L11.0287854,8.21462857 L10.1403998,7.32594286 L10.1401385,7.32594286 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
-        </g>
-    </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 11 11" style="enable-background:new 0 0 11 11;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g id="生成邮件">
+	<g id="_x32_4gf-envelopeSent3备份-2">
+		<g id="矩形">
+			<rect y="0" class="st0" width="11" height="11"/>
+		</g>
+		<g id="路径-9">
+			<path class="st1" d="M9.4,10.5h-8c-0.6,0-1-0.4-1-1v-7c0-0.6,0.4-1,1-1h1.8v1H1.4v7h8V6h1v3.5C10.4,10.1,9.9,10.5,9.4,10.5z"/>
+		</g>
+		<g id="形状">
+			<path class="st1" d="M3,8l2.9-0.7L3.8,5L3,8z M4,4.7L6.2,7L10,3.3L7.8,1L4,4.7z"/>
+		</g>
+	</g>
+</g>
+</svg>

ui/smarttrade-platform/src/components/marketing/interventionCustomers.vue

@@ -33,7 +33,7 @@
                   </div>
                 </div>
                 <div class="customer-details">
-                  <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}原因： {{ customer.protectReason }}</span>
+                  <!-- <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}原因： {{ customer.protectReason }}</span> -->
                   <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}时间： {{ customer.protectTime }}</span>
                 </div>
                 <div class="customer-actions">
@@ -69,6 +69,7 @@
     const open = (data) => {
         showInterventionModal.value = true;
         marketingData.value = data
+        tabType.value = 'protect'
         getData()
     }
 

ui/smarttrade-platform/src/components/marketing/marketingDetail.vue

@@ -4,7 +4,8 @@
         <div class="modal-header">
           <div class="modal-title">
             <i class="fas fa-chart-bar"></i> 活动详情
-            <span class="detail-status" :class="selectedCampaign?.status">{{ getStatusLabel(selectedCampaign?.status) }}</span>
+            <!-- <span class="detail-status" :class="selectedCampaign?.status">{{ getStatusLabel(selectedCampaign?.status) }}</span> -->
+            <span style="margin-left: 12px;" class="status-badge" :class="selectedCampaign.status == 0 ? 'info' : selectedCampaign.status == 1 ? 'active' : selectedCampaign.status == 2 ? 'paused' : 'finished'">{{ getStatusLabel(selectedCampaign.status || 0) }}</span>
           </div>
           <button class="modal-close" @click="showCampaignDetailModal = false"><i class="fas fa-times"></i></button>
         </div>

ui/smarttrade-platform/src/components/marketing/openedCustomers.vue

@@ -8,12 +8,6 @@
           <button class="modal-close" @click="showOpenedCustomersModal = false"><i class="fas fa-times"></i></button>
         </div>
         <div class="modal-body" v-loading="loading">
-          <!-- <div class="filter-bar">
-            <button class="filter-btn active">全部</button>
-            <button class="filter-btn">高价值</button>
-            <button class="filter-btn">已保护</button>
-            <button class="filter-btn">营销暂停</button>
-          </div> -->
           <div class="review-stats">
             <div class="stat-box">
               <span class="stat-label">全部</span>
@@ -48,7 +42,7 @@
                 </div>
                 <div class="detail-item">
                   <span class="label">点击次数：</span>
-                  <span class="value">{{ customer.clickCount }}次</span>
+                  <span class="value">{{ customer.openCount }}次</span>
                 </div>
               </div>
               <div class="customer-actions">

ui/smarttrade-platform/src/views/MarketingView.vue

@@ -128,7 +128,7 @@
               <i class="fas fa-hand-paper"></i>
             </button>
             <button class="btn btn-secondary btn-sm" @click="openAIGenerator(campaign)" title="编辑邮件">
-              <img src="../assets/images/email-edit.svg" />
+              <img src="../assets/images/email-edit.svg" style="width: 12px;height: 12px" />
             </button>
             <button class="btn btn-secondary btn-sm" @click="openEmailList(campaign)" title="发送邮件列表">
               <img src="../assets/images/email-list.svg" />