diff --git a/city.json b/city.json
new file mode 100644
index 0000000..d045c4d
--- /dev/null
+++ b/city.json
@@ -0,0 +1,352 @@
+{
+  "success": true,
+  "data": [
+    {
+      "cities": [
+        { "cityId": 0, "damaiId": 0, "name": "全国" },
+        { "cityId": 990990, "damaiId": 9999, "name": "海外" },
+        { "cityId": 110100, "damaiId": 852, "name": "北京" },
+        { "cityId": 310100, "damaiId": 872, "name": "上海" },
+        { "cityId": 440300, "damaiId": 906, "name": "深圳" },
+        { "cityId": 440100, "damaiId": 893, "name": "广州" },
+        { "cityId": 330100, "damaiId": 1580, "name": "杭州" },
+        { "cityId": 120100, "damaiId": 1209, "name": "天津" },
+        { "cityId": 500100, "damaiId": 200, "name": "重庆" },
+        { "cityId": 510100, "damaiId": 1377, "name": "成都" },
+        { "cityId": 610100, "damaiId": 3250, "name": "西安" },
+        { "cityId": 810100, "damaiId": 848, "name": "香港" }
+      ],
+      "prefix": "hotCities"
+    },
+    {
+      "cities": [
+        { "cityId": 513200, "damaiId": 1528, "name": "阿坝" },
+        { "cityId": 210300, "damaiId": 1717, "name": "鞍山" },
+        { "cityId": 520400, "damaiId": 253, "name": "安顺" },
+        { "cityId": 410500, "damaiId": 2161, "name": "安阳" },
+        { "cityId": 820100, "damaiId": 850, "name": "澳门" }
+      ],
+      "prefix": "a"
+    },
+    {
+      "cities": [
+        { "cityId": 130600, "damaiId": 2348, "name": "保定" },
+        { "cityId": 610300, "damaiId": 3264, "name": "宝鸡" },
+        { "cityId": 150200, "damaiId": 3126, "name": "包头" },
+        { "cityId": 450500, "damaiId": 2048, "name": "北海" },
+        { "cityId": 110100, "damaiId": 852, "name": "北京" },
+        { "cityId": 340300, "damaiId": 2536, "name": "蚌埠" },
+        { "cityId": 371600, "damaiId": 1999, "name": "滨州" }
+      ],
+      "prefix": "b"
+    },
+    {
+      "cities": [
+        { "cityId": 130900, "damaiId": 2460, "name": "沧州" },
+        { "cityId": 220100, "damaiId": 2812, "name": "长春" },
+        { "cityId": 430700, "damaiId": 776, "name": "常德" },
+        { "cityId": 430100, "damaiId": 702, "name": "长沙" },
+        { "cityId": 140400, "damaiId": 3014, "name": "长治" },
+        { "cityId": 320400, "damaiId": 1077, "name": "常州" },
+        { "cityId": 211300, "damaiId": 1804, "name": "朝阳" },
+        { "cityId": 445100, "damaiId": 919, "name": "潮州" },
+        { "cityId": 431000, "damaiId": 727, "name": "郴州" },
+        { "cityId": 130800, "damaiId": 2392, "name": "承德" },
+        { "cityId": 510100, "damaiId": 1377, "name": "成都" },
+        { "cityId": 150400, "damaiId": 3140, "name": "赤峰" },
+        { "cityId": 341700, "damaiId": 2628, "name": "池州" },
+        { "cityId": 500100, "damaiId": 200, "name": "重庆" },
+        { "cityId": 341100, "damaiId": 2582, "name": "滁州" }
+      ],
+      "prefix": "c"
+    },
+    {
+      "cities": [
+        { "cityId": 210200, "damaiId": 1725, "name": "大连" },
+        { "cityId": 230600, "damaiId": 2667, "name": "大庆" },
+        { "cityId": 140200, "damaiId": 2996, "name": "大同" },
+        { "cityId": 510600, "damaiId": 1476, "name": "德阳" },
+        { "cityId": 371400, "damaiId": 1975, "name": "德州" },
+        { "cityId": 469007, "damaiId": 1197, "name": "东方" },
+        { "cityId": 441900, "damaiId": 917, "name": "东莞" },
+        { "cityId": 370500, "damaiId": 2017, "name": "东营" }
+      ],
+      "prefix": "d"
+    },
+    {
+      "cities": [{ "cityId": 150600, "damaiId": 3178, "name": "鄂尔多斯" }],
+      "prefix": "e"
+    },
+    {
+      "cities": [
+        { "cityId": 440600, "damaiId": 923, "name": "佛山" },
+        { "cityId": 210400, "damaiId": 1826, "name": "抚顺" },
+        { "cityId": 210900, "damaiId": 1773, "name": "阜新" },
+        { "cityId": 341200, "damaiId": 2593, "name": "阜阳" },
+        { "cityId": 350100, "damaiId": 356, "name": "福州" },
+        { "cityId": 361000, "damaiId": 553, "name": "抚州" }
+      ],
+      "prefix": "f"
+    },
+    {
+      "cities": [
+        { "cityId": 360700, "damaiId": 504, "name": "赣州" },
+        { "cityId": 510800, "damaiId": 1493, "name": "广元" },
+        { "cityId": 440100, "damaiId": 893, "name": "广州" },
+        { "cityId": 450800, "damaiId": 2141, "name": "贵港" },
+        { "cityId": 450300, "damaiId": 2103, "name": "桂林" },
+        { "cityId": 520100, "damaiId": 242, "name": "贵阳" }
+      ],
+      "prefix": "g"
+    },
+    {
+      "cities": [
+        { "cityId": 230100, "damaiId": 2648, "name": "哈尔滨" },
+        { "cityId": 460100, "damaiId": 1185, "name": "海口" },
+        { "cityId": 990990, "damaiId": 9999, "name": "海外" },
+        { "cityId": 130400, "damaiId": 2404, "name": "邯郸" },
+        { "cityId": 610700, "damaiId": 3323, "name": "汉中" },
+        { "cityId": 330100, "damaiId": 1580, "name": "杭州" },
+        { "cityId": 340100, "damaiId": 2520, "name": "合肥" },
+        { "cityId": 230400, "damaiId": 2681, "name": "鹤岗" },
+        { "cityId": 441600, "damaiId": 949, "name": "河源" },
+        { "cityId": 371700, "damaiId": 2007, "name": "菏泽" },
+        { "cityId": 131100, "damaiId": 2483, "name": "衡水" },
+        { "cityId": 430400, "damaiId": 739, "name": "衡阳" },
+        { "cityId": 532500, "damaiId": 1350, "name": "红河" },
+        { "cityId": 150100, "damaiId": 3167, "name": "呼和浩特" },
+        { "cityId": 211400, "damaiId": 1819, "name": "葫芦岛" },
+        { "cityId": 150700, "damaiId": 3187, "name": "呼伦贝尔" },
+        { "cityId": 330500, "damaiId": 1637, "name": "湖州" },
+        { "cityId": 320800, "damaiId": 1116, "name": "淮安" },
+        { "cityId": 340600, "damaiId": 2551, "name": "淮北" },
+        { "cityId": 431200, "damaiId": 793, "name": "怀化" },
+        { "cityId": 421100, "damaiId": 667, "name": "黄冈" },
+        { "cityId": 341000, "damaiId": 2574, "name": "黄山" },
+        { "cityId": 420200, "damaiId": 627, "name": "黄石" },
+        { "cityId": 441300, "damaiId": 956, "name": "惠州" }
+      ],
+      "prefix": "h"
+    },
+    {
+      "cities": [
+        { "cityId": 360800, "damaiId": 525, "name": "吉安" },
+        { "cityId": 220200, "damaiId": 2826, "name": "吉林" },
+        { "cityId": 370100, "damaiId": 1835, "name": "济南" },
+        { "cityId": 370800, "damaiId": 1921, "name": "济宁" },
+        { "cityId": 230300, "damaiId": 2690, "name": "鸡西" },
+        { "cityId": 330400, "damaiId": 1626, "name": "嘉兴" },
+        { "cityId": 440700, "damaiId": 1015, "name": "江门" },
+        { "cityId": 140500, "damaiId": 3029, "name": "晋城" },
+        { "cityId": 330700, "damaiId": 1653, "name": "金华" },
+        { "cityId": 140700, "damaiId": 3037, "name": "晋中" },
+        { "cityId": 210700, "damaiId": 1755, "name": "锦州" },
+        { "cityId": 360200, "damaiId": 580, "name": "景德镇" },
+        { "cityId": 421000, "damaiId": 644, "name": "荆州" },
+        { "cityId": 360400, "damaiId": 482, "name": "九江" },
+        { "cityId": 620900, "damaiId": 3379, "name": "酒泉" }
+      ],
+      "prefix": "j"
+    },
+    {
+      "cities": [
+        { "cityId": 410200, "damaiId": 2189, "name": "开封" },
+        { "cityId": 530100, "damaiId": 1229, "name": "昆明" }
+      ],
+      "prefix": "k"
+    },
+    {
+      "cities": [
+        { "cityId": 540100, "damaiId": 2902, "name": "拉萨" },
+        { "cityId": 620100, "damaiId": 3368, "name": "兰州" },
+        { "cityId": 131000, "damaiId": 2337, "name": "廊坊" },
+        { "cityId": 511100, "damaiId": 1456, "name": "乐山" },
+        { "cityId": 530700, "damaiId": 1314, "name": "丽江" },
+        { "cityId": 331100, "damaiId": 1691, "name": "丽水" },
+        { "cityId": 320700, "damaiId": 1175, "name": "连云港" },
+        { "cityId": 513400, "damaiId": 1561, "name": "凉山" },
+        { "cityId": 371500, "damaiId": 1989, "name": "聊城" },
+        { "cityId": 211000, "damaiId": 1781, "name": "辽阳" },
+        { "cityId": 141000, "damaiId": 3082, "name": "临汾" },
+        { "cityId": 371300, "damaiId": 1962, "name": "临沂" },
+        { "cityId": 520200, "damaiId": 271, "name": "六盘水" },
+        { "cityId": 450200, "damaiId": 2037, "name": "柳州" },
+        { "cityId": 350800, "damaiId": 429, "name": "龙岩" },
+        { "cityId": 341500, "damaiId": 2615, "name": "六安" },
+        { "cityId": 510500, "damaiId": 1424, "name": "泸州" },
+        { "cityId": 410300, "damaiId": 2279, "name": "洛阳" }
+      ],
+      "prefix": "l"
+    },
+    {
+      "cities": [
+        { "cityId": 340500, "damaiId": 2642, "name": "马鞍山" },
+        { "cityId": 440900, "damaiId": 986, "name": "茂名" },
+        { "cityId": 511400, "damaiId": 1507, "name": "眉山" },
+        { "cityId": 510700, "damaiId": 1403, "name": "绵阳" },
+        { "cityId": 231000, "damaiId": 2762, "name": "牡丹江" }
+      ],
+      "prefix": "m"
+    },
+    {
+      "cities": [
+        { "cityId": 360100, "damaiId": 465, "name": "南昌" },
+        { "cityId": 511300, "damaiId": 1483, "name": "南充" },
+        { "cityId": 320100, "damaiId": 1038, "name": "南京" },
+        { "cityId": 450100, "damaiId": 2024, "name": "南宁" },
+        { "cityId": 350700, "damaiId": 415, "name": "南平" },
+        { "cityId": 320600, "damaiId": 1103, "name": "南通" },
+        { "cityId": 411300, "damaiId": 2265, "name": "南阳" },
+        { "cityId": 511000, "damaiId": 1397, "name": "内江" },
+        { "cityId": 330200, "damaiId": 1597, "name": "宁波" },
+        { "cityId": 350900, "damaiId": 438, "name": "宁德" }
+      ],
+      "prefix": "n"
+    },
+    {
+      "cities": [
+        { "cityId": 360300, "damaiId": 476, "name": "萍乡" },
+        { "cityId": 350300, "damaiId": 379, "name": "莆田" }
+      ],
+      "prefix": "p"
+    },
+    {
+      "cities": [
+        { "cityId": 230200, "damaiId": 2785, "name": "齐齐哈尔" },
+        { "cityId": 522600, "damaiId": 300, "name": "黔东南" },
+        { "cityId": 429005, "damaiId": 699, "name": "潜江" },
+        { "cityId": 130300, "damaiId": 2329, "name": "秦皇岛" },
+        { "cityId": 450700, "damaiId": 2098, "name": "钦州" },
+        { "cityId": 370200, "damaiId": 1847, "name": "青岛" },
+        { "cityId": 441800, "damaiId": 1028, "name": "清远" },
+        { "cityId": 530300, "damaiId": 1277, "name": "曲靖" },
+        { "cityId": 330800, "damaiId": 1667, "name": "衢州" },
+        { "cityId": 350500, "damaiId": 386, "name": "泉州" }
+      ],
+      "prefix": "q"
+    },
+    {
+      "cities": [
+        { "cityId": 542300, "damaiId": 2934, "name": "日喀则" },
+        { "cityId": 371100, "damaiId": 1954, "name": "日照" }
+      ],
+      "prefix": "r"
+    },
+    {
+      "cities": [
+        { "cityId": 460200, "damaiId": 1190, "name": "三亚" },
+        { "cityId": 440500, "damaiId": 929, "name": "汕头" },
+        { "cityId": 310100, "damaiId": 872, "name": "上海" },
+        { "cityId": 611000, "damaiId": 3359, "name": "商洛" },
+        { "cityId": 361100, "damaiId": 565, "name": "上饶" },
+        { "cityId": 330600, "damaiId": 1643, "name": "绍兴" },
+        { "cityId": 430500, "damaiId": 806, "name": "邵阳" },
+        { "cityId": 210100, "damaiId": 1703, "name": "沈阳" },
+        { "cityId": 440300, "damaiId": 906, "name": "深圳" },
+        { "cityId": 130100, "damaiId": 2495, "name": "石家庄" },
+        { "cityId": 220700, "damaiId": 2870, "name": "松原" },
+        { "cityId": 321300, "damaiId": 1169, "name": "宿迁" },
+        { "cityId": 320500, "damaiId": 1087, "name": "苏州" },
+        { "cityId": 231200, "damaiId": 2734, "name": "绥化" },
+        { "cityId": 510900, "damaiId": 1450, "name": "遂宁" }
+      ],
+      "prefix": "s"
+    },
+    {
+      "cities": [
+        { "cityId": 370900, "damaiId": 1937, "name": "泰安" },
+        { "cityId": 140100, "damaiId": 2984, "name": "太原" },
+        { "cityId": 331000, "damaiId": 1680, "name": "台州" },
+        { "cityId": 321200, "damaiId": 1158, "name": "泰州" },
+        { "cityId": 130200, "damaiId": 2314, "name": "唐山" },
+        { "cityId": 120100, "damaiId": 1209, "name": "天津" },
+        { "cityId": 620500, "damaiId": 3402, "name": "天水" }
+      ],
+      "prefix": "t"
+    },
+    {
+      "cities": [
+        { "cityId": 370700, "damaiId": 1902, "name": "潍坊" },
+        { "cityId": 371000, "damaiId": 1946, "name": "威海" },
+        { "cityId": 610500, "damaiId": 3311, "name": "渭南" },
+        { "cityId": 532600, "damaiId": 1320, "name": "文山" },
+        { "cityId": 330300, "damaiId": 1612, "name": "温州" },
+        { "cityId": 420100, "damaiId": 586, "name": "武汉" },
+        { "cityId": 340200, "damaiId": 2528, "name": "芜湖" },
+        { "cityId": 650100, "damaiId": 81, "name": "乌鲁木齐" },
+        { "cityId": 320200, "damaiId": 1052, "name": "无锡" },
+        { "cityId": 640300, "damaiId": 65, "name": "吴忠" }
+      ],
+      "prefix": "w"
+    },
+    {
+      "cities": [
+        { "cityId": 610100, "damaiId": 3250, "name": "西安" },
+        { "cityId": 630100, "damaiId": 2, "name": "西宁" },
+        { "cityId": 350200, "damaiId": 372, "name": "厦门" },
+        { "cityId": 421200, "damaiId": 678, "name": "咸宁" },
+        { "cityId": 610400, "damaiId": 3291, "name": "咸阳" },
+        { "cityId": 810100, "damaiId": 848, "name": "香港" },
+        { "cityId": 430300, "damaiId": 770, "name": "湘潭" },
+        { "cityId": 420600, "damaiId": 4395, "name": "襄阳" },
+        { "cityId": 420900, "damaiId": 659, "name": "孝感" },
+        { "cityId": 410700, "damaiId": 342, "name": "新乡" },
+        { "cityId": 411500, "damaiId": 2236, "name": "信阳" },
+        { "cityId": 140900, "damaiId": 3066, "name": "忻州" },
+        { "cityId": 130500, "damaiId": 2424, "name": "邢台" },
+        { "cityId": 411000, "damaiId": 2247, "name": "许昌" },
+        { "cityId": 320300, "damaiId": 1063, "name": "徐州" },
+        { "cityId": 341800, "damaiId": 2633, "name": "宣城" }
+      ],
+      "prefix": "x"
+    },
+    {
+      "cities": [
+        { "cityId": 511800, "damaiId": 1514, "name": "雅安" },
+        { "cityId": 610600, "damaiId": 3277, "name": "延安" },
+        { "cityId": 320900, "damaiId": 1125, "name": "盐城" },
+        { "cityId": 370600, "damaiId": 1882, "name": "烟台" },
+        { "cityId": 441700, "damaiId": 999, "name": "阳江" },
+        { "cityId": 140300, "damaiId": 3008, "name": "阳泉" },
+        { "cityId": 321000, "damaiId": 1137, "name": "扬州" },
+        { "cityId": 511500, "damaiId": 1413, "name": "宜宾" },
+        { "cityId": 420500, "damaiId": 609, "name": "宜昌" },
+        { "cityId": 230700, "damaiId": 2702, "name": "伊春" },
+        { "cityId": 360900, "damaiId": 539, "name": "宜春" },
+        { "cityId": 430900, "damaiId": 786, "name": "益阳" },
+        { "cityId": 640100, "damaiId": 54, "name": "银川" },
+        { "cityId": 210800, "damaiId": 1765, "name": "营口" },
+        { "cityId": 431100, "damaiId": 752, "name": "永州" },
+        { "cityId": 450900, "damaiId": 2079, "name": "玉林" },
+        { "cityId": 610800, "damaiId": 3335, "name": "榆林" },
+        { "cityId": 530400, "damaiId": 1267, "name": "玉溪" },
+        { "cityId": 430600, "damaiId": 819, "name": "岳阳" },
+        { "cityId": 140800, "damaiId": 3050, "name": "运城" },
+        { "cityId": 445300, "damaiId": 993, "name": "云浮" }
+      ],
+      "prefix": "y"
+    },
+    {
+      "cities": [
+        { "cityId": 370400, "damaiId": 1874, "name": "枣庄" },
+        { "cityId": 440800, "damaiId": 937, "name": "湛江" },
+        { "cityId": 130700, "damaiId": 2374, "name": "张家口" },
+        { "cityId": 620700, "damaiId": 3415, "name": "张掖" },
+        { "cityId": 350600, "damaiId": 402, "name": "漳州" },
+        { "cityId": 441200, "damaiId": 977, "name": "肇庆" },
+        { "cityId": 321100, "damaiId": 1148, "name": "镇江" },
+        { "cityId": 410100, "damaiId": 2148, "name": "郑州" },
+        { "cityId": 442000, "damaiId": 947, "name": "中山" },
+        { "cityId": 330900, "damaiId": 1675, "name": "舟山" },
+        { "cityId": 440400, "damaiId": 913, "name": "珠海" },
+        { "cityId": 411700, "damaiId": 2207, "name": "驻马店" },
+        { "cityId": 430200, "damaiId": 717, "name": "株洲" },
+        { "cityId": 370300, "damaiId": 1865, "name": "淄博" },
+        { "cityId": 510300, "damaiId": 1438, "name": "自贡" },
+        { "cityId": 512000, "damaiId": 1445, "name": "资阳" },
+        { "cityId": 520300, "damaiId": 276, "name": "遵义" }
+      ],
+      "prefix": "z"
+    }
+  ]
+}
diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcf..de57911 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/pages/city/index.vue b/src/pages/city/index.vue
index 3631505..ca932c1 100644
--- a/src/pages/city/index.vue
+++ b/src/pages/city/index.vue
@@ -1,9 +1,34 @@
 <template>
   <h1>城市页</h1>
+  <div v-for="item in city.data">
+    <h5 class="title">{{ item.prefix }}</h5>
+    <div class="cities">
+      <div v-for="city in item.cities">{{ city.name }}</div>
+    </div>
+  </div>
 </template>
 <script>
+import { request } from '@/utils';
 export default {
-
+  data() {
+    return {
+      city: {}
+    }
+  },
+  mounted() {
+    request("http://101.35.148.193:3000/api/city/list").then(data => this.city = data)
+  }
 }
 </script>
-<style></style>
+<style scoped lang="less">
+* {
+  font-size: 14px;
+}
+
+.title {
+  padding-left: 25px;
+  line-height: 30px;
+
+  color: #333;
+}
+</style>
diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 67402e4..dce24df 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -1,9 +1,15 @@
 <template>
-  <h1>详情页</h1>
+  <h1 key="id">详情页{{ id }}</h1>
 </template>
 <script>
 export default {
-
+  data() {
+    return {
+      id: this.$route.params.id
+    }
+  }
 }
 </script>
-<style></style>
+<style>
+
+</style>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
new file mode 100644
index 0000000..05c686a
--- /dev/null
+++ b/src/pages/login/index.vue
@@ -0,0 +1,17 @@
+<template lang="">
+  <div>
+    登陆页
+  </div>
+</template>
+<script>
+export default {
+  beforeRouteLeave() {
+    if (!localStorage.getItem("token")) {
+      return confirm("您似乎没有登陆呢.....真的要离开吗？")
+    }
+  }
+}
+</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 db284d1..19830eb 100644
--- a/src/pages/movie/components/MyNav.vue
+++ b/src/pages/movie/components/MyNav.vue
@@ -18,12 +18,11 @@ export default {
   data() {
     return {
       list: ["热映", "影院", "待映"],
-      activeIndex: 0
+      activeIndex: parseInt(sessionStorage.getItem("activeIndex")) || 0
     }
   }, methods: {
     setIndex(i) {
       this.activeIndex = i;
-      console.log(this.activeIndex)
       switch (this.activeIndex) {
         case 0:
           this.$router.push("/movie/movies/hot")
@@ -34,10 +33,15 @@ export default {
         case 2:
           this.$router.push("/movie/movies/wait")
           break
-
-
       }
-      console.log("case")
+      sessionStorage.setItem("activeIndex", this.activeIndex)
+    }
+  },
+  computed: {
+  },
+  watch: {
+    $route(val) {
+      console.log(val.fullPath)
     }
   }
 }
diff --git a/src/pages/movie/hot/components/MyMain.vue b/src/pages/movie/hot/components/MyMain.vue
index adeeed5..9e4e09c 100644
--- a/src/pages/movie/hot/components/MyMain.vue
+++ b/src/pages/movie/hot/components/MyMain.vue
@@ -33,17 +33,12 @@ 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
+        scrollY: true,
+        click: true
       })
       //上拉数据传参
       bs.on("pullingUp", async () => {
diff --git a/src/pages/movie/hot/components/MyMostPopular.vue b/src/pages/movie/hot/components/MyMostPopular.vue
index ecf9b35..8f9e350 100644
--- a/src/pages/movie/hot/components/MyMostPopular.vue
+++ b/src/pages/movie/hot/components/MyMostPopular.vue
@@ -4,7 +4,7 @@
     <div class="wrap" ref="ul1">
       <ul>
         <li class="movie" v-for="movie in displayData" :key="movie.id || movie.nm">
-          <a href="#">
+          <router-link :to="'/detail/' + (+movie.id)">
             <div class="img">
               <div class="mark">
                 <div class="score" v-if="movie.sc">观众评分&nbsp;&nbsp;{{ movie.sc }}</div>
@@ -15,7 +15,7 @@
               <img :src="movie.img" alt="">
             </div>
             <h5>{{ movie.nm }}</h5>
-          </a>
+          </router-link>
         </li>
       </ul>
     </div>
@@ -54,15 +54,14 @@ export default {
     }
     await nextTick();
     let el = this.$refs.ul1
-    console.log(el.offsetWidth)
     new BScroll(el, {
       startX: 0,
       startY: 0,
-      scrollX: true
+      scrollX: true,
+      click: true
     })
   },
   methods: {
-
   }
 }
 </script>
diff --git a/src/pages/movie/hot/components/MyMovieList.vue b/src/pages/movie/hot/components/MyMovieList.vue
index 4830333..def098b 100644
--- a/src/pages/movie/hot/components/MyMovieList.vue
+++ b/src/pages/movie/hot/components/MyMovieList.vue
@@ -1,26 +1,29 @@
 <template>
   <div class="movielist">
     <div class="movie" v-for="movie in movie" :key="movie.id">
-      <div class="img">
-        <img :src="movie.img" alt="">
-      </div>
-      <div class="info">
-        <div class="txt">
-          <p>{{ movie.nm }}</p>
-          <p v-if="movie.sc && movie.globalReleased">观众评<span class="sc">{{ movie.sc }}</span></p>
-          <p v-else-if="movie.globalReleased">暂无评分</p>
-          <p v-else><span class="sc">{{ movie.wish }}人想看</span></p>
-          <p>主演：{{ movie.star }}</p>
-          <p v-if="movie.globalReleased">{{ movie.showInfo }}</p>
+      <router-link :to="'/detail/' + (+movie.id)">
+        <div class="img">
+          <img :src="movie.img" alt="">
         </div>
-        <div class="btn-box">
-          <div class="btn"
-            :style="{ backgroundColor: movie.showStateButton ? 'movie.showStateButton?.color' : 'white' }">{{
-              movie.showStateButton?.content
-            }}  
+        <div class="info">
+          <div class="txt">
+            <p>{{ movie.nm }}</p>
+            <p v-if="movie.sc && movie.globalReleased">观众评<span class="sc">{{ movie.sc }}</span></p>
+            <p v-else-if="movie.globalReleased">暂无评分</p>
+            <p v-else><span class="sc">{{ movie.wish }}人想看</span></p>
+            <p>主演：{{ movie.star }}</p>
+            <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>
           </div>
         </div>
-      </div>
+      </router-link>
+
     </div>
   </div>
 </template>
@@ -70,85 +73,93 @@ export default {
   min-height: 200px;
 
   >.movie {
-    background-color: white;
-    padding-left: 15px;
-    width: 375px;
-    height: 114px;
-    padding-top: 12px;
-    display: flex;
-    margin-bottom: 1px;
-    align-items: center;
-    justify-content: space-between;
-    padding-right: 14px;
+    overflow: hidden;
 
-    // overflow: hidden;
-    .img {
-      width: 64px;
-      min-width: 64px;
-      height: 90px;
-      overflow: hidden;
-
-      >img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-
-
-    >.info {
+    a {
+      background-color: white;
+      padding-left: 15px;
+      width: 375px;
+      height: 114px;
+      padding-top: 12px;
+      padding-bottom: 12px;
       display: flex;
+      margin-bottom: 1px;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 14px;
+      width: 100%;
+      height: 100%;
 
-
-      >.txt {
-        width: 224px;
-
-        >p {
-          font-size: @ssfont;
-          color: @font-color2;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-          line-height: 1;
-          margin-top: 6px;
-
-          &:first-child {
-            font-size: @mfont;
-            font-weight: 600;
-            color: black;
-            margin-bottom: 7px;
-            margin-top: 0;
-          }
-
-          >.sc {
-            white-space: nowrap;
-            color: #faaf00;
-            font-weight: 700;
-            font-size: @sfont;
-          }
-        }
-      }
-
-      >.btn-box {
+      .img {
+        width: 64px;
+        min-width: 64px;
+        height: 90px;
         overflow: hidden;
 
-        >.btn {
-          width: 54px;
-          height: 28px;
-          background-color: #F03D37;
-          border-radius: 13.5px;
-          font-size: @ssfont;
-          color: white;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          transform: translateY(15px);
+        img {
+          width: 100%;
+          height: 100%;
         }
       }
+
+      .info {
+        display: flex;
+
+
+        >.txt {
+          width: 224px;
+
+          >p {
+            font-size: @ssfont;
+            color: @font-color2;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            line-height: 1;
+            margin-top: 6px;
+
+            &:first-child {
+              font-size: @mfont;
+              font-weight: 600;
+              color: black;
+              margin-bottom: 7px;
+              margin-top: 0;
+            }
+
+            >.sc {
+              white-space: nowrap;
+              color: #faaf00;
+              font-weight: 700;
+              font-size: @sfont;
+            }
+          }
+        }
+
+        >.btn-box {
+          overflow: hidden;
+
+          >.btn {
+            width: 54px;
+            height: 28px;
+            background-color: #F03D37;
+            border-radius: 13.5px;
+            font-size: @ssfont;
+            color: white;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            transform: translateY(15px);
+          }
+        }
+      }
+
+      >* {
+        flex-wrap: 0;
+      }
     }
 
-    >* {
-      flex-wrap: 0;
-    }
+    // overflow: hidden;  
+
   }
 }
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index 9cb7058..a793624 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,6 +9,8 @@ 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 detail from "@/pages/detail/index.vue";
+import Login from "@/pages/login/index.vue";
 import { compile } from "ejs";
 const routers = {
   history: createWebHashHistory(),
@@ -70,8 +72,26 @@ const routers = {
       path: "/search",
       component: Search,
     },
+    {
+      path: "/detail/:id",
+      component: detail,
+    },
+    {
+      path: "/login",
+      component: Login,
+    },
   ],
 };
 
 const router = createRouter(routers);
+router.beforeEach((to, from, next) => {
+  if (to.path == "/movie/user" && !localStorage.getItem("token")) {
+    if (confirm("您还未登录，是否前往登录页？")) {
+      next("/login");
+    }
+  } else {
+    next();
+  }
+});
+
 export default router;