From f02a22e2b1ef723a6d6ca7ad85348e472b61c657 Mon Sep 17 00:00:00 2001
From: shenhan000 <shenhanfly@163.com>
Date: Sat, 10 May 2025 11:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/img/accept.png                | Bin 845 -> 838 bytes
 app/assets/img/accept1.png               | Bin 0 -> 845 bytes
 app/components/PlanetComment.vue         |  16 ++++++++++++----
 app/components/PlanetQuestionComment.vue |  23 ++++++++++++++++++-----
 app/components/PlanetReport.vue          |   4 ++--
 app/components/QuestionPublish.vue       |   1 +
 app/pages/gold-detail/index.vue          |   2 +-
 app/pages/planet-detail/index.vue        |   5 +++--
 8 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/img/accept1.png

diff --git a/app/assets/img/accept.png b/app/assets/img/accept.png
index 0f0e52e964ea66afe848053735198a047fccbc28..4ee3ec9638c8f24039130117d35abfcc6901b965 100644
GIT binary patch
delta 802
zcmV+-1Ks@12F3=EF@FF_L_t(oN6lD4a@#Nr1oIl_pf}XHwEb0*U$wcoeuED2Yr@XL
zS`GvOB;8Yeu@i~pVgc+zD)OIxN`~v_=X(AUIe$DaZ_z!xUW$Cf^(u14cM<tht6cFr
zTRX!=3hevm`X)tQrOG=G0GL|j6(9gW0adv^ZNKq1f@ueD>wo_RWC)C)K2A&FZ)IWw
zRI0rHdR`RR=wsJEvMvU8TdQSCH^1kpF-Z1o8hfdXGSCa^0L-%G7q-o}3t$l}*!x;4
z5yTyJD}_hE9f3KvqNrvM$e8{ra<PD;Gj_nZ(QG$81kjZMz&%xY$!fI$^C=w31*60|
zNQTOVNn2J11b@SIzfa3cm$4tW^@7$1TM7zvLyJyJDk*luUH5MLjKJZ{tW)*SsNj2P
zZNLMDM(G6@oC&7b*%51ZU=s!J*@38P2Rae9DUPl&sFu>(TBBN10Y!~ux%TP6#s`Jp
zZUR_a%sY88?Ao%i4BE2_*n%F-0<$S*jS#2@7O_YBf`7I3(z&a#URRMR1+g^-1M)=-
z@DWIFZ)hy0);HNsE_!X>416<ffTMphAWBTe9D?FKtUs;QB9{~x7BSy6YsyF1_OQ;a
zHgOng%Ys+m<VY0Ahqt#bFxv=PpowT&Ae`AOC}<(}((ggXXY#TWPpd1t=o3jG%P3+t
zg_c8=tAAyS|La+u2iOJ1+-Ggi6x$#Oh}WR(?7+x+BKJVehSNnRel{w#D>rs~e{Ivn
z<d|(8=m5+LUM9X-T~Jaeva^Fg(>qg-2Vh=TP`ufA((}chqeSbxH;0phwG3`D1m~tz
zYF0FF`5_=0B0^vXqn+?m%R*0JZNm_BG|6-y-+!#RkH(qNRFQRL#FmP4uZ6wykGk?8
zAA_m3H*yW9)2PP0uKD2Txy?(1`cqKbLv=JI4}sYY{Pbbf-h$)PIcq4hx1L>10o#E~
zqK`_#zf#b58s@b@B+|_>MmCX67C6AZzi1n}mn>k}b}97@148dXXPU7n0BbqcBl&dR
gdmF#O2_+-uFQ#%pzUG|Pf&c&j07*qoM6N<$f&`;~{Qv*}

delta 809
zcmV+^1J?Y;2F(VLF@Fb1L_t(oN6lE#b=xou1U*9A6*Nbkagq+<WQZo?xSm5Rv>8F_
zJ4VMq5CGEss(<WfiR9q`+(9bxpMFY&>)YFWUKTmO|CpY=dw9K^<U6jftDNy&iu_s^
zx#4%Tc7%%%*q5L4vlO|=Dla?$U{;X}Kmb4mw8-sr`uL3xf`4fTZ|naBqzjCo-k+wz
z-<63CP!W0g{Wvu+83TI#J?ng6uk)&zs+-q5eKJV)bQ-f%dKt(9Isnsb*@bQM?E+W?
z3;Mp6N(50+f0n{M;EuoyTV7P72SiLSt6Vi;?~ENVZZz6WcL6kI0C1-w4^gc)U^az4
zxnPu72g#^%p?}gAl>xzU-Ji$lA!Y3A+k8dqgRKe*bVG}trchG!hP&?F_UVDcnNg?K
zL%o8}(%OJK4E53rFgO!Tv9mqaK7b7ryk!TXT078)uuidejX|}PzRs&xYgIr|BT=qx
zI<WCU;kTOrRu}V5UKG2!Y&3)VtOB;6N29=WidiEBYJY)w?9skpZCN^ZHI{W1nW`YR
z#$Z6UhymUMY3&V-#njp++sQ@N_RYXI(*`*DCj+9yM9d*5-oyH<wYthR1cpV-H_e*z
z;kG@jbE{1phT78Lt8a27a^%C>TMA4!LM_lhG&K;;Y#J1_5PQ|{PRB>`vJ+3OE4%0e
zNg&H8Vt+P8Er&&Jnl1j9S)B!#0%Pu@wr7fU5Cp_)P<D2pXFZ;Kpl03aA`(9xRkbTK
zc3XdK)5YMJtsUq9ObcElzENFJQYf;cgFw?eRgVW?R##BG(Rh;iV&*8`I_u5u<e)8s
zn{>gMX_cDg&0BT|@P-H%*uiKA{8Y1$39N1yf`9fVne_2Zn|p7Z=}i?;M|x~kan4%U
zI)AS#5AxBOYO|56JDqwpW_8U5N6&3u>eOEawLMgOQ*sxW-oQ>DTJ1GBKAp3MB74j1
zY6#d4ToAoi684oseW#&b8+anE9HVCx`|C~3i(K^ki?*S8$pV&jmr~y_AY>0Z!;E?G
nwIbzckL1&N_I`sCN<_<Fz7tqbLkL=V00000NkvXXu0mjf$`*v0

diff --git a/app/assets/img/accept1.png b/app/assets/img/accept1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0e52e964ea66afe848053735198a047fccbc28
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001Tc001Be1^@s6eq;)>00001b5ch_0Itp)
z=>Px&2T4RhR9HvNSkZOcFbo7eLfaKIN1bt!4&h{oCgZrCLo2iyLFzk3$3PGO(*3G`
z>}QGO;Q-u0D)OIxN`&j%+k9RYIlupyp1pf`y`1DbuCJ?{@m-4iS{J$DceHkdixAkC
zpYyX6xyULnJOE%;kqbZoKn1kO?R5J1jSqrp2XE{D1*8j%px&RR!rzsN4Nwtz`TaOG
zFc|}S{XOe^V6XG4nW~%DJbf}q_H-JvRC*c60y+TGY}tiv^X&py1Pl7UmP!OsQGb@g
zJ>ZVO3|n4QqX$GxFRNTNVDF3_Fm5#3O?Lq_WdLxeA`elmHefb|J-J|%SO>|da-q@|
zl>xzU-Ji$lA!Y3A+k8dqgRKe*bVG}trchG!hP&?F_UVDcnNg?KL%o8}(%OJK4E53r
zFgO!Tv9mqaK7b7ryk!TXT078)uuidejX|}PzRs&xYgIr|BT=qxI<WCU;kTOrRu}V5
zUKG2!Y&3)VtOB;6N29=WidiEBYJqv|(Y|19Svq$$mUR`Gsvx$;U_iEr0p0^??G25^
z)Y>N7$wk)o&A>O)1~~dB1ER!4%poY=!}_bWy2>>KhDFRb&6@JzwmqzKt4$n++S1^w
zZ*nAZ<ipxq3QRXbEzm$TH4x5h8Wgk;d)4nw$4BzA6Hl!xyXXT+Aj>FXHbpImMQ)lc
z{+C&u1(*V3?xVJ6iggeK#A{G?cA#fHo_nBX-RU9{KOI%ID>HUme{Ivn;Fzr)=m1O$
zUL?LzT~JaevZI4Q(>qm<2VhoLP`uH2lKEohDBe2j&F<u&ErXkM!I^25n&r(~b_no>
z2p8DFXb1dMvycg_ZWx00CYki{O`Cgfoas#!QAc`gRdLQ**gAi&D-ZI~nQF6<t2>=~
zHD-0q21n0rUh33e1+_g?dsA{3nBKrnA6o4-I6j@Th9Y~*>}m+u4qOnuR}%J>LVc&9
zUK@BKtsJ9g6#MH<&5K<0`-`@rdC3Bnb(d1#Fd$?PI>U^4@U`V=kL1&N_I`sCN<_<F
Xz7tqbLkL=V00000NkvXXu0mjfH{FN9

literal 0
HcmV?d00001

diff --git a/app/components/PlanetComment.vue b/app/components/PlanetComment.vue
index 1e49c81..e10ea56 100644
--- a/app/components/PlanetComment.vue
+++ b/app/components/PlanetComment.vue
@@ -282,7 +282,11 @@ async function handleDel(type: string, item: any) {
 
 // 举报
 const isVisibleReport = ref(false)
-
+const reportParams = ref({
+  publishId: '',
+  communityId: '',
+  tenantId: '',
+})
 async function handleSelect(event: any, type: string, item: any) {
   event.stopPropagation() // 阻止事件冒泡
   if (type === 'choiceness') {
@@ -298,6 +302,9 @@ async function handleSelect(event: any, type: string, item: any) {
     }
   }
   else if (type === 'complaint') {
+    reportParams.value.communityId = item.communityId
+    reportParams.value.publishId = item.id
+    reportParams.value.tenantId = item.tenantId
     isVisibleReport.value = true
   }
   else if (type === 'delete') {
@@ -405,7 +412,7 @@ function handleDownload(url: string) {
                 v-for="(subItem, subIndex) in item.fileName.split(',')"
                 :key="subIndex"
                 title="点击下载"
-                class="text-[#4a5563] text-sm cursor-pointer flex items-center hover:text-[#4a5563]/80"
+                class="text-[#4a5563] text-sm cursor-pointer flex items-center hover:text-[#4a5563]/80 my-1"
                 @click="handleDownload(subItem)"
               >
                 <FileChartColumn size="16" class="mr-1" />
@@ -457,7 +464,8 @@ function handleDownload(url: string) {
           <div class="left-img">
             <img :src="ele.userAvatar">
           </div>
-          <div class="right">
+          <div class="right relative">
+            <!-- <img src="@/assets/img/accept.png" alt="" class="absolute top-0 right-0 w-10 h-10"> -->
             <div class="name">
               {{ ele.userName }}
               <!-- <div v-if="ele.userId === props.detailsInfo.userId" class="author">
@@ -506,7 +514,7 @@ function handleDownload(url: string) {
     <div>
       <PlanetReport
         v-model="isVisibleReport"
-        :publish-list-params="props.publishListParams"
+        :publish-list-params="reportParams"
       />
     </div>
     <!-- <n-modal
diff --git a/app/components/PlanetQuestionComment.vue b/app/components/PlanetQuestionComment.vue
index 54a6f13..f61549c 100644
--- a/app/components/PlanetQuestionComment.vue
+++ b/app/components/PlanetQuestionComment.vue
@@ -263,9 +263,15 @@ async function handlePublish() {
     const res = await request.post('questionComment/comment', params)
     if (res.code === 200) {
       message.success('回答成功！')
-      getCommentList()
-      showQuestionModal.value = false
-      questionContent.value = ''
+      setTimeout(() => {
+        window.location.reload()
+        // getCommentList()
+        // showQuestionModal.value = false
+        // questionContent.value = ''
+      }, 2000)
+      // getCommentList()
+      // showQuestionModal.value = false
+      // questionContent.value = ''
     }
   }
   catch (error) {
@@ -393,7 +399,8 @@ async function handleAccept(item: any, ele: any) {
           <div class="left-img">
             <img :src="ele.avatar">
           </div>
-          <div class="right">
+          <div class="right relative">
+            <!-- <svg t="1745994218359" class="icon absolute top-0 right-0 w-10 h-10" viewBox="0 0 1216 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2626" width="32" height="32"><path d="M106.650156 506.787762l37.914565 1.307233A454.97837 454.97837 0 0 0 371.925008 918.476759a455.054222 455.054222 0 0 0 478.676872-14.443774l20.886821 31.634522A492.980148 492.980148 0 0 1 352.962045 951.321574c-159.625802-92.16-252.59068-263.636701-246.311889-444.533812zM1091.789926 553.260221l-37.861213-2.196086A455.054222 455.054222 0 0 0 827.036119 130.201192 455.035259 455.035259 0 0 0 351.682931 142.491138l-20.620159-31.830909A492.942222 492.942222 0 0 1 845.999082 97.356376a492.961185 492.961185 0 0 1 245.774422 455.894363z" fill="#46D8D3" p-id="2627" /><path d="M201.831734 546.500878l37.866392-2.136441A359.670519 359.670519 0 0 0 419.332415 836.364721c105.671252 60.987429 232.882877 63.882432 340.245238 10.779887l16.802442 34.006057A397.786074 397.786074 0 0 1 400.369453 869.209536a397.596444 397.596444 0 0 1-198.537719-322.708658zM996.949659 499.226753l-37.84185 2.435264A359.879111 359.879111 0 0 0 779.628712 212.31323a359.822222 359.822222 0 0 0-335.780604-12.975676l-16.340572-34.199224A397.748148 397.748148 0 0 1 798.591675 179.468414a397.805037 397.805037 0 0 1 198.357984 319.758339z" fill="#46D8D3" p-id="2628" /><path d="M234.467964 94.633417l-189.62963 328.448153 919.654829 530.962963L1154.122793 625.59638 234.467964 94.633417z m2.540555-42.326297l952.499644 549.925926a18.962963 18.962963 0 0 1 6.940927 25.903889l-208.592593 361.292969a18.962963 18.962963 0 0 1-25.903889 6.940926L9.452964 446.444904a18.962963 18.962963 0 0 1-6.940926-25.903889L211.10463 59.248047a18.962963 18.962963 0 0 1 25.903889-6.940927z" fill="#46D8D3" p-id="2629" /><path d="M221.765188 306.264901m-32.844816-18.962963a37.925926 37.925926 0 1 0 65.689631 37.925926 37.925926 37.925926 0 1 0-65.689631-37.925926Z" fill="#46D8D3" p-id="2630" /><path d="M977.19594 742.413049m-32.844816-18.962963a37.925926 37.925926 0 1 0 65.689631 37.925926 37.925926 37.925926 0 1 0-65.689631-37.925926Z" fill="#46D8D3" p-id="2631" /><path d="M596.690736 421.916581l14.197467 21.072079c-21.301993 14.064727-42.850407 24.308564-64.415328 30.864251l-10.305441-22.503637a238.705778 238.705778 0 0 0 60.523302-29.432693z m-69.983964-34.887331c-0.005107 15.937735-1.4964 32.85673-4.73936 51.216812l-24.205098-6.924133a255.67763 255.67763 0 0 0 4.862571-49.306367l24.081887 5.013688z m-65.722306-30.587553c1.108893 17.194007 0.634428 35.006619-1.387827 52.845269l-25.179382-2.581809a289.754074 289.754074 0 0 0 1.66284-55.445456l24.904369 5.181996z m164.033992 41.365089l-0.043229 24.499171c-49.320321-16.519588-110.833045-45.902943-183.945604-88.114499l5.013688-24.081887c68.054457 39.291259 127.789477 68.567911 178.975145 87.697215z m-232.505231 5.550577l81.84928 47.255703 11.415703-19.772578 21.611889 12.477629-11.415704 19.772579 82.079193 47.388444-12.212148 21.152062-63.456183-36.636445c3.421984 30.178431 17.597837 63.500096 42.987388 100.230476l-26.917095 10.516294c-23.64486-43.999976-35.023627-84.290187-34.003562-121.100548l-0.689741-0.398222-48.848593 84.608244-21.611888-12.477629L462.150358 471.765127c-34.836441 21.57819-76.833222 31.665118-125.760427 30.393525l-0.601414-27.63032c42.558204 4.338584 78.503539-0.045599 107.738831-13.515205l-63.226269-36.503703 12.212148-21.152061z m338.396541 336.693626l-20.46232-11.813926 6.525911-23.515357 18.18922 12.034309c5.058102 2.920296 9.675436 1.294393 13.126696-4.683363l72.874667-126.222625L791.505074 568.726472a571.828148 571.828148 0 0 1-16.926656 22.415309c-0.470042 31.609989-2.10616 58.868124-5.23544 81.27901l-24.278787 2.229871a668.672 668.672 0 0 0 8.465631-59.794755c-17.260719 16.091406-35.917428 27.698218-56.20004 34.687695l-4.334662-24.880886c22.795155-9.217478 43.478543-24.865564 61.917422-46.714343 5.034618-6.596362 10.334717-13.652551 15.670384-21.301309l-29.428954-16.990815-90.130963 156.111408-20.46232-11.813926L732.771059 506.920176l51.270757 29.601185c6.964124-11.00029 14.096556-22.823062 21.397297-35.468316l21.152061 12.212148c-7.300741 12.645254-14.663087 24.335285-21.627211 35.335576l48.741706 28.141037-87.608889 151.743046c-9.159111 15.864046-20.932362 19.796063-35.187012 11.566137z m-79.131491-110.368977l-11.813926 20.46232c-25.930728-3.935255-53.594062-10.71014-83.317089-20.820051l9.09053-22.647777c31.429596 11.40175 60.109758 19.070253 86.040485 23.005508z m53.842719-185.64588l15.949135 19.630992c-26.045092 21.749052-49.267061 38.077349-69.435993 49.117629 8.118115 3.46079 16.006317 6.788838 24.027259 9.886974 8.6872-6.020301 18.002535-12.597602 27.91044-19.139336l15.524875 18.772943c-40.12701 26.494021-71.291809 44.367554-93.397224 53.983254a424.96 424.96 0 0 0 47.632813 10.94703l-10.752 18.623011c-28.530914-4.210267-54.053889-10.975621-76.471753-19.93341l5.039725-22.534097c4.837718 0.647197 9.251177 0.436344 13.603031-0.729732 11.543337-4.064758 28.377243-13.045346 50.368977-26.71185-11.408043-4.134024-23.143172-8.763443-35.108215-13.525602l5.994947-22.595702c4.015236 0.478888 8.826917-0.421706 13.842475-2.737351a521.216 521.216 0 0 0 65.271508-53.054753z" fill="#46D8D3" p-id="2632" /></svg> -->
             <div class="name">
               {{ ele.userName }}
               <!-- <div v-if="ele.userId === props.detailsInfo.userId" class="author">
@@ -409,7 +416,13 @@ async function handleAccept(item: any, ele: any) {
             </div>
             <div class="star-wrap">
               <span class="time">{{ ele.createTime }}</span>
-              <div v-if="ele.isAccept === 0 && item.status === 0 && userStore?.userInfo?.userId === Number(props.publishListParams.tenantId) && ele.userId !== userStore?.userInfo?.userId" class="cursor-pointer m-r16 text-xs flex items-center text-[#3f7ef7] bg-[#ecf1fc] rounded-lg px-2 py-1" @click="handleAccept(item, ele)">
+              <div
+                v-if="ele.isAccept === 0
+                  && item.status === 0
+                  && userStore?.userInfo?.userId === item.userId
+                  && ele.userId !== userStore?.userInfo?.userId"
+                class="cursor-pointer m-r16 text-xs flex items-center text-[#3f7ef7] bg-[#ecf1fc] rounded-lg px-2 py-1" @click="handleAccept(item, ele)"
+              >
                 <CalendarCheck size="16" fill="currentColor" color="#fff" class="mr-1" />
                 <span>采纳</span>
               </div>
diff --git a/app/components/PlanetReport.vue b/app/components/PlanetReport.vue
index 06880af..c8408bf 100644
--- a/app/components/PlanetReport.vue
+++ b/app/components/PlanetReport.vue
@@ -56,12 +56,12 @@ async function onReport() {
   if (reportType.value !== undefined) {
     const params = {
       communityId: props.publishListParams.communityId,
-      content: reportTypeText.value,
+      description: reportTypeText.value,
       reportType: reportType.value,
       publishId: props.publishListParams.publishId,
       tenantId: props.publishListParams.tenantId,
     }
-    const res = await request.post('/report/addReport', params)
+    const res = await request.post('/publish/report', params)
     if (res.code === 200) {
       message.success('举报成功！')
       emit('update:modelValue', false)
diff --git a/app/components/QuestionPublish.vue b/app/components/QuestionPublish.vue
index ed5e392..66879e5 100644
--- a/app/components/QuestionPublish.vue
+++ b/app/components/QuestionPublish.vue
@@ -77,6 +77,7 @@ async function handlePublish() {
       }
       fileList.value = []
       questionUrlList.value = [] // 清空图片URL列表
+      window.location.reload()
       emit('success') // 触发成功事件
     }
   }
diff --git a/app/pages/gold-detail/index.vue b/app/pages/gold-detail/index.vue
index c2a86ed..6af1b69 100644
--- a/app/pages/gold-detail/index.vue
+++ b/app/pages/gold-detail/index.vue
@@ -125,7 +125,7 @@ onMounted(() => {
             </n-infinite-scroll>
           </div>
         </n-tab-pane>
-        <n-tab-pane name="beatles" tab="消费记录">
+        <n-tab-pane name="beatles" tab="收入支出">
           <div class="border border-solid border-gray-200 rounded-lg relative">
             <div class="mc-table flex w-full bg-gray-200 sticky top-0">
               <div class="w-[250px]">
diff --git a/app/pages/planet-detail/index.vue b/app/pages/planet-detail/index.vue
index 515fe32..2249ded 100644
--- a/app/pages/planet-detail/index.vue
+++ b/app/pages/planet-detail/index.vue
@@ -82,7 +82,7 @@ onMounted(() => {
     publishListParams.value = {
       communityId: state.communityId,
       tenantId: state.tenantId,
-      publishId: state.id,
+      publishId: state.publishId,
       type: null,
       pageNum: 1,
       pageSize: 10,
@@ -91,6 +91,7 @@ onMounted(() => {
     questionParams.value = {
       communityId: state.communityId,
       tenantId: state.tenantId,
+      publishId: state.publishId,
       pageNum: 1,
       pageSize: 10,
     }
@@ -100,7 +101,7 @@ onMounted(() => {
     publishListParams.value = {
       communityId: route.query.communityId as string,
       tenantId: route.query.tenantId as string,
-      publishId: route.query.id as string,
+      publishId: route.query.publishId as string,
       type: null,
       pageNum: 1,
       pageSize: 10,