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

code/src/pages/index.js

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

code/src/pages/mobile.js

@@ -11,6 +11,6 @@ import {VueMasonryPlugin} from 'vue-masonry';
 
 import Components from "@/components/UI";
 
-console.log('v20220929.1830');
+console.log('v20221014.1616');
 
 createApp(App).use(Components).use(infiniteScroll).use(VueMasonryPlugin).use(router).directive('clickoutside', ClickOutSide).mount('#app')

code/src/views/collection/index.vue

@@ -31,7 +31,7 @@
 
           <ui-search
             v-model="searchKey"
-            :placeholder="'请输入展览名称'"
+            :placeholder="'请输入藏品名称'"
           ></ui-search>
         </div>
 

code/src/views/collection/mobile.vue

@@ -47,7 +47,7 @@
       <transition name="fade">
         <div class="searchcon" v-if="showInput">
           <img :src="require('@/assets/images/icon/label_search.png')" alt="">
-          <input v-model="searchKey" type="text" placeholder="请输入展览名称">
+          <input v-model="searchKey" type="text" placeholder="请输入藏品名称">
           <span @click="showInput=false">取消</span>
         </div>
       </transition>

code/src/views/home/aside.vue

@@ -213,7 +213,7 @@ onMounted(() => {
       font-weight: bold;
       padding-left: 16px;
       cursor: pointer;
-
+      position: relative;
       &::before {
         content: '';
         position: absolute;

code/src/views/home/list.vue

@@ -3,7 +3,9 @@
     <div class="mcon">
       <p v-if="list.length>0">{{list[0].cityName}} {{currentId === 'museum' ? '博物馆' : '虚拟场景'}}数量：{{list.length}}</p>
       <ul>
-        <li @click="onClickItem(item)" v-for="(item,i) in list" :key="i">
+        <li @click="onClickItem(item)" v-for="(item,i) in list" :key="i"
+          :title="item.name"
+        >
           {{item.name}}
         </li>
       </ul>
@@ -39,10 +41,14 @@ const onClickSelect = (data) => {
 }
 
 const onClickItem = data => {
-  if (data.name === '广东省博物馆') {
-    router.push({name: 'gdmuseum'})
+  if (currentId === 'museum') {
+    if (data.name === '广东省博物馆') {
+      router.push({name: 'gdmuseum'})
+    } else {
+      router.push({name:'exhibition',query:{id:data.id}})
+    }
   } else {
-    router.push({name:'exhibition',query:{id:data.id}})
+    router.push({name:'zhanlan',params:{id:data.id}})
   }
 }
 
@@ -102,6 +108,10 @@ onMounted(() => {
         border: 1px solid #333333;
         text-align: center;
         cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        padding: 0 1em;
 
         &:nth-of-type(4n) {
           margin-right: 0;