From e592e7898a3124c5e2c9c0f79a2bbb4de9fa3562 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 28 Jul 2020 16:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E5=8D=B0=E8=B1=A1-=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A7=86=E9=A2=91banner=EF=BC=9B=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=EF=BC=9B=E5=85=9A=E7=BE=A4?= =?UTF-8?q?1+1=E4=BC=98=E5=8C=96=EF=BC=9B=E7=AD=BE=E5=88=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/activity/activity.wxss | 1 + images/mine/signedup.png | Bin 5402 -> 0 bytes images/mine/signup.png | Bin 5775 -> 758 bytes pages/heartNew/heartNew.wxss | 5 +- .../components/topicItemNew/topicItemNew.wxss | 9 +- pages/mine/mine.js | 4 + pages/mine/mine.wxml | 15 +- pages/mine/mine.wxss | 10 +- .../communityList/communityList.wxss | 13 +- subpages/associationNew/images/navbarbk.png | Bin 0 -> 9448 bytes .../pages/associationlist/associationlist.js | 13 +- .../associationlist/associationlist.json | 2 + .../associationlist/associationlist.wxml | 8 +- .../associationlist/associationlist.wxss | 45 ++++++ .../pages/eventlist/eventlist.wxss | 7 +- .../heart/pages/heartDetail/heartDetail.wxml | 5 +- .../heart/pages/heartDetail/heartDetail.wxss | 6 +- subpages/integralCentre/images/note.png | Bin 0 -> 2474 bytes subpages/integralCentre/pages/index/index.js | 6 + .../integralCentre/pages/index/index.wxml | 1 + .../integralCentre/pages/index/index.wxss | 14 ++ .../pages/archives/archives.wxss | 9 +- .../pages/directTo/directTo.wxss | 5 +- subpages/oneKeyService/pages/index/index.wxss | 1 + .../pages/policyList/policyList.wxss | 3 +- subpages/understandJs/pages/index/index.wxss | 1 + .../pages/noticeDetail/noticeDetail.js | 79 ++++++++++- .../pages/noticeDetail/noticeDetail.json | 4 +- .../pages/noticeDetail/noticeDetail.wxml | 40 +++++- .../pages/noticeDetail/noticeDetail.wxss | 128 +++++++++++++++++- utils/config.js | 4 +- utils/understandJs.js | 10 +- 32 files changed, 402 insertions(+), 46 deletions(-) delete mode 100644 images/mine/signedup.png create mode 100644 subpages/associationNew/images/navbarbk.png create mode 100644 subpages/integralCentre/images/note.png diff --git a/components/activity/activity.wxss b/components/activity/activity.wxss index 845edfb..5200898 100644 --- a/components/activity/activity.wxss +++ b/components/activity/activity.wxss @@ -1,5 +1,6 @@ .layout { display: table; + width: 100%; /* width: calc(100% - 40rpx); */ height: 276rpx; /* border-radius: 10rpx; */ diff --git a/images/mine/signedup.png b/images/mine/signedup.png deleted file mode 100644 index ebb01288a4bb1088899c6a0cb77aad8836960c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5402 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 N002ovPDHLkV1n+B8t4E3 diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index e02dbfd..514d3a9 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -35,11 +35,12 @@ page { } .header .navigation .goback { - width: 16rpx; - margin-left: 30rpx; + width: 40rpx; + padding-left: 14rpx; display: flex; align-items: center; justify-content: center; + height: 100%; } .header .navigation .goback image { diff --git a/pages/mine/components/topicItemNew/topicItemNew.wxss b/pages/mine/components/topicItemNew/topicItemNew.wxss index 883a9ab..7a309d8 100644 --- a/pages/mine/components/topicItemNew/topicItemNew.wxss +++ b/pages/mine/components/topicItemNew/topicItemNew.wxss @@ -2,7 +2,7 @@ /* width: calc(100% - 40rpx); */ padding: 40rpx 29rpx 20rpx 29rpx; background: #fff; - margin-top: 20rpx; + margin-bottom: 20rpx; border-radius: 16rpx; } @@ -44,6 +44,7 @@ font-weight: 500; color: rgba(51, 51, 51, 1); line-height: 54rpx; + margin-top: 10rpx; } .image-list { @@ -66,7 +67,7 @@ margin-top: 21rpx; display: flex; align-items: center; - justify-content: space-between; + justify-content: space-around; /* justify-content: center; */ height: 28rpx; padding: 0 50rpx; @@ -96,7 +97,7 @@ .comment { /* width: calc(100% - 98rpx); */ - padding: 26rpx 20rpx; + padding: 16rpx 20rpx 26rpx; background: #F2F2F2; border-radius: 8rpx; margin-top: 25rpx; @@ -104,7 +105,7 @@ .comment .comment-list { width: 100%; - margin-top: 11rpx; + margin-top: 10rpx; font-size: 28rpx; color: #999999; } diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 5aa4d8d..5395c43 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -248,6 +248,7 @@ Page({ faceImg: "", nickname: "", partyFlag: "0", + isSignUp: 0, points: 0, grade: 0 } @@ -336,6 +337,9 @@ Page({ //签到 2020.07.24 toSignUp () { + if (this.data.userInfo.isSignUp == 1) { + return + } api.userInfoSignUp().then(res => { console.log(res.data) if (res.code === 0) { diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index b93fac6..c0f0554 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -26,14 +26,13 @@ - - - - + + + + 签 到 + 已签到 + + diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index e9e4cd8..0d505a9 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -46,7 +46,7 @@ page { } .personal-info .box .content .bottom text{ color: #fff; - font-size: 30rpx; + font-size: 28rpx; line-height: 30rpx; flex: 1; text-align: center; @@ -119,7 +119,7 @@ page { width: 142rpx; height: 46rpx; position: relative; - margin-right: 14rpx; + margin-right: 16rpx; margin-top: 22rpx; } .personal-info .box .content .top .complete-info .complete-image { @@ -144,12 +144,16 @@ page { height: 46rpx; line-height: 46rpx; margin-left: 10rpx; + width: 88rpx; + text-align: center; } .personal-info .box .content .top .complete-info .complete-content .rightsword { width: 14rpx; height: 18rpx; object-fit: cover; - margin-left: 8rpx; + /* margin-left: 8rpx; */ + position: absolute; + right: 4rpx; } .personal-info .box .content .bottom .operation { flex: 1; diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss index 8de40e5..1cd7de3 100644 --- a/subpages/associationNew/components/communityList/communityList.wxss +++ b/subpages/associationNew/components/communityList/communityList.wxss @@ -1,6 +1,10 @@ .hover-btn { box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); } +.community-list { + position: relative; + top: -50rpx; +} .community-item{ width: 690rpx; height: 300rpx; @@ -8,6 +12,7 @@ position: relative; margin: 0 auto; margin-top: 28rpx; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } .community-item image{ width: 100%; @@ -19,7 +24,7 @@ width: 100%; height: 100%; position: absolute; - background: rgba(0, 0, 0, 0.1); + background: rgba(0, 0, 0, 0.2); border-radius: 10rpx; text-align: center; display: flex; @@ -32,11 +37,13 @@ line-height: 70rpx; display: inline-block; height: 70rpx; - background: rgba(0, 0,0,0.3); + /* background: rgba(0, 0,0,0.3); */ border-radius: 5rpx; overflow: hidden; color: white; - text-shadow: 2rpx 2rpx 0rpx #999; + text-shadow: 2rpx 2rpx 4rpx #666; + font-weight: 800; + letter-spacing: 8rpx; } .btn-container { width: 100%; diff --git a/subpages/associationNew/images/navbarbk.png b/subpages/associationNew/images/navbarbk.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8ae3633aca00f5c3fbcd783fa338a22dee512a GIT binary patch literal 9448 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 literal 0 HcmV?d00001 diff --git a/subpages/associationNew/pages/associationlist/associationlist.js b/subpages/associationNew/pages/associationlist/associationlist.js index 825a8c3..91d2fb7 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.js +++ b/subpages/associationNew/pages/associationlist/associationlist.js @@ -4,6 +4,7 @@ import { getJoinGroup, getImageUrl2 } from "../../utils/api" +const app = getApp() Page({ data: { associationList: [], @@ -11,10 +12,16 @@ Page({ loadMoreType: "none", pageNo: 1, pageSize: 10, - imageUrlList: [], + imageUrlList: [], + statusHeight: 0, // 自定义头部状态栏高度 + navigationHeight: 0, // 自定义头部导航栏高度 }, onLoad: function () { // this.getPartyGroupList(); + this.setData({ + statusHeight: app.globalData.deviceInfo.statusHeight, + navigationHeight: app.globalData.deviceInfo.navigationHeight, + }) getImageUrl2().then(res => { this.setData({ imageUrlList: [...res.data] @@ -38,7 +45,9 @@ Page({ this.getPartyGroupList() } }, - + _backhome () { + wx.navigateBack() + }, //获取党群列表 getPartyGroupList () { getPartyGroupList().then(res => { diff --git a/subpages/associationNew/pages/associationlist/associationlist.json b/subpages/associationNew/pages/associationlist/associationlist.json index 1e1da6b..50a5f09 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.json +++ b/subpages/associationNew/pages/associationlist/associationlist.json @@ -1,4 +1,6 @@ { + "navigationStyle": "custom", + "navigationBarTextStyle":"white", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "community-list": "../../components/communityList/communityList" diff --git a/subpages/associationNew/pages/associationlist/associationlist.wxml b/subpages/associationNew/pages/associationlist/associationlist.wxml index 0ff92b4..836aac9 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.wxml +++ b/subpages/associationNew/pages/associationlist/associationlist.wxml @@ -1,6 +1,12 @@ - + + + + 党群列表 + + + - {{detail.title}} + {{detail.title}} - + + diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss index 0e8ec01..e09217f 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxss +++ b/subpages/heart/pages/heartDetail/heartDetail.wxss @@ -17,12 +17,14 @@ page{ .top-font { color: #fff; - display: block; + display: flex; position: absolute; - top: 67rpx; + top: 0rpx; left: 20rpx; right: 20rpx; font-size: 44rpx; + height: 188rpx; + align-items: center; } .position-absolute { diff --git a/subpages/integralCentre/images/note.png b/subpages/integralCentre/images/note.png new file mode 100644 index 0000000000000000000000000000000000000000..12ede2a65b878a937e425f841153ce227d4105b0 GIT binary patch literal 2474 zcmeHI_ct4gA5Dx}jZ(X6wN}j{cByAZiV`Cfv0ASrL2J{hJ*p^T6D=au#E88@pIuT^ zpFL8PXVk7;e0~3p_de&`d(Zv#o_o(H!Q9LU#C(Gp004lDA^NaO1^*w6w3obFx;_a2 z(43i@SQ%W}i~sJw1pbu?#Qr_wb2)%>KbV;%07yeiM}LKZk%^h*Dv0$O8~b$*PA+a9 zUcMXrHw6TRghg)M78Mhhkh~)$Eh8%@e^)_K39PK5s-~`?c~49GzRn-Idin;2Mi67@ z0~1rThvpVAODk&|xUJnIdk05^le3Gf+v6whe?Il_M554M-agNs`}+9@1O^3%guZwg z_9{FgGAcSIHZDHlb>f?(6nbntn8fJy!--e;k)-m#U;2>{D-oS1Y&tbWfiHq zrnauWp|PpCrIp;){^_rd&aUpB-oDTM1C%d=L&IN3zWqHqHa;;qH9a#sNBus(u=rzX z`Ja{5we_DHn_JsEyL-R(4-SuxPfmZIopHq-r2xI*}tRTHf)}i+@0(mbA78{Xi zNGr~2QkvD6lnn-!V>=+Gh?*_2eqe=^o;8Vud<*r-C?UyK-eqt)?O?1@K`&GdMFb8OfAGPpyvKuqvq-~<_9@1O6#WKsz=&| z`V@!zaXGahHL$$8`6OTxMlIb%H6++ znPD&MZRh|Uy`Xz@XGR48;qn%ryUsKG!p-%m$CZGbD)Rj94(+o%m2UA8Cn85{$rT;0 z3SZu|;;~k5Dg950>mCXNS`GqeG)la6abdGTr3nInggvxZ)a7zp*mLCH#^haBn2q;R z&8}7?RpEp>@|UDs<35Ni zDiemN0$)pZ@{sT1$;x~F)X8%g3*uh()3x9;8F(;onosAbuH936k=J#hAA`&nG}8`ZOrOeKSh&35NaRK$ zfadLAUAB|zj$Dndy<#DQWQHtt-!+Jao2ImtBIde5ye6Y7go=p!9Qa|D&VzO-1|NCd zC@=qseFo7}3X_OT)S*0JoV>r{HTFhSTUc$$I7J^kTS-HYh(&dfrh7UGo%Q_%3fpQU z6Mn8`W!0k^B#wA`g2vNX7Zro@~S0;mICK>cJPhC~nU`-q=|QA+Gk6O_>$x z@PYvwox|SyMSdp;r(&`0W3w$XrJWHZv?kcNQNG}Auhx=m4cf9RWy7DQ4-GddGC^_NtSklVKID=a*Gk66G&iN({8)5j0hMDWQ0Wvw z?J!i@7%QY^?2LT2z!Ft@a#z9IWZ;Zl@hyqW)TQU=9?yTb5yc;MdsIcUSQ#Wenfd}p zYz2p4AJ3$ZdYJ=PPdRBb*lkQ&?0h`D?FH2xq!-ckE*ksXTtKcu+mHIp((A#yO2#ty z-1b^H57>PJeH?|VuCblM-ZOT5>*!ES6we@POY;>qdDE!l>nsg4`xY>p=O5|UB4;Z5 z#PA)Tf7r4=iUg0+l74UMg?y)Vy>Y@TA7JWCpjS-r=uO;TOsIgDMN4gu!x>68Qe|ys z?A#$>0ghZ@h^rrT2+#N--Z@;RLG@~_fbXa{s`HrslXYP7F0bqojdh`7PoFY8wpzzc zMda}>AoI1rsXI~HGPIuKQYqsrAkc~_|4llx@1`W89P|!mvk3N11C}5tal}2^n>Zps zEVe``y(Rc9s(q`*2If0K;GS9y`P#LD`R6GxN_m7mXV}7aGIVW_D zV9P`QJ8;awd*zqhrs?3H+(&9(1B#X}8+0Ol%R?7+y?ed4=FQ~E1)8b8H1kSv%S= zV@Y_cx@s8v;--BtT5DVq=!GsQ!Rfk~Oyn5S4qRs|yXKgYzbFC02mA=Jm`L!j_8#R^#h9?~? zdt~JZVZ%T`B$Ce}o!SchRiMiXuYKJGgU%6F)-x<&q?O=(lJ($i+fG>yB{)@?$&P*r zgs#+&?CBqnI50YWSmO+8kC@PiU7XcxgHR~a%gcX?b;l0Y3E?^^%icORuh)FEPU$ay O4#3#JOus_cIr4u+{yJO$ literal 0 HcmV?d00001 diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js index 84b4f04..fcb7107 100644 --- a/subpages/integralCentre/pages/index/index.js +++ b/subpages/integralCentre/pages/index/index.js @@ -264,6 +264,12 @@ Page({ console.log(err) }) }, + bindtapIntegralRule () { + console.log('获取积分规则') + wx.navigateTo({ + url: `/subpages/understandJs/pages/noticeDetail/noticeDetail?modulecode=notice_points_rule` + }) + }, /** * 用户点击右上角分享 */ diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml index 98bdfc8..a128684 100644 --- a/subpages/integralCentre/pages/index/index.wxml +++ b/subpages/integralCentre/pages/index/index.wxml @@ -2,6 +2,7 @@ {{points}} 积分 + 积分规则 diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss index 6b09a26..2b29b9f 100644 --- a/subpages/integralCentre/pages/index/index.wxss +++ b/subpages/integralCentre/pages/index/index.wxss @@ -34,6 +34,20 @@ page { margin-top: 29rpx; } +.title .rule { + color: white; + position: absolute; + display: flex; + align-items: center; + left: 570rpx; + top: 40rpx; + font-size: 28rpx; +} +.title .rule image{ + width: 30rpx; + height: 30rpx; + margin-left: 10rpx; +} .tab-bar { width: 100%; height: 80rpx; diff --git a/subpages/oneKeyService/pages/archives/archives.wxss b/subpages/oneKeyService/pages/archives/archives.wxss index c0dbfea..82c589d 100644 --- a/subpages/oneKeyService/pages/archives/archives.wxss +++ b/subpages/oneKeyService/pages/archives/archives.wxss @@ -90,13 +90,12 @@ button::after { display: grid; grid-template-columns: 1fr; place-items: center; - gap: 30rpx 0; + gap: 20rpx 0; width: 690rpx; padding: 20rpx 0; - margin: 296rpx auto 0rpx; - /* position: absolute; - top: 296rpx; - left: 30rpx; */ + margin: 180rpx auto 0rpx; + position: relative; + z-index: 999; } .list-item { width: 100%; diff --git a/subpages/oneKeyService/pages/directTo/directTo.wxss b/subpages/oneKeyService/pages/directTo/directTo.wxss index 738cd14..7bdbc74 100644 --- a/subpages/oneKeyService/pages/directTo/directTo.wxss +++ b/subpages/oneKeyService/pages/directTo/directTo.wxss @@ -8,10 +8,11 @@ page { height: 196rpx; width: 100%; padding: 0 30rpx; + box-sizing: border-box; } .list-item .top { - width: calc(100% - 60rpx); + width: 100%; height: 90rpx; border-bottom: 1rpx solid #f7f7f7; font-size: 34rpx; @@ -21,7 +22,7 @@ page { } .list-item .bottom { - width: calc(100% - 60rpx); + width: 100%; height: 106rpx; display: flex; align-items: center; diff --git a/subpages/oneKeyService/pages/index/index.wxss b/subpages/oneKeyService/pages/index/index.wxss index 54ff08f..ae41edd 100644 --- a/subpages/oneKeyService/pages/index/index.wxss +++ b/subpages/oneKeyService/pages/index/index.wxss @@ -8,6 +8,7 @@ margin-bottom: 28rpx; padding: 0; background: #fff; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } button::after { diff --git a/subpages/oneKeyService/pages/policyList/policyList.wxss b/subpages/oneKeyService/pages/policyList/policyList.wxss index 23ab170..18d34d6 100644 --- a/subpages/oneKeyService/pages/policyList/policyList.wxss +++ b/subpages/oneKeyService/pages/policyList/policyList.wxss @@ -57,10 +57,11 @@ page { background: #fff; padding: 38rpx 30rpx; margin-top: 16rpx; + box-sizing: border-box; } .list-li .item-name { - width: calc(100% - 60rpx); + width: 100%; font-size: 34rpx; font-weight: 500; color: rgba(51, 51, 51, 1); diff --git a/subpages/understandJs/pages/index/index.wxss b/subpages/understandJs/pages/index/index.wxss index 54ff08f..ae41edd 100644 --- a/subpages/understandJs/pages/index/index.wxss +++ b/subpages/understandJs/pages/index/index.wxss @@ -8,6 +8,7 @@ margin-bottom: 28rpx; padding: 0; background: #fff; + box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4); } button::after { diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js index c0a4b61..2077daa 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js @@ -11,7 +11,16 @@ Page({ pageIndex:1, pageSize:10, noticeCategory:'', - preloadVisible: true + preloadVisible: true, + isNeedBanner: false, + bannerList: [], + indicatorDots: false, //指示点 + autoplay: true, //true,//自动播放 + circular: true, //衔接滑动 + interval: 5000, //自动播放间隔时长(ms) + duration: 500, //幻灯片切换时长(ms) + currentSwiper: 0, + nodata: false }, /** @@ -30,6 +39,12 @@ Page({ wx.setNavigationBarTitle({ title: "锦水印象" }) + this.setData({ + isNeedBanner: true + }) + if (this.data.isNeedBanner) { + this.videoBannerList() + } this.noticelist() } else if(options.modulecode == 'notice_yh'){ wx.setNavigationBarTitle({ @@ -41,9 +56,60 @@ Page({ title: "锦水警事" }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_points_rule'){ + wx.setNavigationBarTitle({ + title: '积分规则' + }) + this.noticelist() } }, + swiperChange: function(e) { + this.setData({ + currentSwiper: e.detail.current + }) + }, + bindplay() { + this.setData({ + autoplay: false + }) + wx.getNetworkType({ + success (res) { + const networkType = res.networkType + if (res.networkType != 'wifi') { + wx.showToast({ + title: '当前为非WI-FI环境，请注意流量消耗', + icon: 'none', + duration: 3000 + }) + } + } + }) + }, + bindended() { + this.setData({ + autoplay: true + }) + }, + bindVideoEnterPictureInPicture() { + console.log('进入小窗模式') + }, + bindVideoLeavePictureInPicture() { + console.log('退出小窗模式') + }, + videoErrorCallback(e) { + console.log('视频错误信息:') + console.log(e.detail.errMsg) + }, + videoBannerList () { + api.videoBannerList('3').then( res => { + this.setData({ + bannerList: res.data + }) + }).catch(err => { + console.log(err) + }) + }, noticelist () { let that = this; let params = { @@ -52,7 +118,16 @@ Page({ noticeCategory: that.data.noticeCategory } api.noticelist(params).then(function (res) { - that.noticeDetail(res.data[0].id) + if (res.data.length == 0) { + that.setData({ + nodata: true + }) + } else { + that.setData({ + nodata: false + }) + that.noticeDetail(res.data[0].id) + } }).catch(err => { console.log(err) }) diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.json b/subpages/understandJs/pages/noticeDetail/noticeDetail.json index d8bbc60..ed1ed57 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.json +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.json @@ -1,4 +1,6 @@ { - "usingComponents": {}, + "usingComponents": { + "no-data": "../../../../components/nodata/nodata" + }, "navigationBarTitleText": "" } \ No newline at end of file diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml index 9c43ce3..47a8177 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml @@ -1,5 +1,41 @@ - +