소스 검색

Merge remote-tracking branch 'origin/master'

YPZ 3 주 전
부모
커밋
fc3bead5d2

+ 2 - 1
java/storlead-api/src/main/resources/application-dev.yml

@@ -191,7 +191,8 @@ logging:
 environment: test
 dify:
   base-url: http://47.112.196.2:11434/v1/
-  download-url: http://47.112.196.2:11435
+  download-url: https://trade.test.storlead.com
+  #http://47.112.196.2:11435
   dataset-api-key: dataset-qfhXMNcjsRSwN5CK6aoWx3hl
   app-keys:
     chat: app-1-qfhXMNcjsRSwN5CK6aoWx3hl  #对话

+ 1 - 1
java/storlead-api/src/main/resources/application-prod.yml

@@ -241,7 +241,7 @@ file:
 
 dify:
   base-url: http://47.112.196.2:11434/v1/
-  download-url: http://47.112.196.2:11435
+  download-url: https://trade.test.storlead.com
   dataset-api-key: dataset-qfhXMNcjsRSwN5CK6aoWx3hl
   app-keys:
     chat: app-1-qfhXMNcjsRSwN5CK6aoWx3hl  #对话

+ 1 - 1
java/storlead-api/src/main/resources/application-test.yml

@@ -176,7 +176,7 @@ logging:
 environment: test
 dify:
   base-url: http://47.112.196.2:11434/v1/
-  download-url: http://47.112.196.2:11435
+  download-url: https://trade.test.storlead.com
   dataset-api-key: dataset-qfhXMNcjsRSwN5CK6aoWx3hl
   app-keys:
     chat: app-1-qfhXMNcjsRSwN5CK6aoWx3hl  #对话

+ 2 - 2
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) => {