From 9e86a6f05bdf467198a444c4b47e0a6596ddd884 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 22 Feb 2023 16:03:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                      |   4 +-
 src/assets/image/discuss/close.png  | Bin 0 -> 803 bytes
 src/views/discuss/DiscussDetail.vue |  93 +++++++++++++++++++++++++---
 vite.config.js                      |   6 +-
 4 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/image/discuss/close.png

diff --git a/src/api/api.js b/src/api/api.js
index 932052b..847ff6e 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-22 14:17:37
+ * @LastEditTime: 2023-02-22 14:51:53
  * @FilePath: /stu_h5/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -81,4 +81,4 @@ export const SubmitExternalExam = `/stu/externalExam/submitExternalExam post`
 export const UPDATE_CURRENT_TASK = `/admin/student/updateCurrentTask post`
 // 测评任务去学习
 export const EvaluationToLearn = '/evaluation/evaluationToLearn post'
-export const FILE_UPLOAD_IMG = import.meta.env.VITE_IMG + '/file/img'
\ No newline at end of file
+export const FILE_UPLOAD_IMG = import.meta.env.VITE_BASE_API + 'file/img'
\ No newline at end of file
diff --git a/src/assets/image/discuss/close.png b/src/assets/image/discuss/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..afac9ff4e51154d6b93ebc67e2bada4071e0b2c8
GIT binary patch
literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%-AP12R5(wSR7*%3Q51d8R7+kywu=e03l+qn720iSn?mcN)@+nG1Lgx^8j?-a
zjR_GEg5W|yU5N{&NQzShM^FT#3#HJsxN(z;tr79Fkqq(Ed}dmWyz+)7#4)Y(?dH9E
z&)jqFJr@Gi!5BjTz-s`2J&{N}O(v7~Fvh@SG98&rrgZ?o2MFP^I*%k34#xPQEX(ia
z=jR{I&CN;s`}>#0?=>|w8mrZcT3T9S2q8Cw@O%Ef0E97qwX?G$1cSlc;o;#G0QKLi
zs;V>t0|OeGrWpv~NAj)!kxJt6c+~6lo@X){tWGTTt=H?}`1p7^P17$Rgx?e(Ns_)e
z9FE$XDp3PgS66GMrlxkaTJ3X)F>aimo)(6Ohtv7M#l=NxY-}tYi9~)DC!5XY3XbFS
zZnyg+fA9DE4Q*|03;_x=4D+T~SgX~l4Fm#}y}iAstE;QONK!*X!|ne5{<{+s6Y0sx
z$!s2oG(Zr96_`jQwk;NmL0z`ZW<wnv9mZfVc&gLsU?>#2Gden&;(1<D$3`NNG~C?W
zOu1aHOesM*jzb=g#|R+=BO@a}W@l&RQgPvM*hqjfE|)7+Du88Kt>5pj%;j>Rv$OMf
zV`JmuFF*z;isE)tQ`0qScDr4n*4Ni}M$_~yhGBH=?d>PASnL|u($Z3fi2a^r*~Y!S
zy}}T39H;YmJO(26+S-~Tb|4TiSS%Lg^ZAaqwzhIAv6q$h&&<pSLqkJK`^lg!EG$r=
zQ0Ocgjh+`%>FMb)*4NjUJDtws{C!tfm%(PUu>=Upvi#ZUbk-gm9Q@N7B$;$Do6RcI
zPprc8{4PT1S+PYvdA;6?|FlR2P1ELrMgI8hWjr1iy1TnCZ?X!hWN>g$Q&(4a)wFrO
z7~=<$B#|}pn5+>sRWik`t*xlJx%n$X=xxb0QUpfmHUa<~q9{HQMe#ma5EMlnQ53aa
hR#wJC2v^ke^c%|pQ}G3<@=^c*002ovPDHLkV1g!*cYpu@

literal 0
HcmV?d00001

diff --git a/src/views/discuss/DiscussDetail.vue b/src/views/discuss/DiscussDetail.vue
index 0b46376..9511388 100644
--- a/src/views/discuss/DiscussDetail.vue
+++ b/src/views/discuss/DiscussDetail.vue
@@ -9,7 +9,7 @@
         </div>
         <div class="vaainfo">
           <div class="vaana">{{ disDetail?.userName }}</div>
-          <div class="vaanato">认识事物的本质。</div>
+          <!-- <div class="vaanato">认识事物的本质。</div> -->
         </div>
       </div>
     </div>
@@ -74,6 +74,7 @@
               style="width: calc(100% - 40px)"
             />
           </div>
+
           <div
             class="reply"
             :style="{
@@ -102,8 +103,21 @@
             </UploadPostImg>
           </div>
         </div>
+
         <div class="imgbtns">
-          <img style="" />
+          <div>
+            <div
+              v-for="(v, i) in fileListComment"
+              :key="i"
+              style="position: relative"
+            >
+              <img
+                :src="v.url"
+                style="width: 66px; height: 66px; margin-left: 5px"
+              />
+              <div class="cha" @click="removeCommentImg(i)"></div>
+            </div>
+          </div>
           <div class="btns">
             <div class="btns1" @click="reply1Blur">取消</div>
             <div class="btns2" @click="send">发布</div>
@@ -153,6 +167,14 @@
                   class="it"
                   v-for="(itemc, key) in item.children"
                   :key="key"
+                  :style="{
+                    display:
+                      spreadReply !== index && key == 0
+                        ? 'block'
+                        : spreadReply == index
+                        ? 'block'
+                        : 'none',
+                  }"
                 >
                   <div class="ava">
                     <img class="avainner" :src="itemc.studentAvatar" />
@@ -180,13 +202,35 @@
                       </div>
                     </div>
                     <!-- <div class="line"></div> -->
-                    <div
+                    <!-- <div
                       :class="index === newrestore.length - 1 ? null : 'line'"
-                    ></div>
+                    ></div> -->
                   </div>
                 </div>
               </div>
             </div>
+            <!-- 查看更多 -->
+            <div
+              style="
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                cursor: pointer;
+                width: 100%;
+                margin-top: 10px;
+              "
+              v-if="item.children.length > 1"
+            >
+              <span
+                @click="lookMore(index)"
+                style="font-size: 14px; color: #2478ff"
+                >{{
+                  index == spreadReply
+                    ? "收起"
+                    : "查看全部" + item.children.length + "条评论"
+                }}</span
+              >
+            </div>
           </div>
         </div>
       </div>
@@ -224,7 +268,7 @@
 </template>
 
 <script setup>
-import { reactive, ref } from "vue";
+import { reactive, ref, computed } from "vue";
 import ReturnHead from "@/components/ReturnHead.vue";
 import px from "@/assets/image/discuss/px.jpg";
 import { request, useRequest } from "@/api/request";
@@ -238,6 +282,8 @@ import {
 import { useRoute, useRouter } from "vue-router/dist/vue-router";
 import UploadPostImg from "@/components/img/UploadPostImg.vue";
 import { ElMessage } from "element-plus";
+import store from "@/store";
+const userInfo = computed(() => store.state.userInfo);
 const {
   query: { id, type, postID, targetId },
 } = useRoute();
@@ -326,7 +372,7 @@ const clearText = () => {
   replayComment.value.content = "";
 };
 
-// 回复分页
+// 评论分页
 function handleCurrentChange(e, k) {
   console.log("分页打印", e, k);
   hfPage.value.currentPage = hfPage.value.currentPage + 1;
@@ -444,11 +490,15 @@ function submitComment() {
     img: imgFileUrl.length !== 0 ? imgFileUrl.toString() : "",
   })
     .then((res) => {
-      console.log("评论发表失败", res);
+      console.log("评论发表成功", res);
+      ElMessage.success("发布成功");
+      hfPage.value.pageNo = 1;
+      hfPage.value.currentPage = 1;
+      commontList.value = [];
       getData();
     })
     .catch((err) => {
-      console.log(err);
+      console.log("评论发表失败", err);
     });
 }
 
@@ -478,7 +528,19 @@ function submitReplayComment() {
   })
     .then((res) => {
       console.log(res);
-      getData();
+      // getData();
+      ElMessage.success("回复成功");
+      for (let i = 0; i < commontList.value.length; i++) {
+        if (commontList.value[i].id === replayComment.value.pid) {
+          let obj = {
+            studentAvatar: userInfo.value.avatar,
+            studentName: userInfo.value.realName,
+            content: replayComment.value.content,
+          };
+          commontList.value[i].children.push(obj);
+        }
+      }
+      clearText();
     })
     .catch((err) => {
       console.log(err);
@@ -684,6 +746,17 @@ function send() {
         display: flex;
         justify-content: space-between;
         // margin-top: 10px;
+        .cha {
+          position: absolute;
+          top: 15px;
+          right: -9px;
+          // right: 0;
+          width: 18px;
+          height: 18px;
+          border-radius: 50%;
+          background-image: url(../../assets/image/discuss/close.png);
+          background-size: 100%;
+        }
         .btns {
           display: flex;
         }
@@ -795,6 +868,7 @@ function send() {
 
         .newre {
           margin-top: 7.5px;
+          padding-bottom: 20px;
           .tri {
             margin-left: 80px;
             height: 0px;
@@ -807,6 +881,7 @@ function send() {
             width: 100%;
             display: flex;
             justify-content: right;
+            // padding-bottom: 20px;
             .rec {
               background-color: #f0f3f6;
               border-radius: 13px;
diff --git a/vite.config.js b/vite.config.js
index 73701b5..f6d998b 100644
--- a/vite.config.js
+++ b/vite.config.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-20 11:20:13
+ * @LastEditTime: 2023-02-22 14:53:41
  * @FilePath: /stu_h5/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -45,6 +45,10 @@ export default defineConfig(({ command, mode }) =>
                 target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
                 changeOrigin: true,
             },
+            '/file/img': {
+                target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+                changeOrigin: true,
+            },
             '/stu': {
                 target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
                 changeOrigin: true,