diff --git a/.eslintrc.js b/前端/.eslintrc.js similarity index 100% rename from .eslintrc.js rename to 前端/.eslintrc.js diff --git a/.gitignore b/前端/.gitignore similarity index 100% rename from .gitignore rename to 前端/.gitignore diff --git a/app.js b/前端/app.js similarity index 100% rename from app.js rename to 前端/app.js diff --git a/app.json b/前端/app.json similarity index 100% rename from app.json rename to 前端/app.json diff --git a/app.wxss b/前端/app.wxss similarity index 100% rename from app.wxss rename to 前端/app.wxss diff --git a/pages/add_stu/add_stu.js b/前端/pages/add_stu/add_stu.js similarity index 100% rename from pages/add_stu/add_stu.js rename to 前端/pages/add_stu/add_stu.js diff --git a/pages/add_stu/add_stu.json b/前端/pages/add_stu/add_stu.json similarity index 100% rename from pages/add_stu/add_stu.json rename to 前端/pages/add_stu/add_stu.json diff --git a/pages/add_stu/add_stu.wxml b/前端/pages/add_stu/add_stu.wxml similarity index 100% rename from pages/add_stu/add_stu.wxml rename to 前端/pages/add_stu/add_stu.wxml diff --git a/pages/add_stu/add_stu.wxss b/前端/pages/add_stu/add_stu.wxss similarity index 100% rename from pages/add_stu/add_stu.wxss rename to 前端/pages/add_stu/add_stu.wxss diff --git a/pages/call_roll/call_roll.js b/前端/pages/call_roll/call_roll.js similarity index 94% rename from pages/call_roll/call_roll.js rename to 前端/pages/call_roll/call_roll.js index 8589fd4..6eb7325 100644 --- a/pages/call_roll/call_roll.js +++ b/前端/pages/call_roll/call_roll.js @@ -25,7 +25,7 @@ Page({ ], rolling: false, // 控制是否滚动 currentStudentIndex: 0, // 当前选中学生索引 - currentStudentName: "", // 当前显示的学生名称 + currentStudentName: "开始点名", // 当前显示的学生名称 rollInterval: null, // 随机点名的定时器 point: 1, // 设置的积分 }, @@ -132,9 +132,13 @@ Page({ confirmPoint: function() { const Point = parseInt(this.data.point); const id = this.data.students[this.data.currentStudentIndex].id; - const finalPoint = this.data.students[this.data.currentStudentIndex].point + Point; + let finalPoint = this.data.students[this.data.currentStudentIndex].point + Point; if(finalPoint % 13 === 0){ finalPoint += 1; //积分等于13的整数倍加一分 + wx.showToast({ + title: '恭喜您触发彩蛋，积分额外+1', + icon: '/pages/images/eggs.png' + }); } // this.data.students[this.data.currentStudentIndex].point += point; 不会重新渲染视图 this.setData({ diff --git a/pages/call_roll/call_roll.json b/前端/pages/call_roll/call_roll.json similarity index 100% rename from pages/call_roll/call_roll.json rename to 前端/pages/call_roll/call_roll.json diff --git a/pages/call_roll/call_roll.wxml b/前端/pages/call_roll/call_roll.wxml similarity index 100% rename from pages/call_roll/call_roll.wxml rename to 前端/pages/call_roll/call_roll.wxml diff --git a/pages/call_roll/call_roll.wxss b/前端/pages/call_roll/call_roll.wxss similarity index 97% rename from pages/call_roll/call_roll.wxss rename to 前端/pages/call_roll/call_roll.wxss index 50e0d7d..e2a7427 100644 --- a/pages/call_roll/call_roll.wxss +++ b/前端/pages/call_roll/call_roll.wxss @@ -33,6 +33,8 @@ } .student-list button{ + position: absolute; + top: 100rpx; background-color: rgba(234, 0, 255, 0.171); } @@ -49,7 +51,7 @@ .student-name { position: absolute; top: 100rpx; - left: 280rpx; + left: 220rpx; font-size: 80rpx; text-align: center; margin: 20rpx 0; diff --git a/pages/classSelector/classSelector.js b/前端/pages/classSelector/classSelector.js similarity index 100% rename from pages/classSelector/classSelector.js rename to 前端/pages/classSelector/classSelector.js diff --git a/pages/classSelector/classSelector.json b/前端/pages/classSelector/classSelector.json similarity index 100% rename from pages/classSelector/classSelector.json rename to 前端/pages/classSelector/classSelector.json diff --git a/pages/classSelector/classSelector.wxml b/前端/pages/classSelector/classSelector.wxml similarity index 100% rename from pages/classSelector/classSelector.wxml rename to 前端/pages/classSelector/classSelector.wxml diff --git a/pages/classSelector/classSelector.wxss b/前端/pages/classSelector/classSelector.wxss similarity index 100% rename from pages/classSelector/classSelector.wxss rename to 前端/pages/classSelector/classSelector.wxss diff --git a/pages/class_manage/class_manage.js b/前端/pages/class_manage/class_manage.js similarity index 100% rename from pages/class_manage/class_manage.js rename to 前端/pages/class_manage/class_manage.js diff --git a/pages/class_manage/class_manage.json b/前端/pages/class_manage/class_manage.json similarity index 100% rename from pages/class_manage/class_manage.json rename to 前端/pages/class_manage/class_manage.json diff --git a/pages/class_manage/class_manage.wxml b/前端/pages/class_manage/class_manage.wxml similarity index 100% rename from pages/class_manage/class_manage.wxml rename to 前端/pages/class_manage/class_manage.wxml diff --git a/pages/class_manage/class_manage.wxss b/前端/pages/class_manage/class_manage.wxss similarity index 100% rename from pages/class_manage/class_manage.wxss rename to 前端/pages/class_manage/class_manage.wxss diff --git a/pages/class_message/class_message.js b/前端/pages/class_message/class_message.js similarity index 100% rename from pages/class_message/class_message.js rename to 前端/pages/class_message/class_message.js diff --git a/pages/class_message/class_message.json b/前端/pages/class_message/class_message.json similarity index 100% rename from pages/class_message/class_message.json rename to 前端/pages/class_message/class_message.json diff --git a/pages/class_message/class_message.wxml b/前端/pages/class_message/class_message.wxml similarity index 100% rename from pages/class_message/class_message.wxml rename to 前端/pages/class_message/class_message.wxml diff --git a/pages/class_message/class_message.wxss b/前端/pages/class_message/class_message.wxss similarity index 93% rename from pages/class_message/class_message.wxss rename to 前端/pages/class_message/class_message.wxss index 30c2abe..f99a11c 100644 --- a/pages/class_message/class_message.wxss +++ b/前端/pages/class_message/class_message.wxss @@ -28,11 +28,11 @@ } .stu_list .id { position: relative; - left: 80rpx; + left: 50rpx; } .stu_list .name { position: relative; - left: 300rpx; + left: 150rpx; } diff --git a/pages/function/function.js b/前端/pages/function/function.js similarity index 100% rename from pages/function/function.js rename to 前端/pages/function/function.js diff --git a/pages/function/function.json b/前端/pages/function/function.json similarity index 100% rename from pages/function/function.json rename to 前端/pages/function/function.json diff --git a/pages/function/function.wxml b/前端/pages/function/function.wxml similarity index 100% rename from pages/function/function.wxml rename to 前端/pages/function/function.wxml diff --git a/pages/function/function.wxss b/前端/pages/function/function.wxss similarity index 100% rename from pages/function/function.wxss rename to 前端/pages/function/function.wxss diff --git a/pages/images/add_stu.png b/前端/pages/images/add_stu.png similarity index 100% rename from pages/images/add_stu.png rename to 前端/pages/images/add_stu.png diff --git a/pages/images/arrow_icon.png b/前端/pages/images/arrow_icon.png similarity index 100% rename from pages/images/arrow_icon.png rename to 前端/pages/images/arrow_icon.png diff --git a/pages/images/call_roll.png b/前端/pages/images/call_roll.png similarity index 100% rename from pages/images/call_roll.png rename to 前端/pages/images/call_roll.png diff --git a/pages/images/class_manage.png b/前端/pages/images/class_manage.png similarity index 100% rename from pages/images/class_manage.png rename to 前端/pages/images/class_manage.png diff --git a/pages/images/class_message.png b/前端/pages/images/class_message.png similarity index 100% rename from pages/images/class_message.png rename to 前端/pages/images/class_message.png diff --git a/前端/pages/images/eggs.png b/前端/pages/images/eggs.png new file mode 100644 index 0000000..5bae949 Binary files /dev/null and b/前端/pages/images/eggs.png differ diff --git a/pages/images/function.png b/前端/pages/images/function.png similarity index 100% rename from pages/images/function.png rename to 前端/pages/images/function.png diff --git a/pages/images/record.png b/前端/pages/images/record.png similarity index 100% rename from pages/images/record.png rename to 前端/pages/images/record.png diff --git a/pages/images/welcome.png b/前端/pages/images/welcome.png similarity index 100% rename from pages/images/welcome.png rename to 前端/pages/images/welcome.png diff --git a/pages/index/index.js b/前端/pages/index/index.js similarity index 100% rename from pages/index/index.js rename to 前端/pages/index/index.js diff --git a/pages/index/index.json b/前端/pages/index/index.json similarity index 100% rename from pages/index/index.json rename to 前端/pages/index/index.json diff --git a/pages/index/index.wxml b/前端/pages/index/index.wxml similarity index 100% rename from pages/index/index.wxml rename to 前端/pages/index/index.wxml diff --git a/pages/index/index.wxss b/前端/pages/index/index.wxss similarity index 100% rename from pages/index/index.wxss rename to 前端/pages/index/index.wxss diff --git a/pages/logs/logs.js b/前端/pages/logs/logs.js similarity index 100% rename from pages/logs/logs.js rename to 前端/pages/logs/logs.js diff --git a/pages/logs/logs.json b/前端/pages/logs/logs.json similarity index 100% rename from pages/logs/logs.json rename to 前端/pages/logs/logs.json diff --git a/pages/logs/logs.wxml b/前端/pages/logs/logs.wxml similarity index 100% rename from pages/logs/logs.wxml rename to 前端/pages/logs/logs.wxml diff --git a/pages/logs/logs.wxss b/前端/pages/logs/logs.wxss similarity index 100% rename from pages/logs/logs.wxss rename to 前端/pages/logs/logs.wxss diff --git a/pages/record/record.js b/前端/pages/record/record.js similarity index 100% rename from pages/record/record.js rename to 前端/pages/record/record.js diff --git a/pages/record/record.json b/前端/pages/record/record.json similarity index 100% rename from pages/record/record.json rename to 前端/pages/record/record.json diff --git a/pages/record/record.wxml b/前端/pages/record/record.wxml similarity index 100% rename from pages/record/record.wxml rename to 前端/pages/record/record.wxml diff --git a/pages/record/record.wxss b/前端/pages/record/record.wxss similarity index 94% rename from pages/record/record.wxss rename to 前端/pages/record/record.wxss index d6534ee..bc5d254 100644 --- a/pages/record/record.wxss +++ b/前端/pages/record/record.wxss @@ -30,7 +30,7 @@ } .stu_list { - font-size: 50rpx; + font-size: 40rpx; } .stu_list .id { position: relative; @@ -44,6 +44,6 @@ .stu_list .point { position: absolute; - left: 450rpx; + left: 500rpx; } diff --git a/pages/welcome/welcome.js b/前端/pages/welcome/welcome.js similarity index 100% rename from pages/welcome/welcome.js rename to 前端/pages/welcome/welcome.js diff --git a/pages/welcome/welcome.json b/前端/pages/welcome/welcome.json similarity index 100% rename from pages/welcome/welcome.json rename to 前端/pages/welcome/welcome.json diff --git a/pages/welcome/welcome.wxml b/前端/pages/welcome/welcome.wxml similarity index 100% rename from pages/welcome/welcome.wxml rename to 前端/pages/welcome/welcome.wxml diff --git a/pages/welcome/welcome.wxss b/前端/pages/welcome/welcome.wxss similarity index 100% rename from pages/welcome/welcome.wxss rename to 前端/pages/welcome/welcome.wxss diff --git a/project.config.json b/前端/project.config.json similarity index 100% rename from project.config.json rename to 前端/project.config.json diff --git a/project.private.config.json b/前端/project.private.config.json similarity index 100% rename from project.private.config.json rename to 前端/project.private.config.json diff --git a/sitemap.json b/前端/sitemap.json similarity index 100% rename from sitemap.json rename to 前端/sitemap.json diff --git a/utils/util.js b/前端/utils/util.js similarity index 100% rename from utils/util.js rename to 前端/utils/util.js diff --git a/pom.xml b/后端/pom.xml similarity index 100% rename from pom.xml rename to 后端/pom.xml diff --git a/src/main/java/com/demo/DemoApplication.java b/后端/src/main/java/com/demo/DemoApplication.java similarity index 100% rename from src/main/java/com/demo/DemoApplication.java rename to 后端/src/main/java/com/demo/DemoApplication.java diff --git a/src/main/java/com/demo/controller/ClazzController.java b/后端/src/main/java/com/demo/controller/ClazzController.java similarity index 100% rename from src/main/java/com/demo/controller/ClazzController.java rename to 后端/src/main/java/com/demo/controller/ClazzController.java diff --git a/src/main/java/com/demo/controller/ExcelController.java b/后端/src/main/java/com/demo/controller/ExcelController.java similarity index 100% rename from src/main/java/com/demo/controller/ExcelController.java rename to 后端/src/main/java/com/demo/controller/ExcelController.java diff --git a/src/main/java/com/demo/controller/StudentController.java b/后端/src/main/java/com/demo/controller/StudentController.java similarity index 100% rename from src/main/java/com/demo/controller/StudentController.java rename to 后端/src/main/java/com/demo/controller/StudentController.java diff --git a/src/main/java/com/demo/entity/Clazz.java b/后端/src/main/java/com/demo/entity/Clazz.java similarity index 100% rename from src/main/java/com/demo/entity/Clazz.java rename to 后端/src/main/java/com/demo/entity/Clazz.java diff --git a/src/main/java/com/demo/entity/Student.java b/后端/src/main/java/com/demo/entity/Student.java similarity index 100% rename from src/main/java/com/demo/entity/Student.java rename to 后端/src/main/java/com/demo/entity/Student.java diff --git a/src/main/java/com/demo/mapper/ClazzMapper.java b/后端/src/main/java/com/demo/mapper/ClazzMapper.java similarity index 100% rename from src/main/java/com/demo/mapper/ClazzMapper.java rename to 后端/src/main/java/com/demo/mapper/ClazzMapper.java diff --git a/src/main/java/com/demo/mapper/StudentMapper.java b/后端/src/main/java/com/demo/mapper/StudentMapper.java similarity index 100% rename from src/main/java/com/demo/mapper/StudentMapper.java rename to 后端/src/main/java/com/demo/mapper/StudentMapper.java diff --git a/src/main/resources/application.yml b/后端/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to 后端/src/main/resources/application.yml diff --git a/src/test/java/com/demo/DemoApplicationTests.java b/后端/src/test/java/com/demo/DemoApplicationTests.java similarity index 100% rename from src/test/java/com/demo/DemoApplicationTests.java rename to 后端/src/test/java/com/demo/DemoApplicationTests.java