From 8dcb67544f02e7f244b9ab6305b3cf01acd78482 Mon Sep 17 00:00:00 2001
From: yjh <1531817747@qq.com>
Date: Thu, 10 Oct 2024 22:32:39 +0800
Subject: [PATCH] 3
---
pages/card/card.wxml | 17 ++++-
pages/card/card.wxss | 71 +++++++++++++++++-
pages/cardM/cardM.wxml | 25 ++++---
pages/cardM/cardM.wxss | 136 ++++++++++++++++++++++++++++++++++-
pages/rollcall/rollcall.js | 21 +++---
pages/rollcall/rollcall.wxml | 4 +-
pages/rollcall/rollcall.wxss | 18 +++++
7 files changed, 268 insertions(+), 24 deletions(-)
diff --git a/pages/card/card.wxml b/pages/card/card.wxml
index 23cef04..cb82876 100644
--- a/pages/card/card.wxml
+++ b/pages/card/card.wxml
@@ -11,10 +11,15 @@
-->
+
撤 销
+
@@ -22,13 +27,19 @@
旷 课
+
- {{student_ID}}
- {{name}}
+
+ {{student_ID}}
+
+
+
+ {{name}}
+
@@ -36,6 +47,7 @@
请 假
+
@@ -43,6 +55,7 @@
点 到
+
diff --git a/pages/card/card.wxss b/pages/card/card.wxss
index c5e5e34..f242baa 100644
--- a/pages/card/card.wxss
+++ b/pages/card/card.wxss
@@ -1,7 +1,30 @@
/* pages/card/card.wxss */
+.header{
+ height: 250rpx;
+ position: relative;
+ width: 100%;
+}
+.title{
+ position: absolute;
+ font-family: "xiaowei";
+ font-weight: 300;
+ font-size: 70px;
+ color: #333;
+ top:30px;
+ left: 20px;
+}
+
+.logo{
+ position: absolute;
+ top: 12px;
+ right: 15px;
+ height: 120px;
+ width:120px;
+ z-index: 1;
+}
.swiperTtemBox {
/* 底部内容样式 */
- height: 100vh;
+ height: 82vh;
overflow: scroll;
/* margin: 0rpx 0rpx; */
background: white;
@@ -57,11 +80,57 @@
.vertical-text {
padding-left: 5%;
padding-right: 5%;
+ font-weight: bold;
/* border: 2px solid black; */
writing-mode: vertical-lr;
}
.horizontal-text {
padding-top: 5%;
padding-bottom: 5%;
+ font-weight: bold;
/* border: 2px solid black; */
+}
+
+.student-info1 {
+ position: fixed;
+ left: 22%;
+ top: 25%;
+ font-size: 40px;
+}
+.student-info2 {
+ position: fixed;
+ left: 22%;
+ top: 35%;
+ font-size: 55px;
+ letter-spacing: 23px;
+ font-weight: bold;
+}
+
+.picture22 {
+ position: fixed;
+ width: 40%;
+ bottom: 5%;
+ /* bottom: -10%; */
+ /* right: 5%; */
+}
+
+.picture42 {
+ position: fixed;
+ width: 40%;
+ bottom: 30%;
+ right: 20%;
+}
+
+.picture31 {
+ position: fixed;
+ width: 40%;
+ bottom: 34%;
+ left: 20%;
+}
+
+.picture17 {
+ position: fixed;
+ width: 40%;
+ top: 7%;
+ /* bottom: 30%; */
}
\ No newline at end of file
diff --git a/pages/cardM/cardM.wxml b/pages/cardM/cardM.wxml
index 3f5e51b..1654895 100644
--- a/pages/cardM/cardM.wxml
+++ b/pages/cardM/cardM.wxml
@@ -1,8 +1,13 @@
+
未到课
+
@@ -10,34 +15,33 @@
准确复述
+
-
-
-
+
{{student_ID}}
-
-
-
+
{{name}}
+
+
- 分数: {{selectedScore || '请选择分数'}}
+ {{selectedScore || '请选择分数'}}
-
+
+
-
-
复述失败
+
@@ -45,6 +49,7 @@
准确回答
+
diff --git a/pages/cardM/cardM.wxss b/pages/cardM/cardM.wxss
index d929df4..c0a67ff 100644
--- a/pages/cardM/cardM.wxss
+++ b/pages/cardM/cardM.wxss
@@ -1,12 +1,41 @@
/* pages/card/card.wxss */
+.header{
+ height: 250rpx;
+ position: relative;
+ width: 100%;
+}
+.title{
+ position: absolute;
+ font-family: "xiaowei";
+ font-weight: 300;
+ font-size: 70px;
+ color: #333;
+ top:30px;
+ left: 20px;
+}
+
+.logo{
+ position: absolute;
+ top: 12px;
+ right: 15px;
+ height: 120px;
+ width:120px;
+ z-index: 1;
+}
.swiperTtemBox {
/* 底部内容样式 */
- height: 100vh;
+ height: 82vh;
overflow: scroll;
/* margin: 0rpx 0rpx; */
background: white;
font-size: 28rpx;
}
+.picture16 {
+ position: fixed;
+ width: 35%;
+ left: 31%;
+ top: -5%;
+}
.top-bar {
display: flex;
height: 100%;
@@ -57,11 +86,116 @@
.vertical-text {
padding-left: 5%;
padding-right: 5%;
+ font-weight: bold;
/* border: 2px solid black; */
writing-mode: vertical-lr;
}
.horizontal-text {
padding-top: 5%;
padding-bottom: 5%;
+ font-weight: bold;
/* border: 2px solid black; */
+}
+.student-info1 {
+ position: fixed;
+ left: 22%;
+ top: 25%;
+ font-size: 40px;
+}
+.student-info2 {
+ position: fixed;
+ left: 22%;
+ top: 35%;
+ font-size: 55px;
+ letter-spacing: 23px;
+ font-weight: bold;
+}
+.picker {
+ width: 60%;
+ height: 5%;
+ position: fixed;
+ top: 55%;
+ left: 17%;
+ border: 10px solid white;
+ border-radius: 10px;
+ font-size: 28px;
+ background-color: white;
+ text-align: center;
+ line-height: 120%;
+ justify-content: center;
+ z-index: 2;
+ font-weight: 600;
+}
+
+.pickerback{
+ position: fixed;
+ width: 65%;
+ height: 7%;
+ top: 54%;
+ left: 15%;
+ background-color: #4D95DF ;
+ border: 10px solid #4D95DF;
+ border-radius: 15px;
+ z-index: 1;
+}
+
+.confirm-content {
+ position: fixed;
+ width: 45%;
+ height: 4.5%;
+ left: 24%;
+ bottom: 24.7%;
+ border: 2px solid #F8E39F; /* 边框颜色 */
+ background-color: #F8E39F; /* 按钮背景颜色 */
+ color: #F8E39F; /* 字体颜色 */
+ border-radius: 20px; /* 圆角设置 */
+ padding: 5px 10px; /* 内边距 */
+ font-size: 40px; /* 字体大小 */
+ text-align: center;
+ justify-content: center;
+}
+
+.confirm-button {
+ position: fixed;
+ /* width: 10%; */
+ height: 5%;
+ bottom: 25.5%;
+ left: 26%;
+ background-color: white; /* 内部背景颜色 */
+ color: black;
+ /* padding: 12px; */
+ border-radius: 15px; /* 内部圆角半径 */
+ font-size: 28px; /* 字体大小 */
+ font-family: "youshebiaotihei";
+ font-weight: 150;
+ line-height: 60%;
+ z-index: 2;
+}
+
+.picture42 {
+ position: fixed;
+ width: 40%;
+ /* bottom: -10%; */
+ /* right: 5%; */
+}
+
+.picture441 {
+ position: fixed;
+ width: 40%;
+ bottom: 30%;
+ right: 20%;
+}
+
+.picture20 {
+ position: fixed;
+ width: 40%;
+ bottom: 30%;
+ left: 20%;
+}
+
+.picture17 {
+ position: fixed;
+ width: 40%;
+ top: 7%;
+ /* bottom: 30%; */
}
\ No newline at end of file
diff --git a/pages/rollcall/rollcall.js b/pages/rollcall/rollcall.js
index 586a8c8..c28b63b 100644
--- a/pages/rollcall/rollcall.js
+++ b/pages/rollcall/rollcall.js
@@ -47,13 +47,18 @@ Page({
});
},
- triggerSelection: function() {
+ beginfront: function() {
if (this.data.isAllSpot) {
this.fullSelection();
+ // console.log("执行全点");
} else {
// 否则执行 fullSelection
this.randomSelection();
+ // console.log("执行抽点");
}
+ wx.navigateTo({
+ url: '/pages/card/card',
+ })
},
// 课前点名 - 抽点
randomSelection: function() {
@@ -77,18 +82,16 @@ Page({
})
},
- beginfull: function(e) {
- wx.navigateTo({
- url: '/pages/card/card',
- })
- },
-
beginsolid: function() {
this.setData({
showSolidMode: true, // 设置为 true 来隐藏当前内容并显示新的内容
});
},
-
+ retrun1: function() {
+ this.setData({
+ showSolidMode:false,
+ })
+ },
beginsolidgo: function() {
// console.log(this.data.indexstudent);
app.globalData.part = 1;
@@ -124,7 +127,7 @@ Page({
// });
},
- exportFile: function () {
+ handleTap: function () {
var app = getApp();
// console.log(app.globalData.fileID);
wx.showLoading({
diff --git a/pages/rollcall/rollcall.wxml b/pages/rollcall/rollcall.wxml
index a9e6810..3382f24 100644
--- a/pages/rollcall/rollcall.wxml
+++ b/pages/rollcall/rollcall.wxml
@@ -33,7 +33,7 @@
-
+
@@ -56,6 +56,7 @@
+
@@ -77,6 +78,7 @@
+
diff --git a/pages/rollcall/rollcall.wxss b/pages/rollcall/rollcall.wxss
index 81edb12..b2bd437 100644
--- a/pages/rollcall/rollcall.wxss
+++ b/pages/rollcall/rollcall.wxss
@@ -157,6 +157,7 @@
font-family: "youshebiaotihei";
line-height: 130%;
z-index: 2;
+ font-weight: 150;
}
.picture101 {
@@ -196,6 +197,7 @@
font-family: "youshebiaotihei";
line-height: 130%;
z-index: 2;
+ font-weight: 150;
}
.picture26 {
@@ -235,6 +237,7 @@
font-family: "youshebiaotihei";
line-height: 130%;
z-index: 2;
+ font-weight: 150;
}
.ranking-header {
@@ -363,4 +366,19 @@
font-weight: 150;
line-height: 90%;
z-index: 2;
+}
+
+.return1 {
+ position: fixed;
+ bottom: 10%;
+ right: -7%;
+ font-size: 20px ;
+ background-color: white;
+}
+
+.image-btn {
+ position: fixed;
+ width: 10%;
+ right: 10%;
+ top: 5.8%;
}
\ No newline at end of file