From b9ef1e3da03d237084fb00e2d633d1e233eae01a Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Thu, 28 May 2020 18:09:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=20-=E5=88=98=E7=BB=8D?= =?UTF-8?q?=E6=96=87=20-2020.5.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-resident-mp-yushan/app.json | 3 +- .../pages/index/components/sudoku/sudoku.wxml | 22 +-- .../pages/property/property.js | 24 ++- .../pages/property/property.wxml | 2 +- .../pages/welcome/welcome.js | 50 +++++-- .../subpages/home/pages/notice/notice.json | 2 +- .../subpages/home/pages/notice/notice.wxml | 2 +- .../home/pages/noticeDetail/noticeDetail.json | 2 +- .../announcementList/announcementList.js | 2 +- .../announcementList/announcementList.wxml | 2 +- .../announcementList/announcementList.wxss | 1 + .../components/policeInfo/policeInfo.js | 9 +- .../components/policeInfo/policeInfo.wxml | 6 +- .../precautionList/precautionList.js | 2 +- .../precautionList/precautionList.wxml | 2 +- .../precautionList/precautionList.wxss | 1 + .../safety/components/sudoku/sudoku.wxml | 6 +- .../subpages/safety/images/caibuliang.png | Bin 0 -> 4723 bytes .../subpages/safety/images/cailiang.png | Bin 0 -> 6971 bytes .../subpages/safety/images/ic_yueduliang.png | Bin 0 -> 1201 bytes .../subpages/safety/images/zanbuliang.png | Bin 0 -> 4857 bytes .../subpages/safety/images/zanliang.png | Bin 0 -> 7181 bytes .../subpages/safety/pages/index/index.js | 37 +++-- .../safety/pages/newsDetail/newsDetail.js | 140 ++++++++++++++++++ .../safety/pages/newsDetail/newsDetail.json | 6 + .../safety/pages/newsDetail/newsDetail.wxml | 38 +++++ .../safety/pages/newsDetail/newsDetail.wxss | 126 ++++++++++++++++ epdc-resident-mp-yushan/utils/api.js | 6 +- 28 files changed, 443 insertions(+), 48 deletions(-) create mode 100644 epdc-resident-mp-yushan/subpages/safety/images/caibuliang.png create mode 100644 epdc-resident-mp-yushan/subpages/safety/images/cailiang.png create mode 100644 epdc-resident-mp-yushan/subpages/safety/images/ic_yueduliang.png create mode 100644 epdc-resident-mp-yushan/subpages/safety/images/zanbuliang.png create mode 100644 epdc-resident-mp-yushan/subpages/safety/images/zanliang.png create mode 100644 epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.js create mode 100644 epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.json create mode 100644 epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxml create mode 100644 epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxss diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json index a2ddb61..10efa24 100644 --- a/epdc-resident-mp-yushan/app.json +++ b/epdc-resident-mp-yushan/app.json @@ -116,7 +116,8 @@ "root": "subpages/safety", "name": "safety", "pages": [ - "pages/index/index" + "pages/index/index", + "pages/newsDetail/newsDetail" ] } ], diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml index 0b75dc0..990ced9 100644 --- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml +++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml @@ -1,34 +1,34 @@ - + 左邻右舍 - + 有么说么 - + 我的物业 - + 互帮互助 - + + + 通知公告 + + 平安榆山 - - - 政策法规 - - + 社区教育 - + 综合服务 diff --git a/epdc-resident-mp-yushan/pages/property/property.js b/epdc-resident-mp-yushan/pages/property/property.js index 753b18f..7b13b66 100644 --- a/epdc-resident-mp-yushan/pages/property/property.js +++ b/epdc-resident-mp-yushan/pages/property/property.js @@ -125,11 +125,23 @@ Page({ }) }, changeScore(){ + if (app.globalData.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return false + } this.setData({ showSubmit:true }) }, submitScore(){ + if (app.globalData.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return false + } //0~100 let score = Number(this.data.tempScore.trim()); if(isNaN(score) || this.data.tempScore.indexOf('.') != -1 || score < 0 || score >100 || this.data.tempScore.trim() == ''){ @@ -145,7 +157,11 @@ Page({ 'score':score } api.submitScore(param).then(res=>{ - this.initPropertyInfo(this.data.tabList[this.data.currentTabIndex].id) + this.setData({ + 'projectInfo.avaScore':res.data, + showSubmit:false, + 'projectInfo.userScore':score, + }) }) }, // getRecommend(){ @@ -234,5 +250,11 @@ Page({ url: `/subpages/property/pages/topicList/topicList?groupId=${groupid}&groupName=${groupname}&state=${state}` }) } + }, + makeCall(e){ + const {phone} = e.target.dataset; + wx.makePhoneCall({ + phoneNumber: phone, + }) } }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/property/property.wxml b/epdc-resident-mp-yushan/pages/property/property.wxml index e07dfa5..2a7778f 100644 --- a/epdc-resident-mp-yushan/pages/property/property.wxml +++ b/epdc-resident-mp-yushan/pages/property/property.wxml @@ -31,7 +31,7 @@ 物业电话： - {{projectInfo.propertyTel}} + {{projectInfo.propertyTel}} diff --git a/epdc-resident-mp-yushan/pages/welcome/welcome.js b/epdc-resident-mp-yushan/pages/welcome/welcome.js index a634d93..752d8c7 100644 --- a/epdc-resident-mp-yushan/pages/welcome/welcome.js +++ b/epdc-resident-mp-yushan/pages/welcome/welcome.js @@ -1,4 +1,7 @@ const app = getApp() +import { + getStartupPageV2 +} from '../../utils/api' Page({ data: { @@ -10,7 +13,7 @@ Page({ imgList: [], datanum: 0, //第几个数组 datalength: 0, //数组长度 - allTime: 3,//总时间 + allTime: 0,//总时间 }, onLoad(options) { if (options.scene) { @@ -40,12 +43,18 @@ Page({ clearInterval(this.data.timer) if (this.data.scene) { wx.reLaunch({ - url: `/pages/index/index?scene=${this.data.scene}` + url: `/pages/inde/index?scene=${this.data.scene}` }) } else { - wx.reLaunch({ - url: '/pages/index/index' - }) + if (this.data.scene) { + wx.reLaunch({ + url: `/pages/index/index?scene=${this.data.scene}` + }) + } else { + wx.reLaunch({ + url: '/pages/index/index' + }) + } } } }, 1000) @@ -65,11 +74,32 @@ Page({ }, // 获取启动页信息 getStartupPage() { - this.setData({ - datalength: 1, - imgList: [{imgUrl:'https://epdc-yushan.elinkservice.cn/files-pro/20200522/02c3341b36d746338918c17676b2a864.png',duration:'3'}] - }) - this.getloop() + wx.showLoading({ + title: '获取中...' + }) + getStartupPageV2().then(res => { + wx.hideLoading() + console.log('获取启动页信息', res) + if (res.data.length > 0) { + + res.data.forEach((item, index) => { + // this.data.allTime = this.data.allTime + item.duration + this.setData({ + allTime: this.data.allTime + item.duration + }) + }) + this.setData({ + datalength: res.data.length, + imgList: res.data + }) + this.getloop() + } else { + this.immeEnter() + } + }).catch(err => { + wx.hideLoading() + this.immeEnter() + }) }, //数组循环 getloop() { diff --git a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.json b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.json index d77d900..cfb69b0 100644 --- a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.json +++ b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.json @@ -1,5 +1,5 @@ { "usingComponents": { }, - "navigationBarTitleText": "政策法规" + "navigationBarTitleText": "通知公告" } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxml b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxml index 2e7df46..343dfe0 100644 --- a/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxml +++ b/epdc-resident-mp-yushan/subpages/home/pages/notice/notice.wxml @@ -13,7 +13,7 @@ - {{item.deptName}}-政策法规 + {{item.deptName}} {{item.noticeTime}} diff --git a/epdc-resident-mp-yushan/subpages/home/pages/noticeDetail/noticeDetail.json b/epdc-resident-mp-yushan/subpages/home/pages/noticeDetail/noticeDetail.json index 43492be..e324c3a 100644 --- a/epdc-resident-mp-yushan/subpages/home/pages/noticeDetail/noticeDetail.json +++ b/epdc-resident-mp-yushan/subpages/home/pages/noticeDetail/noticeDetail.json @@ -1,5 +1,5 @@ { "usingComponents": { }, - "navigationBarTitleText": "政策法规详情" + "navigationBarTitleText": "通知公告详情" } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.js b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.js index 4c1a455..55e21eb 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.js +++ b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.js @@ -7,7 +7,7 @@ Component({ }, methods: { navigatetoNewsDetail (e) { - this.triggerEvent('navigatetoNewsDetail', {newsId: e.currentTarget.dataset.newsid}) + this.triggerEvent('navigatetoNewsDetail', {id: e.currentTarget.dataset.newsid}) } } }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxml b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxml index 6b5d165..668c3dd 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxml +++ b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxml @@ -16,7 +16,7 @@ {{item.newsTitle}} - {{item.deptName}}-{{item.newsCategoryName}} + {{item.deptName}} {{filters.formatTimestamp(item.newsStartTime)}} diff --git a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss index db50b9b..87d7c5d 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss +++ b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss @@ -29,6 +29,7 @@ white-space: normal !important; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + height:90rpx; } .news-list .list-item .right .bottom { display: flex; diff --git a/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.js b/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.js index c97d417..e8c7bba 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.js +++ b/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.js @@ -16,6 +16,13 @@ Component({ methods: { joinGroup(e){ this.triggerEvent("joinGroup",e); - } + }, + makeCall(e){ + console.log(e) + const {phone} = e.target.dataset; + wx.makePhoneCall({ + phoneNumber: phone, + }) + } } }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.wxml b/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.wxml index d68814f..74746ad 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.wxml +++ b/epdc-resident-mp-yushan/subpages/safety/components/policeInfo/policeInfo.wxml @@ -10,11 +10,11 @@ - 联系方式：{{item.policeTel}} + 联系方式：{{item.policeTel}} - + {{policeInfo.groupName}} @@ -27,7 +27,7 @@ - + 暂无民警信息~ \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.js b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.js index 4c1a455..55e21eb 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.js +++ b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.js @@ -7,7 +7,7 @@ Component({ }, methods: { navigatetoNewsDetail (e) { - this.triggerEvent('navigatetoNewsDetail', {newsId: e.currentTarget.dataset.newsid}) + this.triggerEvent('navigatetoNewsDetail', {id: e.currentTarget.dataset.newsid}) } } }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxml b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxml index 6b5d165..668c3dd 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxml +++ b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxml @@ -16,7 +16,7 @@ {{item.newsTitle}} - {{item.deptName}}-{{item.newsCategoryName}} + {{item.deptName}} {{filters.formatTimestamp(item.newsStartTime)}} diff --git a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss index db50b9b..b884a8c 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss +++ b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss @@ -29,6 +29,7 @@ white-space: normal !important; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + height: 90rpx; } .news-list .list-item .right .bottom { display: flex; diff --git a/epdc-resident-mp-yushan/subpages/safety/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/subpages/safety/components/sudoku/sudoku.wxml index 1fb76fb..59a3765 100644 --- a/epdc-resident-mp-yushan/subpages/safety/components/sudoku/sudoku.wxml +++ b/epdc-resident-mp-yushan/subpages/safety/components/sudoku/sudoku.wxml @@ -1,13 +1,13 @@ - + - + - + diff --git a/epdc-resident-mp-yushan/subpages/safety/images/caibuliang.png b/epdc-resident-mp-yushan/subpages/safety/images/caibuliang.png new file mode 100644 index 0000000000000000000000000000000000000000..97eeb175123a902d185db5af8478f336b66df9ce GIT binary patch literal 4723 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 B7|j3x literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/safety/images/cailiang.png b/epdc-resident-mp-yushan/subpages/safety/images/cailiang.png new file mode 100644 index 0000000000000000000000000000000000000000..a2606adf3244ce665be4cb55b836480ec18b4bf5 GIT binary patch literal 6971 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 N002ovPDHLkV1hmgS^NM1 literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/safety/images/ic_yueduliang.png b/epdc-resident-mp-yushan/subpages/safety/images/ic_yueduliang.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6f21fd75f18c34df3c03f108e341b0cf6dc352 GIT binary patch literal 1201 zcmV;i1Wx;jP)6+uy>!^ zB!Ni+(T0WwufMBW_2e-tHaUss0KyGHd8J%wA7oZ;e zJ!S;Par`{^96Sj+aj+5N`{`c~Dv1=45wYnIS;o|QP{S!VBHshM?j;9mG28+oU^(NN z$aWQ38O=ty8M&45XUM0(k0Wl( z*EwmkeS%w@{wK!O+AlH!1P-w_2W$gXterrXj7b0|MQrZG;9`c=jJF^Yj+`aacc78J zbS{7n^eYAi2KKVo54Dmw9*_Gb!AI!7h%92ypU6d{5qOAGwDk4$6`)wgc%RE!i;SG> zG%LVCPz;^}i>Q=`wJD7gK!Ca{2U92})T%h_}UG&)8Z7U$>ZmnIU4lTN`A z0FQwWnQB!?F?2Z)xocn<1ddV0pJZlcmSkjP_=y=PzcUb<&0LZ#r}0tb6VM`?cCs*+ z@#3tktY3pC4`8Xy*97kfIT4KP$C4PY1fK4JU-C_Ai8A<~Vy3&IRGD0CQGL%&7e zE_iXskQtk42ksmZ8UOOqiHYDJL;q##se+iFhRzDG*S8r^_{A=X2Us|bvvTKH zq0~#sre09NT%Fwk^#=9p>~iV}CaJY&!O!fShFlFAM|%s7qoil{8aS@&cvvw!tQxcV zLNFISp%7^9ZZPRgZo#Im;cO03iTq~F$H?CGGW(XbBE{S@Bg=_)NAJJkc8Z)RqdHpo z&Y!aXBI9{_GbZ#J>OBW9k-=-&G!H{(sh00CRAE0rMrOYwrJSln?;ztgu#o-^=APEO zk?JqNn7;=|qOWn@#3??&kluJb%a`;$flk$B56&Z?RPO?MkJ|U&E$29Gzvmw$#`p$? zHh}GrsU{+?+JlttUP_Bf68#Ry?jmw~Apg5AsPS58@}JQpf&V>$e+3u-IS+VkWWRd~ P00000NkvXXu0mjfWGqB* literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/safety/images/zanbuliang.png b/epdc-resident-mp-yushan/subpages/safety/images/zanbuliang.png new file mode 100644 index 0000000000000000000000000000000000000000..64025ac3eabf7a075fc0b837af091f9f822d6110 GIT binary patch literal 4857 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 P00000NkvXXu0mjf?$7=! literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/index/index.js b/epdc-resident-mp-yushan/subpages/safety/pages/index/index.js index 53d56ee..55d656c 100644 --- a/epdc-resident-mp-yushan/subpages/safety/pages/index/index.js +++ b/epdc-resident-mp-yushan/subpages/safety/pages/index/index.js @@ -11,7 +11,7 @@ Page({ policeInfo:{}, precautionList:[], announcementList:[], - showMyPoliceFlag:false, + showMyPoliceFlag:true, showAnnouncementFlag:false, showPrecautionFlag:false, loadMoreType:'more', @@ -44,12 +44,16 @@ Page({ // 获取banner列表 getBannerList () { api.getBannerList().then(res => { - console.log('首页banner列表', res) - this.setData({ - bannerList: res.data - }) + if(res.data.length == 0){ + this.setData({ + bannerList: [{'imgUrl':'../../images/temp.png','title':'防范火灾 平安假日'}] + }) + }else{ + this.setData({ + bannerList: res.data + }) + } }).catch(() => { - console.log('获取banner列表失败') this.setData({ bannerList: [{'imgUrl':'../../images/temp.png','title':'防范火灾 平安假日'}] }) @@ -123,6 +127,7 @@ Page({ }) }, showMyPolice(){ + this.getPoliceInfo() this.setData({ showMyPoliceFlag:true, showPrecautionFlag:false, @@ -222,12 +227,26 @@ Page({ const { id, url, newsFlag } = e.detail if (newsFlag == '0') { wx.navigateTo({ - url: `/subpages/home/pages/webview/webview?url=${url}` + url: `/subpages/safety/pages/webview/webview?url=${url}` }) } else if (newsFlag == '1') { wx.navigateTo({ - url: `/subpages/home/pages/newsDetail/newsDetail?id=${id}` + url: `/subpages/safety/pages/newsDetail/newsDetail?id=${id}` }) } - } + }, + //跳转平安防范详情 + navigateToPrecautionDetail(e){ + let {id} = e.detail + wx.navigateTo({ + url: `/subpages/safety/pages/newsDetail/newsDetail?id=${id}` + }) + }, + //跳转警情通报列表 + navigateToAnnouncementDetail(e){ + let {id} = e.detail + wx.navigateTo({ + url: `/subpages/safety/pages/newsDetail/newsDetail?id=${id}` + }) + }, }) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.js b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.js new file mode 100644 index 0000000..cdeea90 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.js @@ -0,0 +1,140 @@ +const api = require('../../../../utils/home') +import { getTimestamp } from '../../../../utils/common' +import util from '../../../../utils/util' +const app = getApp() +Page({ + data: { + detailId: '', + supportStatus: 'support', + dispportStatus: 'dispport', + noticeObj: {}, + infoCompleted: 0, + noticeObjContent: '' + }, + onLoad (options) { + this.setData({ + detailId: options.id, + infoCompleted: app.globalData.infoCompleted + }) + this.getNewsDetail(options.id) + this.browseNews(options.id) + }, + getNewsDetail (id) { + let that = this + api.getNewsDetail(id).then(res => { + that.setData({ + noticeObj: res.data, + noticeObjContent: util.formatRichText(res.data.newsContent) + }) + if (that.data.noticeObj.likeFlag == '1') { + that.setData({ + supportStatus: 'supported' + }) + } + if (that.data.noticeObj.unLikeFlag == '1') { + that.setData({ + dispportStatus: 'dispported' + }) + } + }).catch(err => { + console.log(err) + }) + }, + browseNews (id) { + let para = { + newsId: id + } + api.browseNews(para).then(res => { + + }).catch(err => { + console.log(err) + }) + }, + // 检查 是否完善信息 + verifyCompleteInfo () { + if (this.data.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return true + } else { + return false + } + }, + newsPosition (e) { + // newsPosition (attitude, bySelf = false) { + if (this.verifyCompleteInfo()) { + return false + } + console.log(e) + let attitude = e.currentTarget.dataset.state, + bySelf = e.currentTarget.dataset.byself + if (bySelf=='true') { + let attitudeState = '' + if (attitude === '0') { + if (this.data.dispportStatus === 'dispported') { + // this.dispportStatus = 'dispport' + // this.newsObj.unlikeNumber -= 1 + this.setData({ + dispportStatus: 'dispport', + ['noticeObj.unlikeNumber']: this.data.noticeObj.unlikeNumber - 1 + }) + } + if (this.data.supportStatus === 'support') { + attitudeState = '0' + // this.supportStatus = 'supported' + // this.newsObj.likeNumber += 1 + this.setData({ + supportStatus: 'supported', + ['noticeObj.likeNumber']: this.data.noticeObj.likeNumber + 1 + }) + } else if (this.data.supportStatus === 'supported') { + attitudeState = '2' + // this.supportStatus = 'support' + // this.newsObj.likeNumber -= 1 + this.setData({ + supportStatus: 'support', + ['noticeObj.likeNumber']: this.data.noticeObj.likeNumber - 1 + }) + } + } else if (attitude === '1') { + if (this.data.supportStatus === 'supported') { + // this.supportStatus = 'support' + // this.newsObj.likeNumber -= 1 + this.setData({ + supportStatus: 'support', + ['noticeObj.likeNumber']: this.data.noticeObj.likeNumber - 1 + }) + } + if (this.data.dispportStatus === 'dispport') { + attitudeState = '1' + // this.dispportStatus = 'dispported' + // this.newsObj.unlikeNumber += 1 + this.setData({ + dispportStatus: 'dispported', + ['noticeObj.unlikeNumber']: this.data.noticeObj.unlikeNumber + 1 + }) + } else if (this.data.dispportStatus === 'dispported') { + attitudeState = '3' + // this.dispportStatus = 'dispport' + // this.newsObj.unlikeNumber -= 1 + this.setData({ + dispportStatus: 'dispport', + ['noticeObj.unlikeNumber']: this.data.noticeObj.unlikeNumber - 1 + }) + } + } + const para = { + newsId: this.data.detailId, + attitude: attitudeState + } + // const res = await newsPosition(para) + // console.log('新闻表态', res) + api.newsPosition(para).then(res => { + + }).catch(err => { + console.log(err) + }) + } + } +}) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.json b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.json new file mode 100644 index 0000000..89743c2 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "completeInfo-dialog": "../../../../../components/completeInfoDialog/completeInfoDialog" + }, + "navigationBarTitleText": "平安榆山" +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxml new file mode 100644 index 0000000..a7ad941 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxml @@ -0,0 +1,38 @@ + + + + {{noticeObj.newsTitle}} + + + {{noticeObj.deptName}} + {{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}} + + + + + + {{noticeObj.readingAmount}} + + + + + + + + + + + 支持{{noticeObj.likeNumber}} + + + + + + 不支持{{noticeObj.unlikeNumber}} + + + + + + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxss b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxss new file mode 100644 index 0000000..a84887f --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/safety/pages/newsDetail/newsDetail.wxss @@ -0,0 +1,126 @@ +.notice-detail { + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 20rpx; + background: #f7f7f7; +} +.richContent img{ + width: 100%!important; + height: auto; +} +.selfContent { + width: 100%; + display: table; + background: #ffffff; + border-radius: 16rpx; + box-sizing: border-box; + padding: 0 25rpx 38rpx; +} +.detail-title { + font-family: PingFang-SC-Bold; + font-size: 48rpx; + font-weight: bold; + line-height: 68rpx; + color: #333333; + padding-top: 40rpx; +} +.detail-subtitle { + display: flex; + width: 100%; + justify-content: space-between; + font-size: 22rpx; + color: #999999; + margin-top:45rpx; +} +.detail-subtitle .left span:nth-child(1){ + margin-right: 32rpx; +} +.detail-subtitle .right{ + display: flex; + height: 32rpx; + line-height: 32rpx; +} +.detail-subtitle .right .readNum { + /* display: inline-block; */ + width: 32rpx; + height: 32rpx; + margin-right: 10rpx; +} +.detail-subtitle .right .readNum image{ + width: 100%; + height: 100%; + float:left; + object-fit: cover; +} +.banner { + width: 100%; + height: 400rpx; + margin: 39rpx 0 19rpx 0; +} +.banner image{ + width: 100%; + height: 100%; + float:left; + object-fit: cover; + border-radius: 16rpx; + overflow: hidden; +} +.paragraph { + font-size: 38rpx; + line-height: 58rpx; + color: #333333; + text-indent: 76rpx; + margin-top:22rpx; +} + +.operation { + display: flex; + justify-content: center; + margin-top: 47rpx; +} +.operation .button { + width: 300rpx; + height: 84rpx; + line-height: 84rpx; + border-radius: 42rpx; + display:flex; + justify-content: center; + align-items: center; + border: 1px solid #b8b8b8; +} +.operation .button:nth-child(1) { + margin-right: 33rpx; + } +.operation .button view { + width: 40rpx; + height: 40rpx; + margin-right: 14rpx; +} +.operation .button view image{ + width: 100%; + height: 100%; + object-fit: cover; + float: left; +} +.operation .button span { + display: inline-block; + font-size: 24rpx; + position: relative; + top: 1px; +} +.default { + border: 1px solid #eaeaea; +} +.default span { + color: #999999; +} +.active { + border: 1px solid #ffab00; +} +.operation .button.active { + border: 1rpx solid #ffab00; +} +.active span { + color: #ffb700; +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/utils/api.js b/epdc-resident-mp-yushan/utils/api.js index af40e0c..00dff76 100644 --- a/epdc-resident-mp-yushan/utils/api.js +++ b/epdc-resident-mp-yushan/utils/api.js @@ -52,7 +52,8 @@ module.exports = { getPropertyProjectList:getPropertyProjectList, getPropertyProjectDetail:getPropertyProjectDetail, applyForGroup:applyForGroup, - submitScore:submitScore + submitScore:submitScore, + getStartupPageV2:getStartupPageV2 } function getToken(wxCode) { @@ -441,3 +442,6 @@ function applyForGroup(groupId){ return fly.get('property/projectScore',param) } + export function getStartupPageV2() { + return fly.get('startup/v2/getStartupPage') + } \ No newline at end of file