From 087a5a70a3961209d504f2004c5d41b1b997a215 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 18 Mar 2021 17:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=201.6.29=20=E8=A7=A3?= =?UTF-8?q?=E7=A0=81=E9=94=A6=E6=B0=B4=E6=A8=A1=E5=9D=97=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E8=AF=84=E8=AE=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- pages/toRegister/toRegister.js | 2 +- .../associationNew/pages/addTopic/addTopic.js | 9 +- .../discussion/pages/addIssue/addIssue.js | 2 +- .../pages/remarkOrReply/remarkOrReply.js | 2 +- .../images/ic_baidataidubianji@2x.png | Bin 0 -> 2380 bytes .../oneKeyService/images/ic_dangbiaoqian.png | Bin 0 -> 1426 bytes subpages/oneKeyService/images/ic_fandu@2x.png | Bin 0 -> 2042 bytes .../images/ic_fanduihuise@2x.png | Bin 0 -> 2187 bytes subpages/oneKeyService/images/ic_huifu@2x.png | Bin 0 -> 2285 bytes .../oneKeyService/images/ic_qiehuan@2x.png | Bin 0 -> 1362 bytes subpages/oneKeyService/images/ic_zhici@2x.png | Bin 0 -> 2000 bytes .../oneKeyService/images/ic_zhicihuise@2x.png | Bin 0 -> 2154 bytes subpages/oneKeyService/pages/index/index.js | 4 +- subpages/oneKeyService/pages/index/index.wxml | 1 + .../pages/moduleList/moduleList.js | 6 +- .../components/detailRemark/detailRemark.js | 46 ++++ .../components/detailRemark/detailRemark.json | 3 + .../components/detailRemark/detailRemark.wxml | 57 +++++ .../components/detailRemark/detailRemark.wxss | 168 +++++++++++++ .../pages/noticeDetail/noticeDetail.js | 222 +++++++++++++++++- .../pages/noticeDetail/noticeDetail.json | 6 +- .../pages/noticeDetail/noticeDetail.wxml | 35 +++ .../pages/noticeDetail/noticeDetail.wxss | 60 ++++- .../pages/remarkOrReply/remarkOrReply.js | 108 +++++++++ .../pages/remarkOrReply/remarkOrReply.json | 3 + .../pages/remarkOrReply/remarkOrReply.wxml | 20 ++ .../pages/remarkOrReply/remarkOrReply.wxss | 76 ++++++ subpages/oneKeyService/utils/common.js | 10 + utils/understandJs.js | 30 ++- 30 files changed, 849 insertions(+), 24 deletions(-) create mode 100644 subpages/oneKeyService/images/ic_baidataidubianji@2x.png create mode 100644 subpages/oneKeyService/images/ic_dangbiaoqian.png create mode 100644 subpages/oneKeyService/images/ic_fandu@2x.png create mode 100644 subpages/oneKeyService/images/ic_fanduihuise@2x.png create mode 100644 subpages/oneKeyService/images/ic_huifu@2x.png create mode 100644 subpages/oneKeyService/images/ic_qiehuan@2x.png create mode 100644 subpages/oneKeyService/images/ic_zhici@2x.png create mode 100644 subpages/oneKeyService/images/ic_zhicihuise@2x.png create mode 100644 subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.js create mode 100644 subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.json create mode 100644 subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml create mode 100644 subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxss create mode 100644 subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.js create mode 100644 subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.json create mode 100644 subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxml create mode 100644 subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxss create mode 100644 subpages/oneKeyService/utils/common.js diff --git a/app.json b/app.json index 47a2295..13468fa 100644 --- a/app.json +++ b/app.json @@ -146,7 +146,8 @@ "pages/reportIssueDetail/reportIssueDetail", "pages/suggestDict/suggestDict", "pages/suggestDictList/suggestDictList", - "pages/suggestDetail/suggestDetail" + "pages/suggestDetail/suggestDetail", + "pages/remarkOrReply/remarkOrReply" ] } ], diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index f68aea3..05123bd 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.28" + const versionNum = "1.6.29" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/associationNew/pages/addTopic/addTopic.js b/subpages/associationNew/pages/addTopic/addTopic.js index 8b94139..2919814 100644 --- a/subpages/associationNew/pages/addTopic/addTopic.js +++ b/subpages/associationNew/pages/addTopic/addTopic.js @@ -47,7 +47,7 @@ Page({ // 话题内容框 值双向绑定 bindTopicValue (e) { this.setData({ - topicValue: e.detail.value + topicValue: e.detail.value.trim(' ') }) console.log(this.data.topicValue) }, @@ -275,6 +275,13 @@ Page({ this.data.imageList.forEach(item => { imagesList.push(item.ossUrl) }) + } else { + wx.showToast({ + title: '请上传图片', + icon: 'none', + duration: 2000 + }) + return false } const para = { topicType:this.data.topicType,//话题类型：0:事好儿鼓个掌 1:话对捧个场 diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js index 4d158a6..2b0327a 100644 --- a/subpages/discussion/pages/addIssue/addIssue.js +++ b/subpages/discussion/pages/addIssue/addIssue.js @@ -34,7 +34,7 @@ Page({ // 双向绑定 内容输入框 bindTextareaInput (e) { this.setData({ - issueContent: e.detail.value + issueContent: e.detail.value.trim(' ') }) }, // 双向绑定 地址输入框 diff --git a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js index 41a1f5c..ca4a2c8 100644 --- a/subpages/discussion/pages/remarkOrReply/remarkOrReply.js +++ b/subpages/discussion/pages/remarkOrReply/remarkOrReply.js @@ -35,7 +35,7 @@ Page({ // textarea 双向绑定 bindTextareaValue (e) { this.setData({ - textareaValue: e.detail.value + textareaValue: e.detail.value.trim(' ') }) }, remarkOrReply () { diff --git a/subpages/oneKeyService/images/ic_baidataidubianji@2x.png b/subpages/oneKeyService/images/ic_baidataidubianji@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..517244a3f04ce3c3894cc50071153f67e9719d28 GIT binary patch literal 2380 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 literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/images/ic_dangbiaoqian.png b/subpages/oneKeyService/images/ic_dangbiaoqian.png new file mode 100644 index 0000000000000000000000000000000000000000..4103137f56cdbee267679cf192cacb37a86e2283 GIT binary patch literal 1426 zcmY+Cdr%Wc9LFyY67#r6Lc(1x1fd0s2x?JKw4;Lx7^{>5TBzbEDri#`A4Th{Dn16$ zL2Vt7wiXoY3#qnNd@-m{tTc+14k1{^8AWt>jetZ+Zg;yE{_4%%-fw^V`+a`j-`?gY zB_@z+UQG}LX`MYQ8GkwP9U;TBdLaz1C5Y8ApB^-*hgdBbO9Ga5@uXlPVI=t!Cq|NQc^&5T>U22XW6}y{ zsz)!1@t7DlOJTChtU`J{;;4R_@bDC(v1|&H5vN5KwWyQRid8rYVW~WWj7GeLm3X@t zmO;7w#d8=Ij8g=bMt&NPS>xeJV4_8xCc1_odh~j?n20^NG>rl|B@C?ULAdDK|w76e54r7@iRwL@UAO}I-M9kzwo#OdVB;Ob{Zm~28M$&?T z!A3tx4xhZ6SBsJ`kfYIE8LE?_JJR7=*bk2>&~+I)FGm$})G7hi4IjRJ(PBe}(azr?<{AKi3)y%RJJwEZ4DtjqkBDrxg7H zUw;FzH?69_`mV4W448rryQ{F^0@eymuU_1LlYAKM*5a=z(j+XTB~VpLaB zN7nN8l9<2i&MwYRk8ZqTQy22Ji!8FihA3O}ml-vy>-Rj|m$?e1R+scfrI zR2A9REMLYdOMZ_J-L)$yrF=`<<)$K+C2hx`y{}$Pm8SdKf|qezWPd@kW!jd`{)>NX z$gOJb|1~eiWYk zo6q)5y&f+KDL$PZ`>&s|J~GZ4lrYw&o2twS+%RQ-Mf&@vica@ z9dms4i&w$v8H&VF^B2Y{Cg%(+c)cz=^R|4hbjpbUZOhJaHO1@#)$~tSFRjp*={vXm q&=NdZcCGf?dN{$Ox1!z zLqVW{paDSwgy2v!wnC&T1vDZIkXoq$|Ah#<_jJzLySOaL-t0nd!ugP$+0A|5_j%8G zpZA>ST+t@31ilT-1#SkuhM*{?fDAAI7z~_5*b8hW!)BSuQB{N;TuGV<2$O(uz-WYl z*l&>bvChZT=TG@qZ~&o!(=_lZN91>eg+q&Od877>W2IK>hji1yqSdfRw{18xht5Z_9K(I~PzBRVX(T z@D$4RF`Ic9VKu^YGL5~um64=)0C*S}0}KT!&c`7!&zi^oNk~1gL1y>{pJk%knd*Rq zCsD461*EJY#bTP+&or(_c@lB&T39Aw9|1d1YWN>7OSK=3GbXx?X(*Er9s{l|vLXwe z_kh)e)R5u;$}Ql}EdVY_0*wbUyo0cqQ!JBNe0VmXMrIH&31wjnAR~x(9Z-s8guD+- zMtKyN=VX$coj_TNvV?Z_<$FoAiP;`_Mf%5fOK(K}kOSzL)wlM+amk2*g7?4qTGqx7kC^P*i zxY-$+k5UCZ2wYtfpeAl|K=9Lq0oncYF2V+cl`@^3`5rRbod~|mS6w84j2Mms+fWwC z9c;-5^iTxIm}>Mz0?3wW7r%Mt89Jzwd+5l9TqBPVG7(`uFe(<1k%BRdouORFY2qQ5 zTjoJv3Bn2j4#{-V2IyDdXW=K{d0jlq^&dd(2!A7F1)a1ohm)e4c?vwaG`1TN3&@xy z2WT@l5%dWuPK5+0f^yPj0!Ed7A>X&pc!`g^44@ zY9V{jLe45ft5|C=Kn+YF(c;l5kJcf^W5^H6hiel9QK9s4OnUAZ(;sF5GDU)P`U zP|_uMS4;ieHe7Ur-!0#aj{1>a~y!V)}6wRJMa)-wA?= zdwWotImuhzjTp*!LLNf-Ia0JZEC$m`fHs8pQUB~Dq=J9}K7V&&zvh7!{)@5`<)8to z@{U7>VFUz(g#I^6142M5`uvPEZ4BfHuW`bEpUg-yu8q$}xHU%C>kiZ@loo_nfZfr? zr4TBjdAsgj*ebJa7PI5NA#mK3(+Z9ea0LO!5Uwa_f7o|sLkSs7hTF+Vv};;RihGoiV7~>pNYxT@XNi+}3kBp*PI#kMs!>TzcxMHk7RhOXOY;y|V3s z0di1l8BQfr3BA2J1Bzgvq|tgMfp$NIM+ z&l0jq=AGU1DFs;kM5T-t{jb(>H7Vvr7p_&p!+J1`UGR&jV7bh}D$ug5cL4pFN=7gq z;cmp!A}jIZ=K2ujF9wJX_DZ!U!zEkXBqa}+dqCH7iIar#I54XRxt>*>%SrJ(6}%~T zxtde5^%@{QPxXu@yYrD>pzZ zyw~$FZ^)ybd6#Ux>Y+0P@gn2M@HoPKQB$p}(!gG*SVF)uhOyV0S0$tA0hN|B<~h&k zI>wN8`nC+hS~p$2bz-mGm@K_q=5n~)iIeeAEmx6pQm`)Jl<1wH{56|uvm514bg)Jq zE|1}Cz+?a!eW$q#ypKCIN{8|R9rf47GStWdc9iR#;M1&07*qoM6N<$f?A2b2mk;8 literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/images/ic_fanduihuise@2x.png b/subpages/oneKeyService/images/ic_fanduihuise@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ba6fd9b7dbb34d836ec7669b356de6b49b3d8a GIT binary patch literal 2187 zcmV;62z2*}P) z=;)XlhT$xda{;6Q+zViwej^#iZQ%w=5ok7)msTxn(x3^6Eeoeu!K7Ddsz zvuDp9s;jG;@4a71av6XLRRYpD4ggr~yMeQ54N}&OKWONax{wZ8_)M z`V%Kkbk)_>eaXyz2;kcQWK616&H;ECz*^^AXa7}V5Clu2D4Iu7+eYW$dPP770c=hr z5--n~G2>tm1TALvEP&+z?yeRMfD(XhBsY-!dn%PW)7Llm@87@FdoQ3L0QgKLK>2)r zmUHe$0KQjcAQ^|RPXV~U5}-n%Fq@=+zFTD=-9Os?Zf+bR zymz1~ytZEb7y<&x554zmNxpjO)TzUZ7cUNVhJI{jvjKby zz|^q>1VGm9cLFMvN_*$bnR7`%&zspS080T(9%DfA<+hV-O(YWU6bglNEEEbq1CRx< z1i+**2BdSdo8<2S{IOIj9oGu|!pt%N7L~c}uen%nu~E?6>ptoP@CTXi3l}aN)C&DF zj$;-8m^j8(Nap*bnZ4WodER|MzXdQOK1bum;Fi;nKb9;&a*tMM zQw-GDPYW1~>vmotMX_%J*e9SZG0?O!dcf@r^dA6!BbgV_HUL_kF92|3bj#_2m7^L6 zXa~s$%vriJZ~vLodS9rfW(oZVj*!xBtMYqlSm}iDFnZT5$nKtSHLIX@qGa) zl-2pUXNc9&PpTy4a_1^c1B%dxbA*24Y;v)rk$I3*i{ReVbx}5iZO|e)!*woY{8B0Lbmazt#99g>m zZ#k0nW+vrRR&JmGuJ2?lWJx+nZi}L5>zOlWK8|&{m9ZYtr)O8X5^^vlOR0T*s(~{ zc@Y2?y!RhD=Z-ctH3<$K9UW7mD0&!x^oR$`=z7o$z-O4Vfdi(O8~wSTg#y?=z(C}BqhFYan9{bCX+{MYHEhM53khk8(VE{ZPe7% zr2LT|R>g9MLTMEM3rQ|Dvq#EE$^)B|OSM-(X4aa`W;N3zE;j{8y%&qcd%C;3=ac-7 znMt3J;4-Y0iqFnlX0|qy$!P11xZE_L_)Jae>FLp#QhM{z3eJ?G&VQ18sZ=U$?Gp`0 zLUmJtG=N+#H`zJ&5XooE?6EkkA5K3V0ABLmZyK2MsRV2|9aYj^@3XmF?tbT-E?fO6 z60RLaBT7QA03g|H1;*+jz}tZTduE@B!3e{(S~BN*s*;1 zav6(?OSw)eZm_RHTU*1+CFPqKEd#<>QDo|Hf*ZA}2&p+gxTjst0dKo8J zKze0hVbP}%-U|t71GEB)!5j$nB-4m z*XVj)`5C1}y!Wq8oH+5lhK2??sTG$|U7^0wrbCP z-J#@F#Wce(r6XzcnmV~$u7RY?w;WidZU%en^+#+C0+pqXw%26r1nIz4uR$l&?21%W+JvjCt=RzPvl4rHLz5 z1*pBfy*>=XCGy1M#M)I^4w8TI-oKJeCU-P8HY$1@aj6PW5CnId*}^yol-HnayMjbr zo`uSz=26&7`AxtA5((Od*7p1K1uHG>FL>%&1NN#-00hn_#fUNHvLHABd7oX N002ovPDHLkV1fhz9%%po literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/images/ic_huifu@2x.png b/subpages/oneKeyService/images/ic_huifu@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..634a735f6a46085d3988208171b0c6f42fd96514 GIT binary patch literal 2285 zcmV+P) zb;=076bn*Yv7sQ5Ktf)2H!lQ=h>DG1WkA>`yL(UP7oRxGvdKQ#-Gtnk%w&@1-g|!c z+;h(FoO1;WXsD|6_V&7tCt zNd3gbM7xMQ2jD3HD*!Am0Vb!a<08^6BKtkhJG6fN`paQJFDSr0Jw3}7FJ8RWTKj7N zKMnzaAm0M;QX~>N9R~D51H8oZyp6_~p9A=5py6`3M*zI3st4-p>$_L4UY(g~!h!bLu0GRxCn(+mImsRz}mX?-25wX*Kct

s%CI-u+eqh##}CE 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 Ug@0mP!2kdN07*qoM6N<$f*Uz*4FCWD literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/images/ic_zhici@2x.png b/subpages/oneKeyService/images/ic_zhici@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5c08e19a5d2c9c704c4042fca811ac6acdbaf9c5 GIT binary patch literal 2000 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 literal 0 HcmV?d00001 diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index 59773d0..c661c43 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -88,7 +88,7 @@ Page({ goDetails(e) {//模块编码（政策，通知，档案，警事，一键直通） if (e.currentTarget.dataset.modulestyle == '4') { wx.navigateTo({ - url: `../noticeDetail/noticeDetail?pid=${e.currentTarget.dataset.pid}&bannerflag=${e.currentTarget.dataset.bannerflag}&categorycode=${e.currentTarget.dataset.categorycode}&modulestyle=${e.currentTarget.dataset.modulestyle}&categoryname=${e.currentTarget.dataset.categoryname}` + url: `../noticeDetail/noticeDetail?pid=${e.currentTarget.dataset.pid}&bannerflag=${e.currentTarget.dataset.bannerflag}&categorycode=${e.currentTarget.dataset.categorycode}&modulestyle=${e.currentTarget.dataset.modulestyle}&categoryname=${e.currentTarget.dataset.categoryname}&commentFlag=${e.currentTarget.dataset.commentflag}` }) } else { if (e.currentTarget.dataset.categorycode == 'module_hardcore') { @@ -101,7 +101,7 @@ Page({ }) } else { wx.navigateTo({ - url: `../moduleList/moduleList?pid=${e.currentTarget.dataset.pid}&bannerflag=${e.currentTarget.dataset.bannerflag}&categorycode=${e.currentTarget.dataset.categorycode}&modulestyle=${e.currentTarget.dataset.modulestyle}&categoryname=${e.currentTarget.dataset.categoryname}` + url: `../moduleList/moduleList?pid=${e.currentTarget.dataset.pid}&bannerflag=${e.currentTarget.dataset.bannerflag}&categorycode=${e.currentTarget.dataset.categorycode}&modulestyle=${e.currentTarget.dataset.modulestyle}&categoryname=${e.currentTarget.dataset.categoryname}&commentFlag=${e.currentTarget.dataset.commentflag}` }) } } diff --git a/subpages/oneKeyService/pages/index/index.wxml b/subpages/oneKeyService/pages/index/index.wxml index 57ed1d8..b512860 100644 --- a/subpages/oneKeyService/pages/index/index.wxml +++ b/subpages/oneKeyService/pages/index/index.wxml @@ -6,6 +6,7 @@ wx:for-index="index" wx:for="{{modulelist}}" data-pid="{{item.id}}" + data-commentFlag="{{item.commentFlag}}" data-bannerFlag="{{item.bannerFlag}}" data-categoryCode="{{item.categoryCode}}" data-moduleStyle="{{item.moduleStyle}}" diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js index 77e6d01..67c0b4a 100644 --- a/subpages/oneKeyService/pages/moduleList/moduleList.js +++ b/subpages/oneKeyService/pages/moduleList/moduleList.js @@ -299,12 +299,12 @@ Page({ const info = e.currentTarget.dataset.info if (info.moduleStyle == '4') { wx.navigateTo({ - url: `../noticeDetail/noticeDetail?pid=${info.pid}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}` + url: `../noticeDetail/noticeDetail?pid=${info.pid}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}` }) } else { wx.navigateTo({ - url: `./moduleList?pid=${info.id}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}` + url: `./moduleList?pid=${info.id}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}` }) } }, @@ -313,7 +313,7 @@ Page({ toDetail(e){ const info = e.currentTarget.dataset wx.navigateTo({ - url: `../noticeDetail/noticeDetail?id=${info.id}&title=${this.data.moduleInfo.categoryname}` + url: `../noticeDetail/noticeDetail?id=${info.id}&title=${this.data.moduleInfo.categoryname}&commentFlag=${this.data.moduleInfo.commentFlag}` }) }, diff --git a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.js b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.js new file mode 100644 index 0000000..9d56bc3 --- /dev/null +++ b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.js @@ -0,0 +1,46 @@ +Component({ + data: { + support: "../../../../images/ic_zhicihuise@2x.png", + supported: "../../../../images/ic_zhici@2x.png", + dispport: "../../../../images/ic_fanduihuise@2x.png", + dispported: "../../../../images/ic_fandu@2x.png" + }, + properties: { + remarkObj: { + type: Object, + value: {} + }, + remarkType: { + type: String, + value: "new" + } + }, + lifetimes: { + + }, + pageLifetimes: { + + }, + methods: { + // 对评论进行回复 + replyRemark (e) { + this.triggerEvent("replyRemark", { commentId: e.currentTarget.dataset.commentid }) + }, + // 支持评论 + supportRemark (e) { + this.triggerEvent("supportRemark", { commentId: e.currentTarget.dataset.commentid }) + }, + // 反对 评论 + dispportRemark (e) { + this.triggerEvent("dispportRemark", { commentId: e.currentTarget.dataset.commentid }) + }, + // 最新最热 切换 + changeRemarkType () { + if (this.data.remarkType === "new") { + this.triggerEvent("changeRemarkType", { type: "hot"}) + } else { + this.triggerEvent("changeRemarkType", { type: "new"}) + } + } + } +}) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.json b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml new file mode 100644 index 0000000..114f2a5 --- /dev/null +++ b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml @@ -0,0 +1,57 @@ + + + + + 评论 + 表达态度{{remarkObj.statementNum}}次 + + + + + 最新 + + + + + 最热 + + + + + + + + + {{item.content}} + {{item.replyComment.userName}}：{{item.replyComment.content}} + + + + 支持 {{item.approveNum}} + + + + 不支持 {{item.opposeNum}} + + + + 回复 + + + + + \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxss b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxss new file mode 100644 index 0000000..35920c8 --- /dev/null +++ b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxss @@ -0,0 +1,168 @@ +.detail-remark { + width: 100%; +} +.title { + width: 100%; + height: 80rpx; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding-right: 25rpx; +} +.title .left { + display: flex; + align-items: flex-end; +} +.title .left .remark-title { + font-size: 32rpx; + color: #333; + font-weight: bolder; + margin-right: 11rpx; +} +.title .left .remark-altitude { + font-size: 24rpx; + color: #999; +} +.title .right { + height: 80rpx; + width: 110rpx; + perspective: 1000; + transform-style: preserve-3d; +} +.title .right .flip { + position: relative; + transition: 0.6s; + transform-style: preserve-3d; + width: 100%; + height: 100%; +} +.title .right .flip.reverse { + transform: rotateY(180deg); +} +.title .right .flip .front, .title .right .flip .back { + display: flex; + align-items: center; + justify-content: flex-end; + position:absolute; + top: 0px; + left: 0px; + height: 100%; + width: 100%; +} +.title .right .flip .front { + z-index: 2; + background: #f7f7f7; +} +.title .right .flip .back { + transform: rotateY(-180deg); + background: #f7f7f7; +} +.title .right .latest { + font-size: 28rpx; + color: #333; + height: 80rpx; + line-height: 80rpx; +} +.title .right .latest-image { + width: 28rpx; + height: 23rpx; + object-fit: cover; + margin: 0 10rpx 0 10rpx; +} + +.remark-list { + width: 100%; +} +.remark-list .remark-list-item { + width: 100%; + box-sizing: border-box; + border-radius: 16rpx; + background: #fff; + padding: 37rpx 25rpx 0; + overflow: hidden; +} +.remark-list .remark-list-item + .remark-list-item { + margin-top: 20rpx; +} +.remark-list-item .user-info { + width: 100%; + height: 64rpx; + display: flex; + align-items: center; +} +.remark-list-item .user-info .avatar { + width: 64rpx; + height: 64rpx; + border-radius: 8rpx; + margin-right: 13rpx; +} +.remark-list-item .user-info .right { + display: flex; + flex-direction: column; + justify-content: space-between; +} +.remark-list-item .user-info .right .identify { + display: flex; + align-items: center; +} +.remark-list-item .user-info .right .nickname { + font-size: 28rpx; + color: #333; +} +.remark-list-item .user-info .right .party-flag { + width: 27rpx; + height: 27rpx; + object-fit: cover; + margin-left: 6rpx; +} +.remark-list-item .user-info .right .time { + font-size: 20rpx; + color: #999; +} +.remark-list-item .remark-content { + margin-top: 28rpx; + margin-bottom: 24rpx; + font-size: 36rpx; + color: #333; +} +.remark-list-item .remarked-content { + width: 100%; + height: 88rpx; + border-radius: 16rpx; + background: #f2f2f2; + box-sizing: border-box; + padding: 0 20rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 30rpx; + color: #999; + line-height: 88rpx; + margin-bottom: 25rpx; +} +.remark-list-item .operation { + width: 100%; + height: 85rpx; + display: flex; + align-items: center; + justify-content: space-around; + border-top: 1rpx solid #eaeaea; +} +.remark-list-item .operation .type { + flex: 1; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} +.remark-list-item .operation .type image { + width: 28rpx; + height: 28rpx; + object-fit: cover; +} +.remark-list-item .operation .type view { + font-size: 24rpx; + color: #A7A7A7; + margin-left: 15rpx; +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index 02ddf23..93d1bad 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -1,5 +1,7 @@ const api = require('../../../../utils/understandJs') +const app = getApp() import util from '../../../../utils/util' +import { formatTimestamp } from "../../utils/common" Page({ /** @@ -8,8 +10,6 @@ Page({ data: { noticeObj: {}, noticeObjContent: "", - pageIndex:1, - pageSize:10, categoryName:'', preloadVisible: true, isNeedBanner: false, @@ -21,19 +21,46 @@ Page({ duration: 500, //幻灯片切换时长(ms) currentSwiper: 0, nodata: false, - showTitle: true + showTitle: true, + noticeId: '', + infoCompleted: 0, // 当前用户是否完善信息 + completeInfoDialogVisible: false, // 完善信息弹窗 + commentFlag: '0', //是否显示评论列表 + remarkType: "new", // 评论 最新最热类型 + pageIndex:1, + pageSize:10, + remarkObj: { // 评论列表 + statementNum: 0, + commentsList: [] + }, + supportTimer: "", // 点赞 支持的计时器 + dispportTimer: "", // 点踩 反对的计时器 + dialogVisible: false, // 提示信息探矿所需入参 + dialogTitle: "", + dialogContent: "", + dialogConformText: "", + dialogCancelText: "", + loadMoreVisible: false, // loadMoreVisible 和 loadMoreType 控制 超出一屏时的 加载和没有更多的显示与隐藏 + loadMoreType: "none", }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - console.log(options) + this.setData({ + infoCompleted: app.globalData.infoCompleted, + commentFlag: options.commentFlag + }) if (options.id) { wx.setNavigationBarTitle({ title: options.title }) + this.setData({ + noticeId: options.id + }) this.noticeDetail(options.id) + this.getRemarkList() } else { this.setData({ categoryName:options.categorycode @@ -99,8 +126,8 @@ Page({ noticelist () { let that = this; let params = { - pageIndex: that.data.pageIndex, - pageSize: that.data.pageSize, + pageIndex: 1, + pageSize: 10, noticeCategory: that.data.categoryName } api.noticelist(params).then(function (res) { @@ -110,9 +137,11 @@ Page({ }) } else { that.setData({ - nodata: false + nodata: false, + noticeId: res.data[0].id }) that.noticeDetail(res.data[0].id) + that.getRemarkList() } }).catch(err => { console.log(err) @@ -130,6 +159,171 @@ Page({ console.log(err) }) }, + + // 最新最热 评论列表切换 + changeRemarkType (e) { + this.setData({ + remarkType: e.detail.type, + loadMoreVisible: false + }) + this.getRemarkList() + }, + // 获取评论列表 下拉刷新 + getRemarkList () { + if (this.data.commentFlag != '1') { + return false + } + this.setData({ + pageIndex: 1, + pageSize: 10 + }) + const para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + timestamp: formatTimestamp(), + orderType: this.data.remarkType === "new" ? 0 : 1, + noticeId: this.data.noticeId, + } + api.getCommentList(para).then(res => { + console.log("评论列表", res) + this.setData({ + remarkObj: { + statementNum: res.data.statementNum, + commentsList: [...res.data.commentsList] + }, + loadMoreType: res.data.commentsList.length === 10 ? "loading" : "none" + }) + }).catch(err => { + console.log(err) + }) + }, + // 获取评论列表 上拉加载 + loadMoreGetRemarkList () { + const para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + timestamp: formatTimestamp(), + orderType: this.data.remarkType === "new" ? 0 : 1, + noticeId: this.data.noticeId, + } + api.getCommentList(para).then(res => { + console.log("评论列表", res) + this.setData({ + remarkObj: { + statementNum: res.data.statementNum, + commentsList: [...this.data.remarkObj.commentsList, ...res.data.commentsList] + }, + loadMoreType: res.data.commentsList.length === 10 ? "loading" : "none" + }) + }).catch(err => { + console.log(err) + }) + }, + debounceSupportRemark (e) { + clearTimeout(this.data.supportTimer) + this.data.supportTimer = setTimeout(() => { + this.supportRemark(e) + }, 300) + }, + // 评论 支持 点赞 + supportRemark (e) { + if (this.verifyCompleteInfo()) { + return false + } + const hasAttitude = this.data.remarkObj.commentsList.some(item => item.commentId === e.detail.commentId && (item.userLike || item.userDislike)) + if (hasAttitude) { + this.setData({ + dialogConformText: "知道了", + dialogContent: ["已表达过态度，不可以更改哦！"], + dialogTitle: "已表态", + dialogVisible: !this.data.dialogVisible + }) + return false + } + const index = this.data.remarkObj.commentsList.findIndex(item => item.commentId === e.detail.commentId) + this.setData({ + [`remarkObj.commentsList[${index}].userLike`]: true, + [`remarkObj.commentsList[${index}].approveNum`]: parseInt(this.data.remarkObj.commentsList[index].approveNum) + 1, + ["remarkObj.statementNum"]: parseInt(this.data.remarkObj.statementNum) + 1 + }) + const para = { + attitude: "0", + commentId: e.detail.commentId, + noticeId: this.data.noticeId + } + api.commentSupport(para).then(res => { + console.log('评论支持', res) + }).catch(err => { + console.log(err) + }) + }, + debounceDispportRemark (e) { + clearTimeout(this.data.dispportTimer) + this.data.dispportTimer = setTimeout(() => { + this.dispportRemark(e) + }, 300) + }, + // 评论 不支持 点踩 + dispportRemark (e) { + if (this.verifyCompleteInfo()) { + return false + } + const hasAttitude = this.data.remarkObj.commentsList.some(item => item.commentId === e.detail.commentId && (item.userLike || item.userDislike)) + if (hasAttitude) { + this.setData({ + dialogConformText: "知道了", + dialogContent: ["已表达过态度，不可以更改哦！"], + dialogTitle: "已表态", + dialogVisible: !this.data.dialogVisible + }) + return false + } + const index = this.data.remarkObj.commentsList.findIndex(item => item.commentId === e.detail.commentId) + this.setData({ + [`remarkObj.commentsList[${index}].userDislike`]: true, + [`remarkObj.commentsList[${index}].opposeNum`]: parseInt(this.data.remarkObj.commentsList[index].opposeNum) + 1, + ["remarkObj.statementNum"]: parseInt(this.data.remarkObj.statementNum) + 1 + }) + const para = { + attitude: "1", + commentId: e.detail.commentId, + noticeId: this.data.noticeId + } + api.commentOpposition(para).then(res => { + console.log('评论不支持', res) + }).catch(err => { + console.log(err) + }) + }, + // 进行评论 + navigateToReply () { + if (this.verifyCompleteInfo()) { + return false + } + wx.navigateTo({ + url: `../remarkOrReply/remarkOrReply?noticeId=${this.data.noticeId}&faCommentId=` + }) + }, + // 评论 回复 回调 + replyRemark (e) { + if (this.verifyCompleteInfo()) { + return false + } + wx.navigateTo({ + url: `../remarkOrReply/remarkOrReply?noticeId=${this.data.noticeId}&faCommentId=${e.detail.commentId}` + }) + }, + // 检查 是否完善信息 + verifyCompleteInfo () { + if (this.data.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return true + } else { + return false + } + }, /** * 生命周期函数--监听页面初次渲染完成 @@ -170,13 +364,21 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === "loading") { + this.setData({ + pageIndex: this.data.pageIndex + 1 + }) + this.loadMoreGetRemarkList() + } }, /** * 用户点击右上角分享 */ - onShareAppMessage: function () { + // onShareAppMessage: function () { - } + // } }) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json index a93c426..f457eb5 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json @@ -1,7 +1,11 @@ { "usingComponents": { "no-data": "../../../../components/nodata/nodata", - "parser": "../../../../components/parser/parser" + "parser": "../../../../components/parser/parser", + "completeInfo-dialog": "../../../../components/completeInfoDialog/completeInfoDialog", + "detail-remark": "./components/detailRemark/detailRemark", + "load-more": "../../../../components/loadMore/loadMore", + "tip-dialog": "../../compontents/notice/notice" }, "navigationBarTitleText": "" } \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml index d89615b..910df50 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml @@ -51,6 +51,41 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss index 62380f9..306e135 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxss @@ -3,10 +3,10 @@ page{ } .notice-detail { width: 100%; - height: 100%; box-sizing: border-box; padding: 20rpx; background: #f7f7f7; + margin-bottom: 80rpx; } .richContent img{ width: 100%!important; @@ -19,6 +19,7 @@ page{ border-radius: 16rpx; box-sizing: border-box; padding: 0 25rpx 38rpx; + margin-bottom: 40rpx; } .detail-title { font-family: PingFang-SC-Bold; @@ -264,4 +265,59 @@ swiper { position: absolute; top: 0; } -/* 轮播图end */ \ No newline at end of file +/* 轮播图end */ + +/* 评论 start */ +.bottom { + width: 100%; + height: 90rpx; + background: #fff; + padding: 15rpx; + box-sizing: border-box; + display: flex; + align-items: center; + position: fixed; + bottom: 0; + left: 0; +} +.reply { + width: 490rpx; + height: 70rpx; + border-radius: 8rpx; + background: #F2F2F2; + display: flex; + align-items: center; +} +.reply image { + width: 30rpx; + height: 30rpx; + margin: 0 10rpx 0 25rpx; +} +.reply input { + height: 100%; + width: calc(100% - 65rpx); + font-size: 26rpx; +} +.reply .placeholder-input { + font-size: 26rpx; + color: #a8a8a8; +} +button { + width: 200rpx; + height: 70rpx; + border-radius: 35rpx; + background: linear-gradient(to right, #FFAC00, #FFBF00); + color: #fff; + font-size: 30rpx; + line-height: 70rpx; + text-align:center; + padding: 0; + outline: 0; +} +button::after { + border:0; +} +.hover-button { + background: orange; +} +/* 评论 end */ \ No newline at end of file diff --git a/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.js b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.js new file mode 100644 index 0000000..ba43ea0 --- /dev/null +++ b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.js @@ -0,0 +1,108 @@ +const api = require('../../../../utils/understandJs') + +Page({ + data: { + textareaValue: "", + faCommentId: "", + noticeId: "", + violationsCount: 0, //违规次数 + isConReview: false, + lock: false, //锁定提交状态，防止双击 + }, + onLoad (options) { + this.setData({ + noticeId: options.noticeId, + faCommentId: options.faCommentId + }) + }, + // textarea 双向绑定 + bindTextareaValue (e) { + this.setData({ + textareaValue: e.detail.value.trim(' ') + }) + }, + remarkOrReply () { + if (!this.data.textareaValue) { + wx.showToast({ + title: "请输入评论内容", + icon: "none" + }) + return false + } + if (this.data.lock) { + return false + } + this.setData({ + lock: true + }) + const para = { + noticeId: this.data.noticeId, + faCommentId: this.data.faCommentId, + content: this.data.textareaValue, + // isConReview: this.data.isConReview + } + wx.showLoading({ + title: "提交中..." + }) + let that = this + if (this.data.faCommentId) { //评论 回复 回调 + api.commentReplySubmit(para).then(res => { + wx.hideLoading() + this.setData({ + lock: false + }) + console.log("评论或回复", res) + wx.showToast({ + title: "评论成功", + icon: "none", + duration: 1000 + }) + this.setData({ + textareaValue: '' + }) + const pages = getCurrentPages() + const page = pages[pages.length - 2] + if (page.getRemarkList) { + page.getRemarkList() + } + setTimeout(() => { + wx.navigateBack() + }, 500) + }).catch(err => { + console.log(err) + this.setData({ + lock: false + }) + }) + } else { //对 内容 进行评论 + api.commentSubmit(para).then(res => { + wx.hideLoading() + this.setData({ + lock: false + }) + console.log("评论或回复", res) + wx.showToast({ + title: "评论成功", + icon: "none", + duration: 1000 + }) + this.setData({ + textareaValue: '' + }) + const pages = getCurrentPages() + const page = pages[pages.length - 2] + if (page.getRemarkList) { + page.getRemarkList() + } + setTimeout(() => { + wx.navigateBack() + }, 500) + }).catch(err => { + console.log(err) + this.setData({ + lock: false + }) + }) + } + } +}) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.json b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.json new file mode 100644 index 0000000..eee523f --- /dev/null +++ b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "评论" +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxml b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxml new file mode 100644 index 0000000..42e7f50 --- /dev/null +++ b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxml @@ -0,0 +1,20 @@ + + + + + {{textareaValue.length}}/200 + + + + + + \ No newline at end of file diff --git a/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxss b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxss new file mode 100644 index 0000000..1e3c328 --- /dev/null +++ b/subpages/oneKeyService/pages/remarkOrReply/remarkOrReply.wxss @@ -0,0 +1,76 @@ +page { + width:100%; + height:100vh; +} +.remark-or-reply { + width: 100%; + height: 100%; + background: #f7f7f7; + box-sizing: border-box; + padding: 20rpx; +} +.remark-or-reply .remark-content { + width: 100%; + border-radius: 16rpx; + background: #fff; + height: 930rpx; + box-sizing: border-box; + padding: 25rpx; +} +.remark-or-reply .remark-content textarea { + width: 100%; + height: calc(100% - 50rpx); + overflow-y: auto; + font-size: 32rpx; + color: #333; + line-height: 50rpx; +} +.remark-or-reply .remark-content .content-num { + width:100%; + height: 50rpx; + line-height: 50rpx; + font-size: 28rpx; + color: #999; + text-align: right; +} +.remark-or-reply .remark-content .textarea-placeholder { + font-size: 32rpx; + color: #999; +} +.reply-btn { + width: 100%; + height: 84rpx; + display: flex; + align-items: center; + justify-content: center; + margin-top: 70rpx; +} +.reply-btn button { + width: 560rpx; + height: 100rpx; + line-height: 84rpx; + text-align: center; + color: #fff; + font-size: 36rpx; + padding: 0; + outline: 0; + border-radius: 16rpx; + /* background: linear-gradient(to right, #f40f0f, #ff4c4c); */ + background-color: transparent; +} +.reply-btn .hover-button { + /* background:red; */ +} +button image { + width: 100%; + height: 100%; +} +button text { + position: absolute; + width: 100%; + height: 100%; + left: 0; +} +button::after { + border: none; +} \ No newline at end of file diff --git a/subpages/oneKeyService/utils/common.js b/subpages/oneKeyService/utils/common.js new file mode 100644 index 0000000..2d29397 --- /dev/null +++ b/subpages/oneKeyService/utils/common.js @@ -0,0 +1,10 @@ +export function formatTimestamp () { + const date = new Date() + const year = date.getFullYear() + const month = (date.getMonth() + 1).toString().padStart(2, "0") + const day = (date.getDate()).toString().padStart(2, "0") + const hour = (date.getHours()).toString().padStart(2, "0") + const minute = (date.getMinutes()).toString().padStart(2, "0") + const second = (date.getSeconds()).toString().padStart(2, "0") + return `${year}-${month}-${day} ${hour}:${minute}:${second}` +} \ No newline at end of file diff --git a/utils/understandJs.js b/utils/understandJs.js index 45d3302..28699f7 100644 --- a/utils/understandJs.js +++ b/utils/understandJs.js @@ -10,7 +10,12 @@ module.exports = { bannerList:bannerList, videoBannerList:videoBannerList, getFullDictInfo:getFullDictInfo, - moduleCategory:moduleCategory + moduleCategory:moduleCategory, + getCommentList: getCommentList, + commentSupport: commentSupport, + commentOpposition: commentOpposition, + commentSubmit: commentSubmit, + commentReplySubmit: commentReplySubmit } // 了解锦水-模块管理接口 function modulelist(moduleCategory='') { @@ -63,4 +68,27 @@ function getFullDictInfo (dictType) { // 一键服务/解码锦水 改版模块类别接口 function moduleCategory(params) { return fly.get('news/module/moduleCategory', params) +} + +//内容评论列表【最新/最热列表】 +function getCommentList(params) { + return fly.get('news/notice/comment/list', params) +} + +//表态内容评论（赞） +function commentSupport (data) { + return fly.post("news/notice/comment/statement/support", data) +} +//表态内容评论（踩） +function commentOpposition (data) { + return fly.post("news/notice/comment/statement/opposition", data) +} + +//内容评论提交 +function commentSubmit (data) { + return fly.post("news/notice/comment/submit", data) +} +//内容评论的回复提交 +function commentReplySubmit (data) { + return fly.post("news/notice/comment/reply/submit", data) } \ No newline at end of file