From f0f67ee76c4020060037291705cb7761c5f1d5ed Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 19 Sep 2022 16:49:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/debate/debate.vue | 1 + src/views/starttest/StartTest.vue | 93 +++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 src/views/starttest/StartTest.vue diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue index ae5f445..be45271 100644 --- a/src/views/debate/debate.vue +++ b/src/views/debate/debate.vue @@ -419,6 +419,7 @@ export default { .detailinfo { width: calc(100% + 20px); + // width: calc(100%); margin-top: 20px; // height: 10px; display: flex; diff --git a/src/views/starttest/StartTest.vue b/src/views/starttest/StartTest.vue new file mode 100644 index 0000000..3084878 --- /dev/null +++ b/src/views/starttest/StartTest.vue @@ -0,0 +1,93 @@ + + + + + From 10cd9e216f787d999b278a36072f61a3affaab03 Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 19 Sep 2022 17:31:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0ballot?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE=E9=BC=A0=E6=A0=87=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ballot/ballot.vue | 1 + src/views/debate/debate.vue | 5 ----- src/views/examination/ExamPage.vue | 26 ++++++++++++++++++++++++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/views/ballot/ballot.vue b/src/views/ballot/ballot.vue index 09101d6..592e9be 100644 --- a/src/views/ballot/ballot.vue +++ b/src/views/ballot/ballot.vue @@ -155,6 +155,7 @@ export default { height: 23px; border-radius: 50%; border: 0; + cursor: pointer; } .btn01 { background-image: url("../../assets/image/prev.png"); diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue index f964a8a..b79b77d 100644 --- a/src/views/debate/debate.vue +++ b/src/views/debate/debate.vue @@ -385,12 +385,7 @@ export default { } .detailinfo { -<<<<<<< HEAD - // width: calc(100% + 20px); - // width: calc(100%); -======= width: 100%; ->>>>>>> 52b6d3fe7525cbcd7226c2cdfd69cbd044a1670b margin-top: 20px; // height: 10px; background: #ffffff; diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue index d358a07..862790b 100644 --- a/src/views/examination/ExamPage.vue +++ b/src/views/examination/ExamPage.vue @@ -59,11 +59,11 @@ -
+
历史纪录
-
+
@@ -219,6 +219,27 @@ export default { font-weight: 800; color: #ffffff; left: calc(50% - 73px); + cursor: pointer; + } + .righttitleE { + display: flex; + margin-top: 110px; + // padding-top: 30px; + position: relative; + .text { + margin-left: 8px; + font-size: 16px; + color: rgba(51, 51, 51, 1); + font-weight: 800; + } + .box { + width: 75px; + height: 10px; + background-color: rgba(36, 120, 255, 0.15); + position: absolute; + left: 23px; + top: 14px; + } } .history { position: relative; @@ -270,6 +291,7 @@ export default { color: #2478ff; background-color: #fff; border: 0; + cursor: pointer; } .historycontent { width: 59px; From 064f820946be127fa4537884d08d7d7b8f085b83 Mon Sep 17 00:00:00 2001 From: songwc Date: Tue, 20 Sep 2022 09:21:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style=EF=BC=9Aballot=E3=80=81debate?= =?UTF-8?q?=E3=80=81homework=E3=80=81livebroadcast=E3=80=81moreactive?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ballot/ballot.vue | 5 +++-- src/views/debate/debate.vue | 6 ++++-- src/views/homework/homework.vue | 14 +++++++++++--- src/views/liveBroadcast/LiveBroadcast.vue | 6 ++++-- src/views/moreActive/MoreActive.vue | 6 ++++-- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/views/ballot/ballot.vue b/src/views/ballot/ballot.vue index 592e9be..79e2cfc 100644 --- a/src/views/ballot/ballot.vue +++ b/src/views/ballot/ballot.vue @@ -10,9 +10,9 @@
- 上一个 + 上一个 下一个 - +
@@ -149,6 +149,7 @@ export default { display: inline-block; position: relative; top: -6px; + cursor: pointer; } .btn { width: 23px; diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue index b79b77d..da34c36 100644 --- a/src/views/debate/debate.vue +++ b/src/views/debate/debate.vue @@ -9,9 +9,9 @@
辩论详情
- 上一个 + 上一个 下一个 - +
@@ -361,12 +361,14 @@ export default { display: inline-block; position: relative; top: -6px; + cursor: pointer; } .btn { width: 23px; height: 23px; border-radius: 50%; border: 0; + cursor: pointer; } .btn01 { background-image: url("../../assets/image/prev.png"); diff --git a/src/views/homework/homework.vue b/src/views/homework/homework.vue index 562766c..9bdb300 100644 --- a/src/views/homework/homework.vue +++ b/src/views/homework/homework.vue @@ -10,9 +10,9 @@
- 上一个 + 上一个 下一个 - +
@@ -39,7 +39,7 @@ - +
@@ -238,12 +238,14 @@ export default { display: inline-block; position: relative; top: -6px; + cursor: pointer; } .btn { width: 23px; height: 23px; border-radius: 50%; border: 0; + cursor: pointer; } .btn01 { background-image: url("../../assets/image/prev.png"); @@ -380,6 +382,7 @@ export default { } } .shangchuan { + z-index: 999; font-size: 16px; font-family: PingFang SC; font-weight: 800; @@ -461,6 +464,7 @@ export default { background-color: #fff; color: #277aff; margin-top: 20px; + cursor: pointer; } .btndetail { margin-left: 25px; @@ -510,6 +514,7 @@ export default { background-color: #fff; color: #277aff; margin-top: 20px; + cursor: pointer; } .btndetail { margin-left: 25px; @@ -559,6 +564,7 @@ export default { background-color: #fff; color: #277aff; margin-top: 20px; + cursor: pointer; } .btndetail { margin-left: 25px; @@ -568,6 +574,8 @@ export default { } .tijiao { + z-index: 999; + cursor: pointer; margin-top: 22px; margin-left: 480px; width: 33px; diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 2725a04..aa0e1fb 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -10,9 +10,9 @@
- 上一个 + 上一个 下一个 - +
@@ -206,12 +206,14 @@ export default { display: inline-block; position: relative; top: -6px; + cursor: pointer; } .btn { width: 23px; height: 23px; border-radius: 50%; border: 0; + cursor: pointer; } .btn01 { background-image: url("../../assets/image/prev.png"); diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 7a7d4db..5142ae6 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -10,9 +10,9 @@
- 上一个 + 上一个 下一个 - +
@@ -141,12 +141,14 @@ export default { display: inline-block; position: relative; top: -6px; + cursor: pointer; } .btn { width: 23px; height: 23px; border-radius: 50%; border: 0; + cursor: pointer; } .btn01 { background-image: url("../../assets/image/prev.png");