Merge branch 'hongxilin/feature-20250628153758-财神优化：字正确性，一致性等' into milestone-20250710-上线前优化

src/api/AIxiaocaishen.js

@@ -208,6 +208,8 @@ export const getMarketAndCodeAPI = function (params) {
     method: "POST",
     data: new URLSearchParams(params),
     headers: {
+      token:
+        "pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q",
       "Content-Type": "application/x-www-form-urlencoded",
     },
   });

src/views/AIchat.vue

@@ -31,7 +31,6 @@ import title4 from "@/assets/img/AIchat/综合作战.png";
 import logo1 from "@/assets/img/AIchat/夺宝奇兵logo.png";
 import logo2 from "@/assets/img/AIchat/开启无限财富.png";
 import bgc from "@/assets/img/AIchat/圈.png";
-
 const chatStore = useChatStore();
 const audioStore = useAudioStore();
 const dataStore = useDataStore();
@@ -579,12 +578,10 @@ watch(
 
         try {
           const env = import.meta.env.VITE_ENV;
-
           const result20 = await dataListAPI({
             token:
-              env == "development"
-                ? "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,

src/views/Announcement.vue

@@ -1,72 +1,73 @@
 <script setup>
 import { ref, onMounted } from "vue";
-import { getAnnouncementAPI, qsArpAamClickAPI, getMarketAndCodeAPI } from "../api/AIxiaocaishen";
+import {
+  getAnnouncementAPI,
+  qsArpAamClickAPI,
+  getMarketAndCodeAPI,
+} from "../api/AIxiaocaishen";
 
 const marketList = ref({
-  "usa": "美股",
-  "cn": "A股",
-  "hk": "港股",
-  "sg": "新加坡股",
-  "my": "马股",
-  "th": "泰股",
-  "vi": "越南股",
-  "can": "加拿大股"
-})
+  usa: "美股",
+  cn: "A股",
+  hk: "港股",
+  sg: "新加坡股",
+  my: "马股",
+  th: "泰股",
+  vi: "越南股",
+  can: "加拿大股",
+});
 
 const codeList = ref([
-  { market: '美股', code: [] },
-  { market: 'A股', code: [] },
-  { market: '港股', code: [] },
-  { market: '新加坡股', code: [] },
-  { market: '马股', code: [] },
-  { market: '泰股', code: [] },
-  { market: '越南股', code: [] },
-  { market: '加拿大股', code: [] },
-])
+  { market: "美股", code: [] },
+  { market: "A股", code: [] },
+  { market: "港股", code: [] },
+  { market: "新加坡股", code: [] },
+  { market: "马股", code: [] },
+  { market: "泰股", code: [] },
+  { market: "越南股", code: [] },
+  { market: "加拿大股", code: [] },
+]);
 
 const getMarketAndCode = async () => {
-  const result = await getMarketAndCodeAPI()
+  const result = await getMarketAndCodeAPI();
   // console.log(result.data, "MarketAndCode");
 
   for (let i = 0; i < result.data.length; i++) {
     const item = result.data[i];
     const market = marketList.value[item.market];
-    const codeLists=item.code.split(',')
+    const codeLists = item.code.split(",");
     // console.log(codeLists, "codeLists",market,'market');
 
-    const targetMarket=codeList.value.find(item=>item.market==market)
-    if(targetMarket){
-      targetMarket.code=codeLists
+    const targetMarket = codeList.value.find((item) => item.market == market);
+    if (targetMarket) {
+      targetMarket.code = codeLists;
       // console.log(targetMarket, "targetMarket");
-    }else{
-      console.log("未找到对应的市场")
+    } else {
+      console.log("未找到对应的市场");
     }
-
-
   }
-
-}
+};
 
 const announcementVideo = ref({});
 const getAnnouncement = async () => {
-  const result = await getAnnouncementAPI()
+  const result = await getAnnouncementAPI();
   // console.log(result.data, "result.data");
   announcementVideo.value.url = result.data[0].url;
   announcementVideo.value.img = result.data[0].img;
 
   const click = await qsArpAamClickAPI({
-    token: localStorage.getItem('localToken'),
-    id: result.data[0].id
-  })
+    token: localStorage.getItem("localToken"),
+    id: result.data[0].id,
+  });
   // console.log(click);
 
   // console.log(announcementVideo.value, "announcementVideo");
-}
+};
 
 const handleVideoPlay = () => {
-  console.log('视频开始播放');
+  console.log("视频开始播放");
   // 可以在这里添加播放统计逻辑
-}
+};
 
 // 定义自定义事件
 const emit = defineEmits(["updateMessage", "ensureAIchat"]);
@@ -76,19 +77,25 @@ const clickCode = (code) => {
 
   emit("updateMessage", code);
   emit("ensureAIchat");
-}
+};
 
 onMounted(() => {
-  getAnnouncement()
-  getMarketAndCode()
-})
+  getAnnouncement();
 
+  getMarketAndCode();
+});
 </script>
 <template>
   <div class="main-wrapper">
     <div class="video-container">
-      <video ref="videoPlayer" :poster="announcementVideo.img" :src="announcementVideo.url" controls
-        class="video-player" @play="handleVideoPlay">
+      <video
+        ref="videoPlayer"
+        :poster="announcementVideo.img"
+        :src="announcementVideo.url"
+        controls
+        class="video-player"
+        @play="handleVideoPlay"
+      >
         Your browser does not support the video tag.
       </video>
     </div>
@@ -96,16 +103,25 @@ onMounted(() => {
 
     <div class="announcement">
       <p class="announcementItem">各位AI小财神的用户,大家好!</p>
-      <p class="announcementItem">试运行期间,用户可在AI小财神中查看全市场数据,每个市场可查看20只股票.</p>
+      <p class="announcementItem">
+        试运行期间,用户可在AI小财神中查看全市场数据,每个市场可查看20只股票.
+      </p>
       <p class="announcementItem">以下为各个市场可以查看的股票：</p>
       <!-- <p class="announcementItem">历软件云版静态市场一致!</p>
         <p class="announcementItem">特此公告!</p> -->
-      <div v-for="(item, index) in codeList" :key="index" class="announcementItem">
-        <div class="announcementItem">{{ item.market }}：
-          <span class="codeItem" v-for="(code, index) in item.code" :key="index">
-            <span v-if="index != 0" class="codeItem">
-              、
-            </span>
+      <div
+        v-for="(item, index) in codeList"
+        :key="index"
+        class="announcementItem"
+      >
+        <div class="announcementItem">
+          {{ item.market }}：
+          <span
+            class="codeItem"
+            v-for="(code, index) in item.code"
+            :key="index"
+          >
+            <span v-if="index != 0" class="codeItem"> 、 </span>
             <span @click="clickCode(code)" class="code">
               {{ code }}
             </span>
@@ -171,7 +187,7 @@ p {
 }
 
 .codeItem {
-  color: #4591E7;
+  color: #4591e7;
 }
 
 .code {

src/views/components/marketTemperature.vue

@@ -56,7 +56,13 @@
                     休市
                   </div>
                   <div class="calendarItemContent" v-else>
-                    {{ item.market_temperature }} | {{ item.stock_temperature }}
+                    <div v-if="isIndexCode">
+                      {{ item.market_temperature }}
+                    </div>
+                    <div v-else>
+                      {{ item.market_temperature }} |
+                      {{ item.stock_temperature }}
+                    </div>
                   </div>
                 </div>
               </div>
@@ -154,7 +160,7 @@ const months = ref([
   "12月",
 ]);
 
-const calendarDate = ref(moment().format("YYYY年M月"));
+const calendarDate = ref();
 const week = ref(["周一", "周二", "周三", "周四", "周五", "周六", "周日"]);
 
 const KlineCanvs = ref();
@@ -180,11 +186,16 @@ const isIndexCode = computed(() => indexCodes.includes(props.code));
 
 const currentData = ref([]);
 const fetchCalendarData = () => {
+  const monthTitle = ref([]);
   currentData.value = JSON.parse(JSON.stringify(WDRL.value));
   for (let i = 0; i < currentData.value.length; i++) {
     const day = moment(currentData.value[i].date).date();
     currentData.value[i].day = day;
     if (i == 0 || day == 1) {
+      monthTitle.value.push({
+        year: moment(currentData.value[i].date).year(),
+        month: moment(currentData.value[i].date).month() + 1,
+      });
       currentData.value[i].month =
         moment(currentData.value[i].date).month() + 1;
     }
@@ -205,6 +216,16 @@ const fetchCalendarData = () => {
       }
     }
   }
+
+  const stDate = monthTitle.value[0];
+  const edDate = monthTitle.value[monthTitle.value.length - 1];
+  calendarDate.value = `${stDate.year}年${stDate.month}月 ~`;
+  if (stDate.year != edDate.year) {
+    calendarDate.value += `${edDate.year}年${edDate.month}月`;
+  } else {
+    calendarDate.value += `${edDate.month}月`;
+  }
+
   console.log(currentData.value);
 };