last

plaknight · Oct 21, 2019 · 56a5ebc · 56a5ebc
2 parents 5167134 + facd078
commit 56a5ebc
Show file tree

Hide file tree

Showing 21 changed files with 1,646 additions and 1,091 deletions.
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "axios": "^0.19.0",
     "better-scroll": "^1.15.2",
     "core-js": "^2.6.5",
+    "echarts": "^4.4.0",
     "lib-flexible": "^0.3.2",
     "postcss-px2rem": "^0.3.0",
     "swiper": "^5.0.4",

diff --git a/src/App.vue b/src/App.vue
@@ -18,7 +18,7 @@ export default {
   methods: {},
   created() {},
   mounted() {
-    console.log(1231231)
+    console.log(1231231);
     if (!window.localStorage.getItem("usermsg")) {
       this.$router.push("/login").catch(err => {});
     }
@@ -46,7 +46,7 @@ body {
 #app {
   width: 100%;
   height: 100%;
-  
+  overflow: hidden;
 }
 a {
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);

diff --git a/src/components/home-title.vue b/src/components/home-title.vue
@@ -2,64 +2,71 @@
   <div class="titleP">
     <span></span>
     <h1>{{ msg }}</h1>
-    <p >{{ msg2 }}</p>
-    <img :src='right' alt="">
+    <router-link :to="{ name: to }">
+      <p>{{ msg2 }}</p>
+    </router-link>
+    <img :src="right" alt="" />
   </div>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
-      right:require('@/assets/movie-imgs/home/右 箭头.png') 
-    }
+      right: require("@/assets/movie-imgs/home/右 箭头.png")
+    };
   },
-  name: 'titleP',
+  name: "titleP",
   props: {
     msg: String,
-    msg2:String,
+    msg2: String,
+    to: String
   }
-}
+};
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
-.titleP{
+.titleP {
   position: relative;
-height: 18px;
-width: 335px;
-margin: 0 auto;
-margin-top: 30px;
-margin-bottom: 10px;
+  height: 18px;
+  width: 335px;
+  margin: 0 auto;
+  margin-top: 30px;
+  margin-bottom: 10px;
 }
 span {
   display: block;
   float: left;
-  width:4px;
-   height:18px;
-  background:linear-gradient(90deg,rgba(242,97,130,1) 0%,rgba(241,160,100,1) 100%);
+  width: 4px;
+  height: 18px;
+  background: linear-gradient(
+    90deg,
+    rgba(242, 97, 130, 1) 0%,
+    rgba(241, 160, 100, 1) 100%
+  );
 }
 h1 {
   margin-left: 5px;
-float: left;
-width:72px;
-height:18px;
-font-size:16px;
-font-family:PingFangSC-Medium,PingFangSC;
-font-weight:500;
-color:#b1b2b3;
-line-height:18px;
+  float: left;
+  width: 72px;
+  height: 18px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFangSC;
+  font-weight: 500;
+  color: #b1b2b3;
+  line-height: 18px;
 }
 p {
-  width:24px;
-height:18px;
-font-size:12px;
-font-family:PingFangSC-Regular,PingFangSC;
-font-weight:400;
-color:#b1b2b3;
-line-height:18px;
-float: right;
-margin-right: 10px;
+  width: 24px;
+  height: 18px;
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFangSC;
+  font-weight: 400;
+  color: #b1b2b3;
+  line-height: 18px;
+  float: right;
+  margin-right: 10px;
 }
 img {
   position: absolute;

diff --git a/src/components/movielist.vue b/src/components/movielist.vue
@@ -140,7 +140,8 @@ export default {
         height: 25px;
         line-height: 25px;
         text-align: center;
-
+        font-size: 12px;
+        color: #fff;
         box-shadow: 0px 0px 4px 1px rgba(242, 109, 125, 0.18);
         border-radius: 6px;
         &.pink {