公告页和反馈页适配

5 days ago · f30a7508dd
4 changed files with 67 additions and 25 deletions
--- a/src/views/AIchat.vue
+++ b/src/views/AIchat.vue
@ -758,24 +758,29 @@ watch(

      if (flag) {
        const params2 = {
-          content: newVal[newVal.length - 1].content,
          language: "cn",
-          marketList: "usa,sg,my,hk,cn,can,vi,th,in",
          token: localStorage.getItem("localToken"),
+          parentId: codeData.value.parentId,
+          stockId: codeData.value.stockId,
+          recordId: codeData.value.recordId,
+
+          // content: newVal[newVal.length - 1].content,
+          // marketList: "usa,sg,my,hk,cn,can,vi,th,in",
+          // name: codeData.value.name,
+          // code: codeData.value.code,
+          // market: codeData.value.market,
+
          // language: "cn",
          // marketList: "hk,cn,usa,my,sg,vi,in,gb"
          // token: "+SsksARQgUHIbIG3rRnnbZi0+fEeMx8pywnIlrmTxo5EOPR/wjWDV7w7+ZUseiBtf9kFa/atmNx6QfSpv5w",
-          name: codeData.value.name,
-          code: codeData.value.code,
-          market: codeData.value.market,
        };

        try {
          const env = import.meta.env.VITE_ENV;
          const result20 = await dataListAPI({
            token:
-              // "8Csj5VVX1UbIb4C3oxrnbZi0+fEeMx8pywnIlrmTm45Cb/EllzWACLto9J9+fCFsfdgBOvKvyY94FvqlvM0",
-              "8nkj4QBV1RPIb4CzoRTnbZi0+fEeMx8pywnIlrmTxdwROKkuwWqAWu9orpkpeXVqL98DPfeonNYpHv+mucA",
+              "8Csj5VVX1UbIb4C3oxrnbZi0+fEeMx8pywnIlrmTm45Cb/EllzWACLto9J9+fCFsfdgBOvKvyY94FvqlvM0",
+            // "8nkj4QBV1RPIb4CzoRTnbZi0+fEeMx8pywnIlrmTxdwROKkuwWqAWu9orpkpeXVqL98DPfeonNYpHv+mucA",
            market: codeData.value.market,
            code: codeData.value.code,
            language: "cn", //t.value.suoxie,
@ -2058,6 +2063,9 @@ watch(
          const handleOneAPI = async () => {
            try {
              result21 = await dbqbSecondOneAPI(params2);
+              if (result21.code == 400) {
+                throw new Error("API返回错误码400，请求失败");
+              }
              console.log("OneAPI成功返回:", result21);

              apiStatus.one.completed = true;
@ -2085,6 +2093,9 @@ watch(
          const handleTwoAPI = async () => {
            try {
              result22 = await dbqbSecondTwoAPI(params2);
+              if (result22.code == 400) {
+                throw new Error("API返回错误码400，请求失败");
+              }
              console.log("TwoAPI成功返回:", result22);

              apiStatus.two.completed = true;
@ -2111,6 +2122,9 @@ watch(
          const handleThreeAPI = async () => {
            try {
              result23 = await dbqbSecondThreeAPI(params2);
+              if (result23.code == 400) {
+                throw new Error("API返回错误码400，请求失败");
+              }
              // result23 = await dbqbSecondThreeAPI();

              console.log("ThreeAPI成功返回:", result23);
@ -2139,6 +2153,9 @@ watch(
          const handleFourAPI = async () => {
            try {
              result24 = await dbqbSecondFourAPI(params2);
+              if (result24.code == 400) {
+                throw new Error("API返回错误码400，请求失败");
+              }
              console.log("FourAPI成功返回:", result24);

              apiStatus.four.completed = true;
--- a/src/views/Announcement.vue
+++ b/src/views/Announcement.vue
@ -5,6 +5,9 @@ import {
  qsArpAamClickAPI,
  getMarketAndCodeAPI,
 } from "../api/AIxiaocaishen";
+import back from "../assets/img/Feedback/back.png";
+import { useDataStore } from "@/store/dataList.js";
+const dataStore = useDataStore();

 const marketList = ref({
  usa: "美股",
@ -79,6 +82,10 @@ const clickCode = (code) => {
  emit("ensureAIchat");
 };

+const feedbackBack = () => {
+  dataStore.isFeedback = false;
+};
+
 onMounted(() => {
  getAnnouncement();

@ -86,6 +93,11 @@ onMounted(() => {
 });
 </script>
 <template>
+  <div>
+    <div @click="feedbackBack">
+      <img :src="back" alt="返回按钮" class="backImg" />
+    </div>
+  </div>
  <div class="main-wrapper">
    <div class="video-container">
      <video
@ -132,6 +144,12 @@ onMounted(() => {
  </div>
 </template>
 <style scoped>
+.backImg {
+  width: 40px;
+  height: 40px;
+  margin-left: 10px;
+}
+
 .main-wrapper {
  height: 100%;
  display: flex;
--- a/src/views/components/HistoryRecord.vue
+++ b/src/views/components/HistoryRecord.vue
@ -39,7 +39,7 @@
    </div>

    <!-- 历史记录内容 -->
-    <div class="history-content" v-show="!isCollapsed">
+    <div class="history-content" v-if="!isCollapsed">
      <div class="head-container">
        <!-- 标题 -->
        <div class="history-actions">
@ -183,7 +183,7 @@
    }"
  >
    <!-- 历史记录内容 -->
-    <div class="history-content" v-show="!isCollapsed">
+    <div class="history-content" v-if="!isCollapsed">
      <div class="mobile-head-container">
        <!-- 折叠/展开按钮 -->
        <img
@ -377,7 +377,7 @@ const marketList = ref({
  can: "https://d31zlh4on95l9h.cloudfront.net/images/26382451bfa08e6a419a2190b799dae5.png",
  my: "https://d31zlh4on95l9h.cloudfront.net/images/7efa8487a1317ed17eacc77b58e0a26d.png",
 });
-const isCollapsed = ref(false);
+const isCollapsed = ref(true);
 const selectedRecordId = ref(null);

 const delObj = ref({});
--- a/src/views/homePage.vue
+++ b/src/views/homePage.vue
@ -7,6 +7,7 @@ import { ElMessage } from "element-plus";
 import AIchat from "./AIchat.vue";
 import AIfind from "./AIfind.vue";
 import Feedback from "./Feedback.vue";
+import Announcement from "./Announcement.vue";
 import { useAppBridge } from "../assets/js/useAppBridge.js";
 import { useDataStore } from "@/store/dataList.js";
 import { useChatStore } from "../store/chat";
@ -125,9 +126,6 @@ const setActiveTab = (tab, index, forceAIchat = false) => {

 // 修改 activeComponent 的计算逻辑
 const activeComponent = computed(() => {
-  if (isAnnouncementVisible.value) {
-    return Announcement;
-  }
  if (activeTab.value === "AIchat") {
    return AIchat;
  } else if (activeTab.value === "AIfind") {
@ -137,6 +135,14 @@ const activeComponent = computed(() => {
  }
 });

+const activeTwoTab = computed(() => {
+  if (isAnnouncementVisible.value) {
+    return Announcement;
+  } else {
+    return Feedback;
+  }
+});
+
 // 新增一个方法，调用时先判断是否处于 AIchat，若不在则跳转到 AIchat
 const ensureAIchat = () => {
  setActiveTab("AIchat", 0, true);
@ -187,11 +193,6 @@ const sendMessage = async () => {
  }
  isScrolling.value = false;

-  // 添加到历史记录
-  if (historyRecordRef.value && message.value.trim()) {
-    historyRecordRef.value.addRecord(message.value.trim(), activeTab.value);
-  }
-
  // 判断当前是否为 AiEmotion 组件
  if (activeTab.value === "AiEmotion") {
    // 禁用输入框
@ -250,25 +251,32 @@ const handleHistorySelect = (record) => {
 };

 // 公告
-// 引入公告组件
-import Announcement from "./Announcement.vue";

 // 新增一个变量来控制是否显示公告页面
 const isAnnouncementVisible = ref(false);

 const showAnnouncement = async () => {
  console.log("打开公告");
-  dataStore.isFeedback = false; // 显示用户反馈页面
+  dataStore.isFeedback = true; // 显示用户反馈页面
  isScrolling.value = false; //回复滚动到底部方法
-  setActiveTab("", -1); // 清空当前选中状态
-
  isAnnouncementVisible.value = true; // 显示公告页面
+  if (isMobile.value) {
+    if (historyRecordRef) {
+      historyRecordRef.value.isCollapsed = true;
+    }
+  }
 };

 // 跳转用户反馈
 const showFeedback = () => {
  console.log("打开用户反馈");
  dataStore.isFeedback = true; // 显示用户反馈页面
+  isAnnouncementVisible.value = false; // 显示反馈页面
+  if (isMobile.value) {
+    if (historyRecordRef) {
+      historyRecordRef.value.isCollapsed = true;
+    }
+  }
 };

 // 点击剩余次数会弹出的弹窗
@ -575,7 +583,6 @@ const expandHistory = () => {

 onMounted(async () => {
  throttledJudgeDevice();
-
  // 禁用全局触摸滚动
  touchmoveHandlerRef = touchmoveHandler;
  document.addEventListener("touchmove", touchmoveHandlerRef, {
@ -851,7 +858,7 @@ onUnmounted(() => {

      <!-- 主体部分：小人  问题轮询图  对话内容 -->
      <el-main class="homepage-body">
-        <feedback :is="Feedback" />
+        <component :is="activeTwoTab" />
      </el-main>
    </el-container>
    <!-- 弹窗 -->