Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/api/marketing/index.js

@@ -20,6 +20,7 @@ export const cancelEmail = (data = {}) => post('/router/rest/marketEmails/cancel
 export const setMarketingStatus = (data = {}) => post('/router/rest/marketing/status', data)
 export const getTradeCustomer = (data = {}) => post('/router/rest/customerTrade/list', data)
 export const saveGenerateEmail = (data = {}) => post('/router/rest/marketing/campaign/sop-detail/edit', data)
-export const getEmailDetail = (data = {}) => get('/router/rest/marketEmails/getById', data)
+export const getEmailDetail = (data = {}) => post('/router/rest/mkt/email/detail', data)
+export const getEmailById = (data = {}) => get('/router/rest/marketEmails/getById', data)
 export const editEmail = (data = {}) => post('/router/rest/marketEmails/editContent', data)
 export const getCustomerSource = (data = {}) => get('/router/rest/customerTrade/source-distribution', data)

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

@@ -460,7 +460,7 @@
                                 "></div>
                             <div class="rule-content">
                                 <div class="rule-title">未打开邮件自动跟进</div>
-                                <div class="rule-desc">{{ newCampaign.rules.noOpenFollowupDays }}天后发送提醒邮件，更换主题行</div>
+                                <div class="rule-desc">{{ newCampaign.rules.noOpenFollowupDays }}天后重新发送</div>
                             </div>
                             <div class="rule-config" v-if="newCampaign.rules.noOpenFollowup">
                                 <el-select style="width: 90px;" v-model="newCampaign.rules.noOpenFollowupDays" placeholder="请选择">

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

@@ -155,7 +155,7 @@ const viewDetail = (item) => {
   // 这里可以接入查看详情逻辑
   const { href } = router.resolve({
     path: '/emails/detail',
-    query: { id: item.id }
+    query: { id: item.emailId }
   })
   window.open(href, '_blank')
 }

ui/smarttrade-platform/src/views/emails/detail.vue

@@ -27,10 +27,10 @@
                     <span>：</span>
                     <div class='value'>{{ emailDetail?.subject }}</div>
                 </div>
-                <div class='item' v-if='emailDetail?.expectSendTime'>
+                <div class='item' v-if='emailDetail?.recipientDate'>
                     <div class="label">日期</div>
                     <span>：</span>
-                    <div class='value'>{{ emailDetail?.expectSendTime }}</div>
+                    <div class='value'>{{ emailDetail?.recipientDate }}</div>
                 </div>
                 <div class='item' v-if='emailDetail?.attachments && emailDetail?.attachments?.length>0'>
                     <div class="label">附件</div>
@@ -60,7 +60,7 @@
         recipientCc: '',
         recipientBcc: '',
         subject: '',
-        sentDate: '',
+        recipientDate: '',
         content: '',
     })
 

ui/smarttrade-platform/src/views/emails/edit.vue

@@ -97,7 +97,7 @@
 <script setup>
     import { ref, reactive, onMounted } from 'vue'
     import { useRouter } from 'vue-router'
-    import { getEmailDetail, editEmail } from '@/api/marketing'
+    import { getEmailById, editEmail } from '@/api/marketing'
     import ckeditor from '@/components/ckeditor/index.vue'
 
     const getContent = (val) => {
@@ -107,7 +107,7 @@
     const router = useRouter();
     let queryData = router.currentRoute.value.query
     const getData = () => {
-        getEmailDetail({ id: queryData.id }).then(res => {
+        getEmailById({ id: queryData.id }).then(res => {
             form.value.recipient = res.result.recipient
             form.value.subject = res.result.subject
             form.value.content = res.result.content