chenlei 3 mēneši atpakaļ
vecāks
revīzija
44b88b0cb6

+ 39 - 42
web/src/App.vue

@@ -1,42 +1,39 @@
-<template>
-  <div id="app">
-    <Router-view />
-  </div>
-</template>
-
-
-<script>
-
-export default {
-
-  created() {
-
-    // 移动端和pc端的切换
-    if (
-      window.navigator.userAgent.match(
-        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-      )
-    ) {
-      // 移动端
-      if (window.location.href.includes('en.capitalmuseum.org.cn')) {
-        window.location.href = window.location.origin + '/mobile/index.html#/Layout/Home'
-        setTimeout(() => {
-          location.reload(true);
-        }, 200);
-      }
-    }
-  }
-
-}
-</script>
-
-
-<style lang='less' scoped>
-#app {
-  width: 100%;
-  // min-width: 1280px;
-}
-</style>
-
-
-
+<template>
+  <div id="app">
+    <Router-view />
+  </div>
+</template>
+
+
+<script>
+
+export default {
+
+  created() {
+
+    // 移动端和pc端的切换
+    if (
+      window.navigator.userAgent.match(
+        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+      )
+    ) {
+      // 移动端
+      if (window.location.href.includes('en.capitalmuseum.org.cn')) {
+        window.location.href = window.location.origin + '/mobile/index.html#/Layout/Home'
+      }
+    }
+  }
+
+}
+</script>
+
+
+<style lang='less' scoped>
+#app {
+  width: 100%;
+  // min-width: 1280px;
+}
+</style>
+
+
+

+ 0 - 15
web/src/views/Home/index.vue

@@ -8,21 +8,6 @@
       aria-description="You've reached the slider section. This section has four image URLs. To browse the content, please use the tab key."
     >
       <!-- 新增的轮播图模块 -->
-      <el-carousel-item key="12">
-        <router-link
-          to="/Layout/ExhibitionsInfo?id=66&k=3"
-          replace
-          tabindex="0"
-          aria-label="Image link"
-          aria-description="Qi Baishi in Beijing: Commemorating the 160th Anniversary of His Birth"
-        >
-          <img
-            :src="require(`@/assets/images/swiper12.jpg`)"
-            alt="Qi Baishi in Beijing: Commemorating the 160th Anniversary of His Birth"
-          />
-        </router-link>
-      </el-carousel-item>
-
       <el-carousel-item key="11">
         <router-link
           to="/Layout/ExhibitionsInfo?id=64&k=1"

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 6 - 0
web/src/views/Search/dataAll.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 46 - 0
web/src/views/dataAll.js


+ 38 - 42
webM/src/App.vue

@@ -1,42 +1,38 @@
-<template>
-  <div id="app">
-    <Router-view />
-  </div>
-</template>
-
-
-<script>
-
-export default {
-
-  created() {
-    // 移动端和pc端的切换
-    if (
-      window.navigator.userAgent.match(
-        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-      )
-    ) {
-      // 移动端
-    } else {
-      console.log('----------',window.location.href);
-      if (window.location.href.includes('en.capitalmuseum.org.cn')) {
-        // PC端
-        window.location.href = window.location.origin
-        setTimeout(() => {
-          location.reload(true);
-        }, 200);
-
-      }
-    }
-
-  }
-
-}
-</script>
-
-<style lang="less">
-#app {
-  max-width: 500px;
-  margin: 0 auto;
-}
-</style>
+<template>
+  <div id="app">
+    <Router-view />
+  </div>
+</template>
+
+
+<script>
+
+export default {
+
+  created() {
+    // 移动端和pc端的切换
+    if (
+      window.navigator.userAgent.match(
+        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+      )
+    ) {
+      // 移动端
+    } else {
+      console.log('----------',window.location.href);
+      if (window.location.href.includes('en.capitalmuseum.org.cn')) {
+        // PC端
+        window.location.href = window.location.origin
+      }
+    }
+
+  }
+
+}
+</script>
+
+<style lang="less">
+#app {
+  max-width: 500px;
+  margin: 0 auto;
+}
+</style>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 46 - 0
webM/src/views/Exhibitions/data.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 46 - 0
webM/src/views/Exhibitions/dataAll.js


+ 0 - 1
webM/src/views/Home/index.vue

@@ -72,7 +72,6 @@ export default {
     return {
       topImg: [
         // { id: 1, path: "/Layout/Detail?id=1&k=3" },
-        { id: 12, path: "/Layout/Detail?id=66&k=3" },
         { id: 11, path: "/Layout/Detail?id=64&k=1" },
         { id: 10, path: "/Layout/Detail?id=63&k=2" },
         { id: 7, path: "/Layout/Detail?id=11&k=2" },

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 7 - 0
webM/src/views/Search/data.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 7 - 0
webM/src/views/Search/dataAll.js