Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/components/addMarketing.vue

@@ -124,11 +124,11 @@
                     <div class="form-group">
                         <label class="form-label">活动目标</label>
                         <div class="goal-inputs">
-                            <div class="goal-item">
+                            <!-- <div class="goal-item">
                                 <i class="fas fa-envelope"></i>
                                 <el-input-number v-model="newCampaign.goals.sent" :controls="false" :min="0" />
                                 <span>发送量</span>
-                            </div>
+                            </div> -->
                             <div class="goal-item">
                                 <i class="fas fa-envelope-open"></i>
                                 <el-input-number v-model="newCampaign.goals.openRate" :controls="false" :min="0" :max="100" />

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

@@ -34,7 +34,7 @@
                 </div>
                 <div class="customer-details">
                   <!-- <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}原因： {{ customer.protectReason }}</span> -->
-                  <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}时间： {{ customer.protectTime }}</span>
+                  <span class="detail">{{ tabType == 'protect' ? '保护' : "暂停" }}时间： {{ tabType == 'protect' ? customer.protectTime : customer.suspendTime }}</span>
                 </div>
                 <div class="customer-actions">
                   <button class="btn btn-secondary btn-sm" @click="unprotectCustomer(customer)">