Merge branch 'master' of https://gogs.storlead.com/storlead/storlead-sasa-platform

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

@@ -45,7 +45,7 @@
               <button v-if="activeFilter !== 'sent'" class="btn btn-secondary" @click="cancelSend(item)">
                 {{  activeFilter === 'pending' ? '取消' : '重新' }}发送
               </button>
-              <button class="btn btn-secondary" @click="viewDetail(item)">
+              <button class="btn btn-secondary" @click="viewDetail(item)" v-if="activeFilter == 'sent'">
                 邮件详情
               </button>
               <button v-if="activeFilter !== 'sent'" class="btn btn-primary" @click="editEmail(item)">
@@ -138,7 +138,7 @@ const cancelSend = (item) => {
       type: 'warning',
     }
   ).then(() => {
-    cancelEmail({ id: item.id, status: (item.status == -2 ? -3 : -2) }).then(() => {
+    cancelEmail({ id: item.id, status: (item.status == -1 ? -3 : -1) }).then(() => {
       ElMessage.success('操作成功')
       getList()
     }).catch((err) => {