diff --git a/src/assets/image/next.png b/src/assets/image/next.png index 76c0bca..2bb20d6 100644 Binary files a/src/assets/image/next.png and b/src/assets/image/next.png differ diff --git a/src/assets/image/rar.png b/src/assets/image/rar.png new file mode 100644 index 0000000..9b7bc33 Binary files /dev/null and b/src/assets/image/rar.png differ diff --git a/src/assets/image/shangchuan.png b/src/assets/image/shangchuan.png new file mode 100644 index 0000000..98fded3 Binary files /dev/null and b/src/assets/image/shangchuan.png differ diff --git a/src/assets/image/shapan.png b/src/assets/image/shapan.png new file mode 100644 index 0000000..000f81f Binary files /dev/null and b/src/assets/image/shapan.png differ diff --git a/src/assets/image/tijiao.png b/src/assets/image/tijiao.png new file mode 100644 index 0000000..3422351 Binary files /dev/null and b/src/assets/image/tijiao.png differ diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue index 620c31d..015a2e4 100644 --- a/src/views/debate/debate.vue +++ b/src/views/debate/debate.vue @@ -420,12 +420,13 @@ export default { .detailinfo { width: calc(100% + 20px); margin-top: 20px; + // height: 10px; display: flex; .detail { flex: 1; margin-right: 20px; .detailT { - height: 1000px; + // height: 1000px; background: #ffffff; border-radius: 8px; color: rgba(51, 51, 51, 1); @@ -495,13 +496,11 @@ export default { .explain { margin-top: 30px; width: 416px; - height: 158px; background: #f2f5f7; border-radius: 8px; } .explaincontent { width: 368px; - height: 64px; font-size: 16px; font-family: PingFang SC; font-weight: 500; @@ -509,6 +508,7 @@ export default { line-height: 24px; margin-left: 24px; margin-top: 47px; + margin-bottom: 47px; } } diff --git a/src/views/homework/homework.vue b/src/views/homework/homework.vue new file mode 100644 index 0000000..562766c --- /dev/null +++ b/src/views/homework/homework.vue @@ -0,0 +1,820 @@ + + + + + + diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 2b079fa..bdbd85a 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -34,19 +34,11 @@
大族广场
-
- 观看 +
+ 观看 + 签到 + 评估
-
- 签到 -
-
评估
@@ -237,6 +229,10 @@ export default { display: flex; justify-content: space-between; align-items: center; + .threeBtn { + display: flex; + justify-content: space-between; + } .btn { width: 146px; height: 46px; @@ -277,7 +273,7 @@ export default { flex: 1; margin-right: 20px; .detailT { - height: 646px; + min-height: 646px; background: #ffffff; border-radius: 8px; color: rgba(51, 51, 51, 1); @@ -422,7 +418,8 @@ export default { } .tell { width: 434px; - height: 188px; + // height: 10%; + // min-height: 557px; background-color: rgba(255, 255, 255, 1); border-radius: 8px; @@ -453,10 +450,11 @@ export default { top: 53px; } .content { - margin: 25px 24px 49px 49px; + margin: 25px 24px 0px 49px; + padding-bottom: 55px; color: #677d86; width: 361px; - height: 304px; + // height: 304px; line-height: 24px; font-size: 16px; font-weight: bold; @@ -467,9 +465,10 @@ export default { .teacher { margin-top: 22px; width: 434px; - height: 328px; + // height: 328px; background-color: rgba(255, 255, 255, 1); border-radius: 8px; + padding-bottom: 40px; .title { display: flex; align-items: center; diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index e7f8b3c..7a7d4db 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -42,7 +42,7 @@
-
+