Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/views/seachIndex.vue

src/components/seachPage/input.vue

@@ -797,7 +797,7 @@ img {
         .img {
             width: 20px;
             height: 20px;
-            margin-left: 10px;
+            margin-right: 6px;
         }
     }
 

src/main.js

@@ -44,19 +44,6 @@ import api from "./utils/api";
 import Axios from '@/utils/axios';
 
 
-api.index().then(res => {
-  if (res.code === 200) {
-    store.state.seachTypeData = res.data.combination
-    store.state.indexData = res.data
-    store.state.ListSelectBtn = res.data.recommendedTab
-    store.state.user = res.data.user
-    store.state.nav = res.data.nav
-    store.state.wechat = res.data.wechat
-    store.state.apartment = res.data.config.apartment
-  }
-})
-
-
 const app = createApp(App)
 
 app.use(ElButton)
@@ -82,9 +69,16 @@ app.use(ElAffix)
 
 app.use(lazyPlugin)
 
+app.use(store).use(router).use(Axios)
 
-app.use(store).use(router).use(Axios).mount('#app')
-// app.use(store).use(router).use(Axios).use(ElementPlus, {
-//   locale: zhCn
-// }).mount('#app')
-
+api.index().then(res => {
+    store.state.seachTypeData = res.data.combination
+    store.state.indexData = res.data
+    store.state.ListSelectBtn = res.data.recommendedTab
+    store.state.user = res.data.user
+    store.state.nav = res.data.nav
+    store.state.wechat = res.data.wechat
+    store.state.apartment = res.data.config.apartment
+}).finally(()=>{
+  app.mount('#app')
+})

src/views/seachIndex.vue

@@ -24,7 +24,12 @@
                 </div>
             </div>
         </div>
+<!-- <<<<<<< HEAD
+        <loadMoreText v-if="loading" loadText="加载中...."></loadMoreText>
+        <loadMoreText loadText="到底了"></loadMoreText>
+======= -->
         <loadMoreText :loadText="loadingText"></loadMoreText>
+<!-- >>>>>>> origin/main -->
         <listBtmPrompt></listBtmPrompt>
         <footerTool></footerTool>
     </div>