姚富强 / ProfessionalCourseManagementSystem · 提交

转到一个项目

作者 姚富强
提交 05b0112a1a3bd408c0240c3e0dd81f523ec63992 1 个父辈 3e5d5216

tj

内嵌 并排对比
正在显示 13 个修改的文件 包含 231 行增加 和 36 行删除
@@ -15,10 +15,40 @@ const router = createRouter({ @@ -15,10 +15,40 @@ const router = createRouter({
15 component: () => import('@/views/MyClass.vue') 15 component: () => import('@/views/MyClass.vue')
16 }, 16 },
17 { 17 {
  18 + path: 'address',
  19 + name: 'addressBook',
  20 + component: () => import('@/views/addressBook.vue')
  21 + },
  22 + {
  23 + path: 'manage',
  24 + name: 'classManage',
  25 + component: () => import('@/views/classManagement.vue')
  26 + },
  27 + {
  28 + path: 'disk',
  29 + name: 'disk',
  30 + component: () => import('@/views/Disk.vue')
  31 + },
  32 + {
  33 + path: 'news',
  34 + name: 'news',
  35 + component: () => import('@/views/News.vue')
  36 + },
  37 + {
  38 + path: 'note',
  39 + name: 'note',
  40 + component: () => import('@/views/Note.vue')
  41 + },
  42 + {
18 path: 'account', 43 path: 'account',
19 name: 'account', 44 name: 'account',
20 component: () => import('@/views/Account.vue') 45 component: () => import('@/views/Account.vue')
21 - } 46 + },
  47 + {
  48 + path: 'home',
  49 + name: 'home',
  50 + component: () => import('@/views/Hone.vue')
  51 + },
22 ] 52 ]
23 }, 53 },
24 { 54 {
@@ -13,7 +13,7 @@ const showPopup = () => { @@ -13,7 +13,7 @@ const showPopup = () => {
13 <div class="right"> 13 <div class="right">
14 <div class="biti">账号管理</div> 14 <div class="biti">账号管理</div>
15 <div class="container"> 15 <div class="container">
16 - <van-tabs v-model:active="active" line-width="0px"> 16 + <van-tabs v-model:active="active" line-width="0px" background="#f2f2f2">
17 <van-tab title="基本信息" class="box"> 17 <van-tab title="基本信息" class="box">
18 <div class="lie"> 18 <div class="lie">
19 <div>姓名</div> 19 <div>姓名</div>
@@ -120,7 +120,7 @@ const showPopup = () => { @@ -120,7 +120,7 @@ const showPopup = () => {
120 </div> 120 </div>
121 </template> 121 </template>
122 122
123 -<style lang="scss"> 123 +<style lang="scss" scoped>
124 .right { 124 .right {
125 background-color: #e5e5e5; 125 background-color: #e5e5e5;
126 height: 535px; 126 height: 535px;
@@ -19,21 +19,42 @@ const activeNames = ref(['1']) @@ -19,21 +19,42 @@ const activeNames = ref(['1'])
19 </div> 19 </div>
20 <div class="right"> 20 <div class="right">
21 <div class="two">XX班级</div> 21 <div class="two">XX班级</div>
22 - <div class="box3">进行中</div> 22 + <div>
  23 + <van-collapse v-model="activeNames">
  24 + <van-collapse-item title="进行中" name="1">
  25 + <div class="box5">
  26 + <div class="end" v-for="item in 8" :key="item">
  27 + <div class="notice">通知</div>
  28 + <div>签到</div>
  29 + </div>
  30 + </div>
  31 + </van-collapse-item>
  32 + <van-collapse-item title="已结束" name="2">
  33 + <div class="box5">
  34 + <div class="end" v-for="item in 8" :key="item">
  35 + <div class="notice">通知</div>
  36 + <div>签到</div>
  37 + </div>
  38 + </div>
  39 + </van-collapse-item>
  40 + </van-collapse>
  41 + </div>
  42 + <!-- <div class="box3">进行中</div>
23 <div class="box4">已结束</div> 43 <div class="box4">已结束</div>
24 <div class="box5"> 44 <div class="box5">
25 <div class="end" v-for="item in 8" :key="item"> 45 <div class="end" v-for="item in 8" :key="item">
26 <div class="notice">通知</div> 46 <div class="notice">通知</div>
27 <div>签到</div> 47 <div>签到</div>
28 </div> 48 </div>
29 - </div> 49 + </div> -->
30 </div> 50 </div>
31 </div> 51 </div>
32 </div> 52 </div>
33 </template> 53 </template>
34 -  
35 -<style lang="scss"> 54 +
  55 +<style lang="scss" scoped>
36 .counter { 56 .counter {
  57 + background-color: #e5e5e5;
37 .box { 58 .box {
38 margin-top: 20px; 59 margin-top: 20px;
39 display: flex; 60 display: flex;
@@ -129,7 +150,6 @@ const activeNames = ref(['1']) @@ -129,7 +150,6 @@ const activeNames = ref(['1'])
129 border-radius: 8px; 150 border-radius: 8px;
130 } 151 }
131 } 152 }
132 -  
133 } 153 }
134 } 154 }
135 } 155 }
  1 +<script setup>
  2 +import { ref } from "vue";
  3 +
  4 +const text = ref('发送验证码')
  5 +</script>
1 <template> 6 <template>
2 - <div class="about">  
3 - 我是验证码 7 + <div class="counter">
  8 + <div style="height: 7%;"></div>
  9 + <div class="popup">
  10 + <div class="title">验证码登录</div>
  11 + <div class="code">
  12 + <van-cell-group inset>
  13 + <!-- 手机号 -->
  14 + <van-field v-model="value" placeholder="187159***14" />
  15 + <!-- 验证码 -->
  16 + <van-field v-model="sms" center clearable placeholder="验证码">
  17 + <template #button>
  18 + <van-button
  19 + size="small"
  20 + color="#6170c3"
  21 + :text="text"
  22 + round="true"
  23 + @click="dbclick"
  24 + ></van-button>
  25 + </template>
  26 + </van-field>
  27 + <!-- 底部按钮 -->
  28 + <van-button size="large" color="#6170c3" round="true">确认登录</van-button>
  29 + </van-cell-group>
  30 + </div>
4 </div> 31 </div>
5 - </template>  
6 -  
7 - <style>  
8 -  
9 - </style>  
  32 + </div>
  33 +</template>
  34 +
  35 +<style lang="scss" scoped>
  36 +.counter {
  37 + height: 100vh;
  38 + background-color: #f2f2f2;
  39 + .popup {
  40 + margin: 50px auto;
  41 + width: 500px;
  42 + height: 390px;
  43 + background-color: #fff;
  44 + padding: 40px;
  45 + border-radius: 20px;
  46 + }
  47 + .title {
  48 + font-weight: 800;
  49 + }
  50 + .code {
  51 + margin-top: 60px;
  52 + .van-cell {
  53 + margin-bottom: 20px;
  54 + border: 1px solid #cacaca;
  55 + border-radius: 18px;
  56 + }
  57 + }
  58 +}
  59 +</style>
  1 +<script setup>
  2 +
  3 +</script>
  4 +<template>
  5 + <div class="counter">
  6 + 我是云盘
  7 + </div>
  8 + </template>
  9 +
  10 + <style lang="scss" scoped>
  11 +
  12 + </style>
  1 +<script setup></script>
  2 +<template>
  3 + <div class="counter">
  4 + <div class="ban">
  5 + <van-empty
  6 + image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
  7 + image-size="200"
  8 + description="欢迎访问课程评价管理系统"
  9 + />
  10 + </div>
  11 + </div>
  12 +</template>
  13 +
  14 +<style lang="scss" scoped>
  15 + .ban {
  16 + padding-top: 150px;
  17 + }
  18 +</style>
1 <script setup> 1 <script setup>
2 import Head from '@/components/head.vue' 2 import Head from '@/components/head.vue'
3 import { ref } from 'vue' 3 import { ref } from 'vue'
4 -const list = ref(['首页', '课程', '笔记', '消息', '云盘', '通讯录', '账号管理', '班级管理'])  
5 -const navigator = () => {} 4 +import router from '@/router/index';
  5 +const list = ref([
  6 + { path: '/home', name: '首页' },
  7 + { path: '/', name: '课程' },
  8 + { path: '/note', name: '笔记' },
  9 + { path: '/news', name: '消息' },
  10 + { path: '/disk', name: '云盘' },
  11 + { path: '/address', name: '通讯录' },
  12 + { path: '/account', name: '账号管理' },
  13 + { path: '/manage', name: '班级管理' }
  14 +])
  15 +const navigator = (path) => {
  16 + console.log(path);
  17 + router.push(path)
  18 +
  19 +}
6 </script> 20 </script>
7 21
8 <template> 22 <template>
@@ -17,7 +31,7 @@ const navigator = () => {} @@ -17,7 +31,7 @@ const navigator = () => {}
17 </div> 31 </div>
18 <div class="name">XXX</div> 32 <div class="name">XXX</div>
19 <div class="cont"> 33 <div class="cont">
20 - <div class="li" v-for="item in list" :key="item" @click="navigator">{{ item }}</div> 34 + <div class="li" v-for="item in list" :key="item" @click="navigator(item.path)">{{ item.name }}</div>
21 </div> 35 </div>
22 <div class="one"></div> 36 <div class="one"></div>
23 </div> 37 </div>
@@ -29,7 +43,7 @@ const navigator = () => {} @@ -29,7 +43,7 @@ const navigator = () => {}
29 </div> 43 </div>
30 </div> 44 </div>
31 </template> 45 </template>
32 -<style lang="scss"> 46 +<style lang="scss" scoped>
33 .counter { 47 .counter {
34 background-color: #f2f2f2; 48 background-color: #f2f2f2;
35 .banner { 49 .banner {
@@ -38,10 +52,10 @@ const navigator = () => {} @@ -38,10 +52,10 @@ const navigator = () => {}
38 .left { 52 .left {
39 position: relative; 53 position: relative;
40 margin: 40px 40px 0; 54 margin: 40px 40px 0;
41 - width: 25%; 55 + width: 15%;
42 background-color: #6170c3; 56 background-color: #6170c3;
43 color: #fff; 57 color: #fff;
44 - border-radius: 18px; 58 + border-radius: 18px 18px 0 0;
45 .pic { 59 .pic {
46 margin: 0 auto; 60 margin: 0 auto;
47 padding-top: 50px; 61 padding-top: 50px;
@@ -66,11 +80,21 @@ const navigator = () => {} @@ -66,11 +80,21 @@ const navigator = () => {}
66 padding-left: 30px; 80 padding-left: 30px;
67 box-sizing: border-box; 81 box-sizing: border-box;
68 } 82 }
  83 + .li:hover {
  84 + background-color: #4d5cb6;
  85 + }
  86 + .active {
  87 + background-color: #4d5cb6;
  88 + }
69 } 89 }
70 .one { 90 .one {
71 background-color: pink; 91 background-color: pink;
72 } 92 }
73 } 93 }
  94 + .right {
  95 + width: 75%;
  96 + background-color: #f2f2f2;
  97 + }
74 } 98 }
75 } 99 }
76 </style> 100 </style>
@@ -22,7 +22,7 @@ const onSubmit = (values) => { @@ -22,7 +22,7 @@ const onSubmit = (values) => {
22 :rules="[{ required: true, message: '请填写密码' }]" /> 22 :rules="[{ required: true, message: '请填写密码' }]" />
23 </van-cell-group> 23 </van-cell-group>
24 <div style="margin: 16px"> 24 <div style="margin: 16px">
25 - <van-button round block type="primary" native-type="submit"> 登录 </van-button> 25 + <van-button round block color="#6170c3" native-type="submit"> 登录 </van-button>
26 </div> 26 </div>
27 </van-form> 27 </van-form>
28 </div> 28 </div>
@@ -44,7 +44,7 @@ const onSubmit = (values) => { @@ -44,7 +44,7 @@ const onSubmit = (values) => {
44 </div> 44 </div>
45 </template> 45 </template>
46 46
47 -<style lang="scss"> 47 +<style lang="scss" scoped>
48 .counter { 48 .counter {
49 width: 100%; 49 width: 100%;
50 height: 100vh; 50 height: 100vh;
@@ -45,8 +45,9 @@ const classList = ref([ @@ -45,8 +45,9 @@ const classList = ref([
45 </div> 45 </div>
46 </template> 46 </template>
47 47
48 -<style lang="scss"> 48 +<style lang="scss" scoped>
49 .counter { 49 .counter {
  50 +
50 width: 100%; 51 width: 100%;
51 background-color: #f2f2f2; 52 background-color: #f2f2f2;
52 .box{ 53 .box{
@@ -57,13 +58,9 @@ const classList = ref([ @@ -57,13 +58,9 @@ const classList = ref([
57 flex-wrap: wrap; 58 flex-wrap: wrap;
58 justify-content: space-around; 59 justify-content: space-around;
59 margin-top: 20px; 60 margin-top: 20px;
60 -<<<<<<< HEAD  
61 - .item{  
62 -=======  
63 - width: 95%; 61 + width: 90%;
64 .item { 62 .item {
65 ->>>>>>> c8a1193fe202ec9250f041cfa20fabb4916270ac  
66 - margin: 40px; 63 + margin: 30px 0;
67 } 64 }
68 .title { 65 .title {
69 text-align: center; 66 text-align: center;
@@ -81,9 +78,9 @@ const classList = ref([ @@ -81,9 +78,9 @@ const classList = ref([
81 margin-top: 30px; 78 margin-top: 30px;
82 79
83 .n { 80 .n {
84 - font-size: 8px; 81 + font-size: 15px;
85 border-radius: 15px; 82 border-radius: 15px;
86 - padding: 3px 10px; 83 + padding: 10px 15px;
87 height: 20px; 84 height: 20px;
88 line-height: 20px; 85 line-height: 20px;
89 background-color: white; 86 background-color: white;
@@ -101,12 +98,8 @@ const classList = ref([ @@ -101,12 +98,8 @@ const classList = ref([
101 .leftt { 98 .leftt {
102 font-weight: 800; 99 font-weight: 800;
103 } 100 }
104 -<<<<<<< HEAD  
105 - .bod {  
106 -=======  
107 101
108 .rightt { 102 .rightt {
109 ->>>>>>> c8a1193fe202ec9250f041cfa20fabb4916270ac  
110 display: flex; 103 display: flex;
111 104
112 .noe { 105 .noe {
  1 +<script setup>
  2 +
  3 +</script>
  4 +<template>
  5 + <div class="counter">
  6 + 我是消息
  7 + </div>
  8 + </template>
  9 +
  10 + <style lang="scss" scoped>
  11 +
  12 + </style>
  1 +<script setup>
  2 +
  3 +</script>
  4 +<template>
  5 + <div class="counter">
  6 + 我是笔记
  7 + </div>
  8 + </template>
  9 +
  10 + <style lang="scss" scoped>
  11 +
  12 + </style>
  1 +<script setup>
  2 +
  3 +</script>
  4 +<template>
  5 + <div class="counter">
  6 + 我是通讯录
  7 + </div>
  8 + </template>
  9 +
  10 + <style lang="scss" scoped>
  11 +
  12 + </style>
  1 +<script setup>
  2 +
  3 +</script>
  4 +<template>
  5 + <div class="counter">
  6 + 我是班级管理
  7 + </div>
  8 + </template>
  9 +
  10 + <style lang="scss" scoped>
  11 +
  12 + </style>