From c9d791a914373d9b7e926c0b5764410a91ec9dda Mon Sep 17 00:00:00 2001 From: Tuisku Date: Fri, 1 Jul 2022 16:40:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 ++- pages/quest/quest.wxss | 5 ++-- .../subpage/detail/components/link/link.js | 6 +++++ .../subpage/detail/image/ic_dsfzh@2x.png | Bin 0 -> 1177 bytes pages/user/subpage/newRel/newRel.wxml | 2 +- pages/user/subpage/system/system.js | 24 +++++++++++++----- pages/user/subpage/system/system.wxml | 6 +++-- pages/user/subpage/system/system.wxss | 11 ++++++++ 8 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 pages/quest/subpage/detail/image/ic_dsfzh@2x.png diff --git a/app.json b/app.json index 63c4a17..eb79c82 100644 --- a/app.json +++ b/app.json @@ -78,7 +78,8 @@ "waterf": "/components/waterf/index", "l-calendar": "/miniprogram_npm/lin-ui/calendar/index", - "l-mask": "/miniprogram_npm/lin-ui/mask/index" + "l-mask": "/miniprogram_npm/lin-ui/mask/index", + "l-badge": "/miniprogram_npm/lin-ui/badge/index" }, "style": "v2", "sitemapLocation": "sitemap.json" diff --git a/pages/quest/quest.wxss b/pages/quest/quest.wxss index 125fdfd..4c7c42b 100644 --- a/pages/quest/quest.wxss +++ b/pages/quest/quest.wxss @@ -179,7 +179,8 @@ .card_tip1, .card_model { - width: 108rpx; + /* width: 108rpx; */ + padding: 0rpx 8rpx; height: 44rpx; font-size: 20rpx; display: flex; @@ -195,7 +196,7 @@ } .card_model { - width: 104rpx; + /* width: 104rpx; */ height: 40rpx; border: 1px solid #FFB17C; color: #FFB17C; diff --git a/pages/quest/subpage/detail/components/link/link.js b/pages/quest/subpage/detail/components/link/link.js index 3191a16..3d14773 100644 --- a/pages/quest/subpage/detail/components/link/link.js +++ b/pages/quest/subpage/detail/components/link/link.js @@ -90,6 +90,12 @@ Component({ icon: 'none', duration: 2000 }) + } else if (this.data.link.indexOf('http') === -1) { + wx.showToast({ + title: '请输入正确的链接', + icon: 'none', + duration: 2000 + }) } else { http("/video/userAdd", "post", { id: this.data.data.id, diff --git a/pages/quest/subpage/detail/image/ic_dsfzh@2x.png b/pages/quest/subpage/detail/image/ic_dsfzh@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe70b6a897d0e5b3330c2476861e18a36dcaf49b GIT binary patch literal 1177 zcmV;K1ZMk*P)Px(Q%OWYRA@u(nO$gHMHI)+nRS=gJcvnKBDB^IEJ*t%B4R}jYMbW z#;o-N{Ce=>gFgASCOh|T0}6`LK&e`bV?n35q_sq=yH|NaUGiMOGykVE?hc$q#Js8UaN~w(i@F)P>h=>=ilxQOQoiX+Z z=lpoPV@3k_;y(j`%i5hJqTd4JA)_a^V`zW(vFFViJuen zSvHLXP)dCP0N3~fpGCwUlTOmio`^O9z(vM?KLEfEDdnjo<3|EGj`KAUZCj>A{6+|| zJ;?;EY^SHEx7TX5j{xA}zy=YISF6>X#bWXAxN~F%pam+WZUBJy0brdW_-L(G8!Q%! zXX8L*3ZMnLu6w)Zd4~ZYZwNlz-`_tpJUm>Fg2)^|3#?Qs`|9=jD*(U@!P8R8d%6O^ z52ptJ;5kz;B0eL8csvZEBRmiYbR6etB6_R=V!sgL#a0j<1>k$)004{`f~)y_{*tk= zv4v(39S1NoGm~3bSa_R=294u&n-JpL)BtSTE({C|>?5LGh`1R5{vx7d`p}V5{u;G0 zl~PXvfSn0IrBc~iuh-uMfUBDbT|`7Kgm^6sA~OKjb=P~I_ay*a8Y0j`#N9%OBdu&Q z18^LtL_`yYFaiJ_GCCbE7$I?Dc6RnE+qSFCATj~an{R%8UMFIGzNkgU*sYxNW2I7Q zL!nSOLPXaYf(NCP?{y5o)YQ~w#@Go%&;cpsy~Y`T3lZtOCuk2#DWC0H07QI92yxz* zH-K3SA=9l%?gPy>F%jvbvj+fj9leRQILC2z5z$*wA1VNNRZ4j$0O(Wde=U;`Qc7_E zc&Q<;4`VsR7#rc7FE$#b4p1(a??6QTbv-Y)Ld2@)dH*8f1r4{ZK=UCfvs0r0>yB^{!tSB#8|{FC}I>bmYa&-4BOfS_7;x~HdS>*(m{pJBnTlzQFt zgy(sC#>dAGrVijZ&TT~WPB1YMJ!M&zPK868A5P~gaftY`5aRAE04yRp7r%_Ln>ptn zMgjPH;xquP_ic|#DR*W8@E{SH`OM`~%3opvd=3ED`nI1+DX&i*pj0Yt%IEVR>---P z4++9QCEEZ436(87@%jM;=qGefUGCM|- zijHHS>USWHprkfy0OpD%NvD&pbSwK6^}uR9aD>4U(FVT|uxv&|S6Y_!Q?ovCDsyQ( zF@^D*oSU25V%xUY7C;J*d|~33h-k>NEL|vT+9Exmd#% - + 第三方账号* diff --git a/pages/user/subpage/system/system.js b/pages/user/subpage/system/system.js index 3650921..2a72122 100644 --- a/pages/user/subpage/system/system.js +++ b/pages/user/subpage/system/system.js @@ -1,5 +1,7 @@ // pages/user/subpage/system/system.js -import {http} from '../../../../utils/util' +import { + http +} from '../../../../utils/util' Page({ /** @@ -18,7 +20,6 @@ Page({ wx.setNavigationBarTitle({ title: '系统消息', }) - this.getdata() }, getdata() { http("/userMessage/list", "post", { @@ -27,7 +28,7 @@ Page({ }).then(res => { let array = res.data.records for (let index = 0; index < array.length; index++) { - array[index].createDate = array[index].createDate.replace('T',' ') + array[index].createDate = array[index].createDate.replace('T', ' ') } this.setData({ list: res.data.records, @@ -35,9 +36,13 @@ Page({ }) }) }, - to (e) { - wx.navigateTo({ - url: '/' + e.currentTarget.dataset.url, + to(e) { + http("/userMessage/read", "post", { + id: e.currentTarget.dataset.id + }).then(res => { + wx.navigateTo({ + url: '/' + e.currentTarget.dataset.url, + }) }) }, /** @@ -51,7 +56,12 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.setData({ + list: [], + page: 1, + max: 0 + }) + this.getdata() }, /** diff --git a/pages/user/subpage/system/system.wxml b/pages/user/subpage/system/system.wxml index db750d4..6272c3d 100644 --- a/pages/user/subpage/system/system.wxml +++ b/pages/user/subpage/system/system.wxml @@ -3,8 +3,10 @@ - - {{item.title}} + + {{item.title}} + + {{item.description}} {{item.createDate}} diff --git a/pages/user/subpage/system/system.wxss b/pages/user/subpage/system/system.wxss index 810f2cd..775345d 100644 --- a/pages/user/subpage/system/system.wxss +++ b/pages/user/subpage/system/system.wxss @@ -21,6 +21,9 @@ color: #333333; line-height: 28rpx; margin-bottom: 16rpx; + display: flex; + align-items: center; + flex-wrap: wrap; } .text { @@ -38,4 +41,12 @@ font-weight: 400; color: #999999; line-height: 20rpx; +} + +.dot{ + background-color: red; + height: 14rpx; + width: 14rpx; + border-radius: 50%; + margin-left: 10rpx; } \ No newline at end of file