From 1c5c3c677373c7c3d462bdaaee55a91ae8efc74a Mon Sep 17 00:00:00 2001
From: NCJOAQ <2627723488@qq.com>
Date: Sat, 8 Nov 2025 20:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E8=B7=AF=E7=94=B1=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=AE=8C=E6=88=90=EF=BC=8C=E5=86=85=E5=AE=B9=E5=BE=85?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85......?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/{movie => }/index.vue               |  0
 src/pages/movie/cinema/cinema.vue             | 13 ++++++++++
 src/pages/movie/components/MyNav.vue          | 24 ++++++++++++++++---
 src/pages/movie/hot/MyMovies.vue              |  6 ++---
 src/pages/movie/hot/components/MyMain.vue     | 12 +++++++---
 .../movie/hot/components/MyMostPopular.vue    |  6 ++---
 .../movie/hot/components/MyMovieList.vue      |  9 +++----
 src/pages/movie/wait/wait.vue                 | 13 ++++++++++
 src/pages/search/index.vue                    | 15 ++++++++++++
 src/router/index.js                           | 23 ++++++++++++++----
 10 files changed, 98 insertions(+), 23 deletions(-)
 rename src/pages/{movie => }/index.vue (100%)
 create mode 100644 src/pages/movie/cinema/cinema.vue
 create mode 100644 src/pages/movie/wait/wait.vue
 create mode 100644 src/pages/search/index.vue

diff --git a/src/pages/movie/index.vue b/src/pages/index.vue
similarity index 100%
rename from src/pages/movie/index.vue
rename to src/pages/index.vue
diff --git a/src/pages/movie/cinema/cinema.vue b/src/pages/movie/cinema/cinema.vue
new file mode 100644
index 0000000..c5ca5fd
--- /dev/null
+++ b/src/pages/movie/cinema/cinema.vue
@@ -0,0 +1,13 @@
+<template lang="">
+  <div>
+    电影页面
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/movie/components/MyNav.vue b/src/pages/movie/components/MyNav.vue
index c80bfe5..db284d1 100644
--- a/src/pages/movie/components/MyNav.vue
+++ b/src/pages/movie/components/MyNav.vue
@@ -4,8 +4,8 @@
       <span class="location">杭州</span>
     </router-link>
     <ul>
-      <li v-for="(item, index) in list" @click="setIndex(index)" :class="{ active: activeIndex == index }">{{ item
-      }}
+      <li v-for="(item, index) in list" @click="setIndex(index)" :class="{ active: activeIndex == index }">
+        {{ item }}
       </li>
       <div class="redline" :class="{ left: activeIndex === 0, right: activeIndex === 2 }"></div>
     </ul>
@@ -23,6 +23,21 @@ export default {
   }, methods: {
     setIndex(i) {
       this.activeIndex = i;
+      console.log(this.activeIndex)
+      switch (this.activeIndex) {
+        case 0:
+          this.$router.push("/movie/movies/hot")
+          break
+        case 1:
+          this.$router.push("/movie/movies/cinema")
+          break
+        case 2:
+          this.$router.push("/movie/movies/wait")
+          break
+
+
+      }
+      console.log("case")
     }
   }
 }
@@ -66,12 +81,15 @@ export default {
   >ul {
     position: relative;
 
-    >li {
+    li {
+
       width: 44px;
       padding: 0 5px;
       margin: 0 5px;
+
     }
 
+
     >.redline {
       @lineheight: 3px;
       width: 20px;
diff --git a/src/pages/movie/hot/MyMovies.vue b/src/pages/movie/hot/MyMovies.vue
index 928b53d..9201af1 100644
--- a/src/pages/movie/hot/MyMovies.vue
+++ b/src/pages/movie/hot/MyMovies.vue
@@ -1,8 +1,6 @@
 <template lang="html">
-  <div>
-    <Nav></Nav>
-    <router-view></router-view>
-  </div>
+  <Nav></Nav>
+  <router-view></router-view>
 </template>
 <script>
 import Nav from '../components/MyNav.vue'
diff --git a/src/pages/movie/hot/components/MyMain.vue b/src/pages/movie/hot/components/MyMain.vue
index 90856b6..adeeed5 100644
--- a/src/pages/movie/hot/components/MyMain.vue
+++ b/src/pages/movie/hot/components/MyMain.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="main" ref="main">
     <div class="box" ref="box">
-      <Most-Popular />
-      <Movie-List @soc="initsoc" :more="more" />
+      <MostPopular />
+      <MovieList @soc="initsoc" :more="more" />
     </div>
   </div>
 </template>
@@ -33,13 +33,19 @@ export default {
       const el = this.$refs.main;
       this.total = data.total;
       this.ids = data.ids;
+      setTimeout(() => {
+        console.log(el.offsetHeight);
+        console.log(this.$refs.box.offsetHeight);
+      })
+
+
       let bs = new BScroll(el, {
-        // ...
         pullUpLoad: true,
         startX: 0,
         startY: 0,
         scrollY: true
       })
+      //上拉数据传参
       bs.on("pullingUp", async () => {
         const ids = this.ids.slice(this.startIndex, this.startIndex + 10)
         if (this.startIndex == this.total) { return }
diff --git a/src/pages/movie/hot/components/MyMostPopular.vue b/src/pages/movie/hot/components/MyMostPopular.vue
index e77798d..ecf9b35 100644
--- a/src/pages/movie/hot/components/MyMostPopular.vue
+++ b/src/pages/movie/hot/components/MyMostPopular.vue
@@ -25,7 +25,7 @@
 <script>
 import BScroll from 'better-scroll'
 import { nextTick } from 'vue'
-import {request} from "@/utils"
+import { request } from "@/utils"
 export default {
   data() {
     return {
@@ -56,9 +56,6 @@ export default {
     let el = this.$refs.ul1
     console.log(el.offsetWidth)
     new BScroll(el, {
-      // pullUpLoad: true,
-      // wheel: true,
-      // scrollbar: true,
       startX: 0,
       startY: 0,
       scrollX: true
@@ -86,6 +83,7 @@ export default {
   .wrap {
     overflow: hidden;
     display: block;
+
     >ul {
       display: inline-flex;
       flex-wrap: nowrap;
diff --git a/src/pages/movie/hot/components/MyMovieList.vue b/src/pages/movie/hot/components/MyMovieList.vue
index ca32912..4830333 100644
--- a/src/pages/movie/hot/components/MyMovieList.vue
+++ b/src/pages/movie/hot/components/MyMovieList.vue
@@ -14,8 +14,10 @@
           <p v-if="movie.globalReleased">{{ movie.showInfo }}</p>
         </div>
         <div class="btn-box">
-          <div class="btn" :style="{ backgroundColor: movie.showStateButton?'movie.showStateButton?.color':'white' }">{{ movie.showStateButton?.content
-          }}
+          <div class="btn"
+            :style="{ backgroundColor: movie.showStateButton ? 'movie.showStateButton?.color' : 'white' }">{{
+              movie.showStateButton?.content
+            }}  
           </div>
         </div>
       </div>
@@ -35,7 +37,7 @@ export default {
   },
   async mounted() {
     let data = await request("http://101.35.148.193:3000/api/movies/list");
-    console.log(this.more)
+    // console.log(this.more)
     if (data.success) {
       this.data = data;
     } else {
@@ -126,7 +128,6 @@ export default {
         }
       }
 
-
       >.btn-box {
         overflow: hidden;
 
diff --git a/src/pages/movie/wait/wait.vue b/src/pages/movie/wait/wait.vue
new file mode 100644
index 0000000..b33bb06
--- /dev/null
+++ b/src/pages/movie/wait/wait.vue
@@ -0,0 +1,13 @@
+<template lang="html">
+  <div>
+    待映页
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
new file mode 100644
index 0000000..a5f352d
--- /dev/null
+++ b/src/pages/search/index.vue
@@ -0,0 +1,15 @@
+<template lang="html">
+  <Headers>搜索</Headers>
+  <div>
+    搜索页
+  </div>
+</template>
+<script>
+import Headers from '../movie/components/MyHeader.vue';
+export default {
+  components: {
+    Headers
+  }
+}
+</script>
+<style lang="less"></style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 41b73de..9cb7058 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,13 +1,17 @@
-import { createRouter, createWebHistory } from "vue-router";
-import Movie from "@/pages/movie/index.vue";
+import { createRouter, createWebHashHistory } from "vue-router";
+import Main from "@/pages/index.vue";
 import City from "@/pages/city/index.vue";
 import Video from "@/pages/video/index.vue";
 import Show from "@/pages/show/index.vue";
 import User from "@/pages/user/index.vue";
 import Movies from "@/pages/movie/hot/MyMovies.vue";
+import Search from "@/pages/search/index.vue";
 import MyMain from "@/pages/movie/hot/components/MyMain.vue";
+import Cinema from "@/pages/movie/cinema/cinema.vue";
+import Wait from "@/pages/movie/wait/wait.vue";
+import { compile } from "ejs";
 const routers = {
-  history: createWebHistory(),
+  history: createWebHashHistory(),
   routes: [
     {
       path: "/",
@@ -16,11 +20,11 @@ const routers = {
 
     {
       path: "/movie",
-      component: Movie,
+      component: Main,
       children: [
         {
           path: "/movie",
-          redirect: "/movie/hot",
+          redirect: "/movie/movies",
         },
         {
           path: "/movie/movies",
@@ -36,6 +40,11 @@ const routers = {
             },
             {
               path: "/movie/movies/cinema",
+              component: Cinema,
+            },
+            {
+              path: "/movie/movies/wait",
+              component: Wait,
             },
           ],
         },
@@ -57,6 +66,10 @@ const routers = {
       path: "/city",
       component: City,
     },
+    {
+      path: "/search",
+      component: Search,
+    },
   ],
 };