diff --git a/src/components/ReturnHead.vue b/src/components/ReturnHead.vue index abf29f1..27fa44d 100644 --- a/src/components/ReturnHead.vue +++ b/src/components/ReturnHead.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-16 17:26:39 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-20 11:56:39 + * @LastEditTime: 2023-02-22 19:32:18 * @FilePath: /stu_h5/src/components/ReturnHead.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -80,6 +80,10 @@ export default { type: Function, default: null, }, + id: { + type: Number, + default: null, + }, }, setup(props, ctx) { const router = useRouter(); @@ -108,6 +112,8 @@ export default { path: "/discussupload", query: { discussId: props.discussId, + type: props.type, + id: props.id, }, }); }; diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 018d53f..53e34a3 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -4,6 +4,8 @@ text="讨论详情" :ispublish="true" :discussId="discussId" + :id="id" + :type="type" >
@@ -398,10 +400,16 @@ function handleCurrentChange(e, k) { } .inn { margin-bottom: 20px; - margin-top: 11px; color: #6e7b84; font-size: 13px; line-height: 24px; + max-height: 103px; + overflow: hidden; + text-overflow: ellipsis; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 4; + -webkit-box-orient: vertical; } } } diff --git a/src/views/discuss/DiscussUpload.vue b/src/views/discuss/DiscussUpload.vue index 80130dc..aab8d25 100644 --- a/src/views/discuss/DiscussUpload.vue +++ b/src/views/discuss/DiscussUpload.vue @@ -80,7 +80,7 @@ import store from "@/store"; import { ElMessage } from "element-plus"; const router = useRouter(); const { - query: { discussId }, + query: { discussId, id, type }, } = useRoute(); const state = reactive({ text: "", @@ -171,6 +171,8 @@ const postAdd = () => { ctime: "", discussId: discussId, id: 0, + type: type, + taskId: id, mtime: "", praiseNum: 0, status: 0, diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue index 99c7b91..0b46b0a 100644 --- a/src/views/faceteach/FaceTeachNoCommon.vue +++ b/src/views/faceteach/FaceTeachNoCommon.vue @@ -1,9 +1,17 @@ @@ -607,14 +198,29 @@ onUnmounted(() => { display: flex; flex-direction: column; align-items: center; - margin-top: -14.5px; + margin-top: 10px; + .title { width: 90%; - height: 74px; + min-height: 167px; border-radius: 4px; background-color: rgba(255, 255, 255, 1); display: flex; - justify-content: center; + flex-direction: column; + align-items: center; + .faceteachimgname { + display: flex; + align-items: center; + width: 90%; + margin-top: 17px; + margin-bottom: 20px; + } + .faceteachname { + margin-left: 15px; + font-size: 14px; + font-weight: normal; + color: #394145; + } .titlemain { width: 90%; display: flex; diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue index 491a012..3af73fd 100644 --- a/src/views/faceteach/FaceTeachNoCourse.vue +++ b/src/views/faceteach/FaceTeachNoCourse.vue @@ -1,9 +1,17 @@ @@ -607,14 +203,29 @@ onUnmounted(() => { display: flex; flex-direction: column; align-items: center; - margin-top: -14.5px; + margin-top: 10px; + .title { width: 90%; - height: 74px; + min-height: 167px; border-radius: 4px; background-color: rgba(255, 255, 255, 1); display: flex; - justify-content: center; + flex-direction: column; + align-items: center; + .faceteachimgname { + display: flex; + align-items: center; + width: 90%; + margin-top: 17px; + margin-bottom: 20px; + } + .faceteachname { + margin-left: 15px; + font-size: 14px; + font-weight: normal; + color: #394145; + } .titlemain { width: 90%; display: flex; @@ -625,6 +236,24 @@ onUnmounted(() => { display: flex; align-items: center; } + .btn { + margin-right: 20px; + width: 260px; + height: 46px; + background: #2478ff; + border-radius: 4px; + box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7); + display: flex; + align-items: center; + justify-content: center; + color: #fff; + font-size: 14px; + font-weight: 800; + line-height: 24px; + cursor: pointer; + margin-right: 96px; + margin-bottom: 20px; + } } .titlebtn { width: 83px; diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index b08e5b5..8ace6ad 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -1,9 +1,17 @@ @@ -607,14 +224,29 @@ onUnmounted(() => { display: flex; flex-direction: column; align-items: center; - margin-top: -14.5px; + margin-top: 10px; + .title { width: 90%; - height: 74px; + min-height: 167px; border-radius: 4px; background-color: rgba(255, 255, 255, 1); display: flex; - justify-content: center; + flex-direction: column; + align-items: center; + .faceteachimgname { + display: flex; + align-items: center; + width: 90%; + margin-top: 17px; + margin-bottom: 20px; + } + .faceteachname { + margin-left: 15px; + font-size: 14px; + font-weight: normal; + color: #394145; + } .titlemain { width: 90%; display: flex;