Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/guangdongVR_museum into master

code/src/config/http.js

@@ -4,6 +4,7 @@ import { Loading } from "@/components/UI";
 
 var isProduction = process.env.NODE_ENV === "production";
 
+// const serverName = isProduction ? "/api/" : "http://192.168.20.55:8035/api/";
 const serverName = isProduction ? "/api/" : "http://gdbwg.4dage.com/api/";
 
 const serverLocation = window.location.hostname;

code/src/pages/index.js

@@ -14,7 +14,7 @@ let uaInfo = uaParser.getResult()
 //     doBrowserTip()
 import Components from "@/components/UI";
 
-console.log('v20220929.1830');
+console.log('v20221009.1611');
 
 let app = createApp(App)
 app.use(Components).use(infiniteScroll).use(VueMasonryPlugin).use(router).mount('#app')

code/src/views/exhibition/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="gdmuseum">
     <div class="info" v-if="currentMuseum">
-      <div>{{currentMuseum.name}}</div>
+      <div :title="currentMuseum.name">{{currentMuseum.name}}</div>
       <p>
         {{currentMuseum.description || '暂无简介'}}
       </p>
@@ -87,6 +87,9 @@ let updateMuseum = (data)=>{
       font-size: 30px;
       font-weight: bold;
       color: var(--main-color);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
     > p {
       width: 50%;