sh_museum/src/components/card/index.vue

@@ -75,7 +75,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-size: 16px;
+    font-size: 14px;
     padding: 8px 10px;
     .tag {
       color: @theme;
@@ -111,9 +111,11 @@ export default {
     &:nth-of-type(2n) {
       margin-right: 0;
     }
-    // &:nth-of-type(4n){
-    //   margin-right: @margin;
-    // }
+    
+    .card-img {
+      width: 100%;
+      height: 100px;
+    }
   }
 }
 </style>

sh_museum/src/components/popupLayout/Alert.vue

@@ -59,8 +59,8 @@ textarea::placeholder {
 }
 
 .ui-message {
-  width: 400px;
-  height: 240px;
+  width: 50vw;
+  height: 140px;
   position: relative;
   background: #f5ede2;
   padding: 20px 50px;

sh_museum/src/components/popupLayout/Message.vue

@@ -180,9 +180,31 @@ textarea::placeholder {
 
 @media screen and (max-width: 500px) {
   .ui-message {
-    width: 90%;
+    width: 70%;
     border-radius: 8px;
     padding: 20px;
+
+    .ui-message-header {
+      p {
+        font-size: 20px;
+        margin: 10px 0;
+      }
+    }
+    .ui-message-main {
+      ul {
+        li {
+          textarea {
+            height: 100px;
+          }
+        }
+      }
+    }
+    .ui-message-footer {
+      .ui-button {
+        width: 93px;
+        height: 34px;
+      }
+    }
   }
 }
 </style>

sh_museum/src/components/slide/index.vue

@@ -192,8 +192,12 @@ export default {
       z-index: 888;
       top: 45%;
       img {
-        z-index: 888;
+        z-index: 88;
         width: 50%;
+        opacity: 1;
+      }
+      .active {
+        opacity: 1;
       }
     }
     #sPrev {

sh_museum/src/pages/floorlist/index.vue

@@ -5,7 +5,7 @@
 
         <div class="l-h">
           <img :src="`${$cdn}images/icon-story.png`" alt="" />
-          <p>{{params.name}}</p>
+          <p>{{params.name}}</p> 
         </div>
 
         <div class="l-type">
@@ -60,7 +60,7 @@
 
         <div class="l-h">
           <img :src="`${$cdn}images/icon-story.png`" alt="" />
-          <p>{{params.name}}</p>
+          <p>自由漫游</p>
         </div>
 
         <div class="l-type">
@@ -71,7 +71,7 @@
                 <li
                   :class="{ active: item.id === b_active }"
                   v-for="(item, i) in blocks"
-                  @click="b_active = item.id; blockVisible = false"
+                  @click="b_active = item.id; blockVisible = false; "
                   :key="i"
                 >
                   {{ item.name }}
@@ -94,6 +94,9 @@
               </ul>
             </div>
           </div>
+
+          <img class="search-bar" :src="`${$cdn}images/mobile/home_search_bar.png`" alt="" @click="$router.push({path:'/search'})">
+
         </div>
 
         <div class="l-con">
@@ -130,6 +133,10 @@ import Card from "@/components/card";
 
 let blocks = [
   {
+    name: "全部",
+    id:  '',
+  },
+  {
     name: "东楼",
     id: 1
   },
@@ -173,11 +180,11 @@ export default {
       blocks,
       list:[],
       a_active: '',
-      b_active: 1,
+      b_active: '', // 1
       l_active: '',
       t_active: '',
       total: 100,
-      pageSize: 8,
+      pageSize: 20, // 8
       currentPage: 1,
       type:'roam',
       block: null,
@@ -198,6 +205,11 @@ export default {
       })
     },
     async getList(){
+
+      if(this.isMobile) {
+        this.pageSize = 500;
+      }
+
       let res = await this.$http({
         method:'post',
         data:{
@@ -212,11 +224,10 @@ export default {
       })
       this.list = res.data.list
       this.total = res.data.total
-
-      
     },
     refresh(){
-      this.currentPage===1?(this.getList()):(this.currentPage = 1)
+      
+      this.currentPage===1 ? (this.getList()) : (this.currentPage = 1)
     }
   },
   watch:{
@@ -237,10 +248,8 @@ export default {
     }
   },
   mounted(){
-    this.getList()
-    if(this.isMobile) {
-      this.pageSize = this.total;
-    }
+    this.getList();
+    
   }
 };
 </script>
@@ -428,16 +437,16 @@ export default {
             font-size: 0;
             li {
               display: block;
-              padding: 2px 6px;
+              padding: 8px;
               // margin: 0 6px;
               cursor: pointer;
               text-align: left;
               color: #382e2c;
-              font-size: 16px;
+              font-size: 14px;
             }
             .active {
-              background: @theme;
-              color: #c9a27b;
+              background: #d6b8ae;
+              color: @theme;
             }
           }
           
@@ -446,28 +455,39 @@ export default {
           position: fixed;
             top: 18vh;
             left: 5vw;
+            font-size: 14px;
           }
           #select-block {
             top: 21vh;
             left: 5vw;
+            font-size: 14px; 
           }
           #label-area {
             position: fixed;
             top: 18vh;
             left: 25vw;
+            font-size: 14px;
           }
           #select-area {
             top: 21vh;
             left: 25vw;
+            font-size: 14px;
           }
       }
+      .search-bar {
+        position: fixed;
+        top: 18vh;
+        right: 5vw;
+        width: 30vw;
+        z-index: 100;
+      }
     }
     .l-con {
       position: fixed;
-      top: 25vh;
+      top: 23vh;
       left: 5vw;
       width: 93vw;
-      height: 55vh;
+      height: 65%;
       padding: 0;
       box-sizing: border-box;
       text-align: left;

sh_museum/src/pages/layout/aside.vue

@@ -175,7 +175,7 @@ input::placeholder {
 
       img {
         width: 16vw;
-        height: 16vw;
+        height: auto;
         padding: 10px 5px 5px 5px;
       }
     }

sh_museum/src/pages/layout/header.vue

@@ -54,4 +54,17 @@ export default {
     pointer-events: none;
   }
 }
+
+@media screen and (max-width: 500px) {
+  .header{
+    margin: 0;
+    padding: 0 20px;
+    .logo{
+      cursor: pointer;
+      width: 40vw;
+      pointer-events: auto;
+    }
+    
+  }
+}
 </style>

sh_museum/src/pages/list/index.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
 
-
+          <img class="search-bar" :src="`${$cdn}images/mobile/home_search_bar.png`" alt="" @click="$router.push({path:'/search'})">
 
         </div>
         <div class="l-con">
@@ -373,7 +373,7 @@ export default {
             font-size: 0;
             li {
               display: block;
-              padding: 2px 6px;
+              padding: 8px;
               // margin: 0 6px;
               cursor: pointer;
               text-align: left;
@@ -381,8 +381,8 @@ export default {
               font-size: 16px;
             }
             .active {
-              background: @theme;
-              color: #c9a27b;
+              background: #d6b8ae;
+              color: @theme;
             }
           }
         }
@@ -390,37 +390,51 @@ export default {
           position: fixed;
           top: 18vh;
           left: 5vw;
+          font-size: 14px;
         }
         #label-area {
           position: fixed;
           top: 18vh;
           left: 25vw;
+          font-size: 14px;
         }
         #label-types {
           position: fixed;
           top: 18vh;
           left: 45vw;
+          font-size: 14px;
         }
         #select-louti {
           top: 21vh;
           left: 5vw;
+          font-size: 14px;
         }
         #select-area {
           top: 21vh;
           left: 25vw;
+          font-size: 14px;
         }
         #select-types {
           top: 21vh;
           left: 45vw;
+          font-size: 14px;
         }
       }
+
+      .search-bar {
+        position: fixed;
+        top: 18vh;
+        right: 5vw;
+        width: 30%;
+        z-index: 100;
+      }
     }
     .l-con {
       position: fixed;
-      top: 25vh;
+      top: 23vh;
       left: 5vw;
       width: 93vw;
-      height: 55vh;
+      height: 65%;
       padding: 0;
       box-sizing: border-box;
       text-align: left;

sh_museum/src/pages/parts/index.vue

@@ -15,7 +15,7 @@
               <template v-else>
                 <iframe :src="activeItem&&activeItem.webSite" frameborder="0"></iframe>
               </template>
-              <!-- <img class="full-btn" @click="full=true" :src="`${$cdn}images/full-btn.png`" alt=""> -->
+              <img class="full-btn" @click="full=true" :src="`${$cdn}images/full-btn.png`" alt="">
             </div>
             <slide v-if="list.length>0" @activeItem="handleItem" :list='list' :idx='activeIdx' class="sld"/>
           </div>
@@ -170,21 +170,22 @@ export default {
         text-align: center;
         background: url('../../assets/images/mobile/title_bg.png') no-repeat;
         background-size:100% 100%;
-        font-size: 0;
+        
         // margin-top: @liTop;
         span{
           display: inline-block;
           // writing-mode: vertical-rl;
           letter-spacing: 4px;
-          font-size: 30px;
-          padding: 10px 20px;
+          font-size: 24px;
+          padding: 15px 20px;
           color: #F5EDE2;
           text-shadow: -2px 2px 0 #382E2C;
+          white-space: nowrap;
         }
       }
       .p-img{
         position: fixed;
-        top: 30vh;
+        top: 23vh;
         left: 50vw;
         transform: translate(-50%,0%);
         width: 80%;
@@ -201,11 +202,11 @@ export default {
           }
         
           .full-btn{
-            width: 50px;
+            width: 30px;
             height: auto;
             position: absolute;
-            right: 40px;
-            bottom: 30px;
+            right: 15px;
+            bottom: 35px;
             cursor: pointer;
             z-index: 99;
           }
@@ -217,7 +218,7 @@ export default {
         // writing-mode: vertical-rl;
         width: 80vw;
         position: fixed;
-        top: 60vh;
+        top: 53vh;
         left: 10vw;
         p{
           letter-spacing: 4.5px;
@@ -227,13 +228,15 @@ export default {
           font-size: 80%;
           &:first-of-type{
             color: @theme;
-            border-bottom: 2px solid @theme;
+            border-top: 2px solid @theme;
+            border-bottom: 0px solid @theme;
             padding: 0 4px;
             letter-spacing: 10px;
             font-weight: bold;
+            display: inline-block;
           }
           &:nth-of-type(2){
-            border-bottom: 2px solid @theme;
+            border-top: 2px solid @theme;
           }
           &:last-of-type{
             display: inline-block;
@@ -267,10 +270,11 @@ export default {
       height: 100%;
     }
     .full-btn{
-      width: 50px;
+      width: 30px;
+      height: auto;
       position: absolute;
-      right: 40px;
-      bottom: 30px;
+      right: 20px;
+      bottom: 90px;
       cursor: pointer;
     }
   }

sh_museum/src/pages/tunnel/index.vue

@@ -76,9 +76,9 @@ export default {
     .bg {
       position: fixed;
       left: 0;
-      bottom: 10vh;
+      bottom: 0vh;
       width: 100vw;
-      height: 90vh;
+      height: 100vh;
     }
     video{
       width: 100%;

sh_museum/src/utils/browser.js

@@ -9,8 +9,8 @@ function versions () {
       webKit: u.indexOf('AppleWebKit') > -1,
       // 火狐内核
       gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') === -1,
-      // 是否为移动终端
-      mobile: /Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent),
+      // 是否为移动终端 / Tablets use desktop version
+      mobile: (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) && !(/Tablet|iPad/i.test(navigator.userAgent)),
       // ios终端
       ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
       // android终端或者uc浏览器