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 0000000..97eeb17 Binary files /dev/null and b/epdc-resident-mp-yushan/subpages/safety/images/caibuliang.png differ 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 0000000..a2606ad Binary files /dev/null and b/epdc-resident-mp-yushan/subpages/safety/images/cailiang.png differ 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 0000000..7d6f21f Binary files /dev/null and b/epdc-resident-mp-yushan/subpages/safety/images/ic_yueduliang.png differ 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 0000000..64025ac Binary files /dev/null and b/epdc-resident-mp-yushan/subpages/safety/images/zanbuliang.png differ diff --git a/epdc-resident-mp-yushan/subpages/safety/images/zanliang.png b/epdc-resident-mp-yushan/subpages/safety/images/zanliang.png new file mode 100644 index 0000000..1a37aac Binary files /dev/null and b/epdc-resident-mp-yushan/subpages/safety/images/zanliang.png differ 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