From fa27c7db192699788f29f9520efb62e42309ca73 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 8 Sep 2020 17:57:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=9D=E5=AF=B9=E6=8D=A7=E4=B8=AA?= =?UTF-8?q?=E5=9C=BA/=E4=BA=8B=E5=A5=BD=E9=BC=93=E4=B8=AA=E6=8E=8C?= =?UTF-8?q?=E7=BE=A4=E4=B8=BB=E5=89=AF=E7=BE=A4=E4=B8=BB=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=9D=E9=A2=98=E7=BD=AE=E9=A1=B6=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD=EF=BC=9B=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/associationNew/images/top-flag.png | Bin 0 -> 916 bytes subpages/associationNew/images/top.png | Bin 0 -> 581 bytes subpages/associationNew/images/untop.png | Bin 0 -> 474 bytes .../pages/eventlist/eventlist.js | 80 +++++++++++++++++- .../pages/eventlist/eventlist.wxml | 15 +++- .../pages/eventlist/eventlist.wxss | 6 ++ subpages/associationNew/utils/api.js | 10 +++ 7 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 subpages/associationNew/images/top-flag.png create mode 100644 subpages/associationNew/images/top.png create mode 100644 subpages/associationNew/images/untop.png diff --git a/subpages/associationNew/images/top-flag.png b/subpages/associationNew/images/top-flag.png new file mode 100644 index 0000000000000000000000000000000000000000..ac9998e711c371e676822411c6b089bb2c6ae5dc GIT binary patch literal 916 zcmV;F18e+=P)<9Re-`M}di8H0>*J4>%vx`%9sQ>}lW{ za1po*^foM=dSBnx2qPRX04ITiDzXLODR2yUz2SXlBKw>40*-M`(R3ELITA$O?G3O~ zMfM1AKNv6D1ANFU8m564nn5hYXERRN0#b6`H1ur)703I=mJntRodTZAWOoBAz-P_S z5>Vrd5esMM9iU74l!1hdtMPU*CgRt0mRi~=nFM)j641ggKK1^xO!feK0uEEOIU+(N zCLR-Hdm3Ww`ZjX@fd3vR?QLny7d}Tz5-8hF!6Nk~`$Hx><4Cq95vXv2!fTX(&U%(> zJ#w!y@wn|CvK4_v71^TViBe6o#a%i`(+!zy&ZD3ZmN;xDWyN-p#Y)}+*9bS^ zxSytGp5)diVA*2<^Z(JKC6YR>wij4}IIYNJO~t>?ssr{cRoz)WSIUWt{kLmT;y)ra zuTm{Xt2r0z*-R7@*Lmc{e7+`cvu$TZ*@1bYTDLMRW{{pOk*ZDJUz>b8o3nVfrSq&U zjGGEIE?LH?O2}9mAMxKd30d)Ck#a&Ug~!Eu<_z1;U!G+p)ppNP&b7Wx4Sgf>Hq#*w zLA>q6hOvqCFl8lXe6~QG-pgdyN~$1OUDp?ZY+o)~ma;VK1D{rD5ZhmO0q@4_n-lv8 z@I=1IJo^#YH#RgIAuA-#0EbnceFSUs6a1QyJsyzE0I1#M<2Y@B? q#E6j;e|-ZU1E)arnX2ng0R{l970jTMq-CW50000FPj40XnII}8{)B%YD@joJc1xriJM5q6Z`Uk^}xT90!sLu!sd>Mfw+LhneRA9io8bI}m#w zxgkQHLk=&hu3j)a(K+J|i#V;V10OI#VnP*RKV*Sss6^PmJ z_>v8(hK5nIpSc34*^&qgKx!&z6E*u;Ky|};62s3Bh%ew(;rNHd5c$uros4o~J9VRG zFUwLg3oMYHrPOiA9+ps`hA0XuHjv&>%F@Vg7BL|Cl1f!RsO|9zL)4X+G(t)?B#gI` z7d1Os8i5K;sOS)oS&gJc%?=h&YwaYBT4m;-7BZaY@dt-PwzDun(}f6)9P$R5ULXxG zPh4r_Kf@{@7NKGDPy}iRo;0$RB_1dlOoz5A$c}jIX=Dovs8Mr|&aHSQ2A@Co(L-dx z0CXo7Vm1~3Gw=_9L-?>cBm_uK0b&_wil)^t0V6afo&a$+`7N~3VF@|`fB*vkc|VcA Tx8|wT00000NkvXXu0mjfuS)Ez literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/untop.png b/subpages/associationNew/images/untop.png new file mode 100644 index 0000000000000000000000000000000000000000..2a57560e6940fad3344aad94f5c7932045bbcfa9 GIT binary patch literal 474 zcmV<00VV#4P)RCwBA{Qv(y!(aeR41)v=8i%mJ z7zYjMGg@I;#E|rN>)M5BHJNb8K?)glIxI0AU2_*LrkD%lH?FjYpsq3wS66~ zmLL-jv8@cW16#4#%Y-9giO|p?BG@tjxu>>bLy8Ga zg5F>uHiz&JfJ6AOwOK=ecnT29K)VvO8YW_&V~z)4oeJHhX4c^0Koz|82!RU QPyhe`07*qoM6N<$f_LM!LI3~& literal 0 HcmV?d00001 diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js index 4f3163d..ef50bf9 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.js +++ b/subpages/associationNew/pages/eventlist/eventlist.js @@ -1,6 +1,6 @@ // subpages/associationNew/pages/eventlist/eventlist.js const app = getApp() -import { topiclist, commentSubmit, statement, shieldTopic } from "../../utils/api" +import { topiclist, commentSubmit, statement, shieldTopic, topTopic } from "../../utils/api" import { getTimestamp } from "../../../../utils/common" @@ -454,5 +454,83 @@ Page({ this.topiclist() } }) + }, + topTopic (e) { + const param = { + topicId: e.currentTarget.dataset.id, + topFlag: '1' + } + let that = this + wx.showModal({ + title: '提示', + content: '确定要把选择的话题置顶?', + confirmColor: '#04BCA0', + cancelColor: '#999', + success (res) { + if (res.confirm) { + console.log('用户点击确定') + topTopic(param).then( res => { + console.log(res.data) + if (res.code == '0') { + wx.showToast({ + title: '置顶成功', + icon: 'none', + duration: 2000 + }) + that.setData({ + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: "none", + loadMoreVisible: false, + topiclist: [], + }) + that.topiclist() + } + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }, + unTopTopic (e) { + const param = { + topicId: e.currentTarget.dataset.id, + topFlag: '0' + } + let that = this + wx.showModal({ + title: '提示', + content: '确定要取消该话题的置顶?', + confirmColor: '#04BCA0', + cancelColor: '#999', + success (res) { + if (res.confirm) { + console.log('用户点击确定') + topTopic(param).then( res => { + console.log(res.data) + if (res.code == '0') { + wx.showToast({ + title: '取消置顶成功', + icon: 'none', + duration: 2000 + }) + that.setData({ + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: "none", + loadMoreVisible: false, + topiclist: [], + }) + that.topiclist() + } + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) } }) \ No newline at end of file diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index 8aebc7c..79fd107 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -7,7 +7,9 @@ {{item.nickname}} - + + + {{item.createdTime}} @@ -35,6 +37,17 @@ 屏蔽 + + + + 取消置顶 + + + + 置顶 + + + diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss index 0713caf..a7425bc 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -45,6 +45,12 @@ page { border-radius: 0px; } +.user-info .name-date .top-logo { + height: 28rpx; + width: 58rpx; + margin-left: 8rpx; + border-radius: 0px; +} .user-info .name-date .date { font-size: 20rpx; font-weight: 500; diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js index 5c52091..59c850b 100644 --- a/subpages/associationNew/utils/api.js +++ b/subpages/associationNew/utils/api.js @@ -142,6 +142,16 @@ export function shieldTopic ({id, shieldReason}) { }) } +/** + * 群主或副群主 置顶 或 取消置顶 + */ +export function topTopic ({topicId, topFlag}) { + return request.post("partyGroup/topic/top", { + topicId, + topFlag + }) +} + From c348611214a889455e50fa1da26ad325bc217a64 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Tue, 8 Sep 2020 19:10:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.34=20=E8=AF=9D?= =?UTF-8?q?=E5=AF=B9=E6=8D=A7=E4=B8=AA=E5=9C=BA/=E4=BA=8B=E5=A5=BD?= =?UTF-8?q?=E9=BC=93=E4=B8=AA=E6=8E=8C=E7=BE=A4=E4=B8=BB=E5=92=8C=E5=89=AF?= =?UTF-8?q?=E7=BE=A4=E4=B8=BB=E5=A2=9E=E5=8A=A0=E8=AF=9D=E9=A2=98=E7=BD=AE?= =?UTF-8?q?=E9=A1=B6=E5=92=8C=E5=8F=96=E6=B6=88=E7=BD=AE=E9=A1=B6;=20?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=98=BE=E7=A4=BA=E7=BD=AE=E9=A1=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 9398bbf..7d5b544 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.33" + const versionNum = "1.4.34" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag