Merge branch 'ds_hxl' into ds

src/views/AIchat.vue

@@ -452,7 +452,7 @@ watch(
       const params1 = {
         content: newVal[newVal.length - 1].content,
         language: "cn",
-        marketList: "hk,cn,usa,my,sg,vi,in,gb",
+        marketList: "usa,sg,my,hk,cn,can,vi,th,in",
         token: localStorage.getItem("localToken"),
         // language: "cn",
         // marketList: "hk,cn,usa,my,sg,vi,in,gb"
@@ -513,7 +513,7 @@ watch(
         const params2 = {
           content: newVal[newVal.length - 1].content,
           language: "cn",
-          marketList: "hk,cn,usa,my,sg,vi,in,gb",
+          marketList: "usa,sg,my,hk,cn,can,vi,th,in",
           token: localStorage.getItem("localToken"),
           // language: "cn",
           // marketList: "hk,cn,usa,my,sg,vi,in,gb"

src/views/homePage.vue

@@ -536,7 +536,7 @@ onMounted(async () => {
         <!-- logo -->
         <div class="homepage-logo">
           <img :src="logo" alt="图片加载失败" class="logo1" />
-          <img :src="madeInHL" alt="图片加载失败" class="logo2" />
+          <!-- <img :src="madeInHL" alt="图片加载失败" class="logo2" /> -->
         </div>
 
         <div class="homepage-right-group">
@@ -609,6 +609,15 @@ onMounted(async () => {
             <img v-else-if="audioStore.isVoiceEnabled && audioStore.isPlaying" :src="voice" @click="toggleVoice" class="action-btn" style="opacity: 0.7; animation: pulse 1.5s infinite;" />
             <img v-else :src="voiceNoActive" @click="toggleVoice" class="action-btn" />
           </div>
+        </div>
+
+        <!-- 第二行输入框 -->
+        <div class="footer-second-line">
+          <img :src="msgBtn" class="msg-icon" />
+          <el-input type="textarea" v-model="message" @focus="onFocus" @blur="onBlur"
+            :autosize="{ minRows: 1, maxRows: 4 }" placeholder="请输入股票名称或股票代码..." class="msg-input"
+            @keydown.enter.exact.prevent="isLoading ? null : sendMessage()" resize="none">
+          </el-input>
           <img
             v-if="!chatStore.isLoading"
             :src="sendBtn"
@@ -622,15 +631,6 @@ onMounted(async () => {
             </el-icon>
           </div>
         </div>
-
-        <!-- 第二行输入框 -->
-        <div class="footer-second-line">
-          <img :src="msgBtn" class="msg-icon" />
-          <el-input type="textarea" v-model="message" @focus="onFocus" @blur="onBlur"
-            :autosize="{ minRows: 1, maxRows: 4 }" placeholder="请输入股票名称或股票代码..." class="msg-input"
-            @keydown.enter.exact.prevent="isLoading ? null : sendMessage()" resize="none">
-          </el-input>
-        </div>
       </el-footer>
     </el-container>
     <el-container v-else>
@@ -995,8 +995,10 @@ body {
 }
 
 .send-btn {
-  margin-left: auto;
-  margin-right: 5px;
+  margin-left: 10px;
+  height: 33px !important;
+  width: auto;
+  /* margin-right: 5px; */
 }
 
 /* 音频播放动画 */