diff --git a/src/api/api.js b/src/api/api.js index 8278949..44a7d2a 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-13 11:42:48 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-19 18:05:07 + * @LastEditTime: 2023-02-20 17:57:40 * @FilePath: /stu_h5/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -54,8 +54,18 @@ export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post` // 讨论模块 // -- 根据讨论的Id查询讨论发表的帖子 export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussSubmitDetailByDiscussId post' -export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_COLLECTION = '/comment/collection post' +// 查询讨论下的帖子 +export const PostList = `/statement/list` +// 发表帖子 +export const PostAdd = `/statement/add post` +// 贴子点赞 +export const PostPraise = `/statement/praise` +// 帖子详情查询 +export const PostDetails = `/statement/info` + +export const COMMENT_LIST = '/comment/list' +export const COMMENT_PRAISE = '/comment/praise' // 外部考试详情接口 export const EXTERNALEXAM = `/external/exam/queryExternalExam` diff --git a/src/api/request.js b/src/api/request.js index 842705f..d908df3 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -157,7 +157,7 @@ const httpupload = axios.create({ headers: { "Content-Type": "multipart/form-data" }, }); -export const fileUp = (data) => httpupload.post("/file/img", data, { +export const fileUp = (data) => httpupload.post("/file/upload", data, { headers: { "Content-Type": "multipart/form-data" }, }); export const videoUp = (data) => httpupload.post("/file/uploadunlimit", data, { diff --git a/src/assets/image/discuss/elsedianzan1.png b/src/assets/image/discuss/elsedianzan1.png new file mode 100644 index 0000000..6931fd1 Binary files /dev/null and b/src/assets/image/discuss/elsedianzan1.png differ diff --git a/src/assets/image/uploadImg2.png b/src/assets/image/uploadImg2.png new file mode 100644 index 0000000..165a448 Binary files /dev/null and b/src/assets/image/uploadImg2.png differ diff --git a/src/components/ReturnHead.vue b/src/components/ReturnHead.vue index 1eae78f..abf29f1 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-18 15:16:34 + * @LastEditTime: 2023-02-20 11:56:39 * @FilePath: /stu_h5/src/components/ReturnHead.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -72,6 +72,14 @@ export default { type: Number, default: null, }, + discussId: { + type: Number, + default: null, + }, + postAdd: { + type: Function, + default: null, + }, }, setup(props, ctx) { const router = useRouter(); @@ -79,7 +87,12 @@ export default { router.back(); }; const publishClick = () => { - props.publishWork && props.publishWork(); + if (props.postAdd) { + props.postAdd && props.postAdd(); + } + if (props.publishWork) { + props.publishWork && props.publishWork(); + } }; const goFileStorage = () => { router.push({ @@ -93,9 +106,9 @@ export default { const goPublish = () => { router.push({ path: "/discussupload", - // query: { - // courseId: props.courseId, - // }, + query: { + discussId: props.discussId, + }, }); }; return { diff --git a/src/views/discuss/DiscussDetail.vue b/src/views/discuss/DiscussDetail.vue index d5baa9e..4ba263c 100644 --- a/src/views/discuss/DiscussDetail.vue +++ b/src/views/discuss/DiscussDetail.vue @@ -5,10 +5,10 @@
- +
-
付欣晴
+
{{ disDetail?.userName }}
认识事物的本质。
@@ -19,16 +19,14 @@
-
从营销角度分析：我的团队需要这些能力
-
- 所谓团队协作能力，是指建立在团队的基础之上，发挥团队精神、互补互助以达到团队最大工作效率的能力。对于团队的成员来说，不仅要有个人能力，更需要有在不同的位置上各尽所能、与其他成员协调合作的能力。 -
+
{{ disDetail?.title }}
+
- 请基于公司战略方向和你所负责的组织业务发展，识别3个你和你的团队在未来3年的新的能力与技能要求 + {{ discussInfo ? discussInfo : "-" }}
-
2022-08-15 22:28
+
{{ disDetail?.createTime }}
@@ -39,65 +37,106 @@
评论
-
1992条
+
{{ hfPage?.total }}条
+
+
+ + +
+
+ +
-
+ -
+
-
+
- +
- {{ item.name }} + {{ item.createName }}
-
{{ item.re }}
+
{{ item.content }}
-
{{ item.time }}
-
回复
-
+
{{ item.createTime }}
+
回复
+
- + +
-
67
+
{{ item.praiseNum || 0 }}
-
+
- +
-
{{ itemc.name }}
-
{{ itemc.re }}
+
{{ itemc.createName }}
+
{{ itemc.content }}
-
{{ itemc.time }}
-
回复
-
+
{{ itemc.createTime }}
+
+ 回复 +
+
+ -
0
+
{{ itemc.praiseNum || 0 }}
@@ -115,86 +154,281 @@
- -
-
-
-
-
-
- -
-
- {{ item.name }} -
-
-
-
{{ item.re }}
-
-
{{ item.time }}
-
回复
-
-
- -
-
67
-
-
-
-
-
-
+ +
- @@ -355,8 +589,10 @@ export default { .reshead { width: 100%; display: flex; - justify-content: center; - height: 50px; + flex-direction: column; + align-items: center; + position: relative; + height: 100px; .headn { width: 90%; display: flex; @@ -372,6 +608,13 @@ export default { line-height: 50px; } } + .reply { + display: flex; + align-items: center; + width: 90%; + position: absolute; + bottom: 15px; + } } .linee { height: 0; @@ -381,7 +624,7 @@ export default { .restorebox { width: 100%; // height: 200px; - + border-top: 1px solid #f1f2f3; border-radius: 4px; position: relative; display: flex; @@ -484,6 +727,7 @@ export default { } } .redetail { + width: 100%; margin-left: 12.5px; .rename { color: #02172a; @@ -554,5 +798,13 @@ export default { } } } + .reply1 { + display: flex; + align-items: center; + width: 90%; + margin-left: 5%; + position: absolute; + bottom: 100px; + } } diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index d77c517..4e6bbe1 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -1,18 +1,22 @@