diff --git a/app.json b/app.json index 13eb7a9..a93418f 100644 --- a/app.json +++ b/app.json @@ -67,7 +67,8 @@ "pages/gOfficialsList/gOfficialsList", "pages/talklist/talklist", "pages/eventlist/eventlist", - "pages/addTopic/addTopic" + "pages/addTopic/addTopic", + "pages/guideInfo/guideInfo" ] }, { diff --git a/components/activity/activity.js b/components/activity/activity.js index 6eb158e..e46ce60 100644 --- a/components/activity/activity.js +++ b/components/activity/activity.js @@ -1,8 +1,7 @@ var api = require("../../utils/activity.js") - Component({ properties: { - state: Number + state: Number, }, data: { activityList: [], @@ -32,7 +31,7 @@ Component({ that.setData({ activityList: that.data.activityList.concat(res.data) }) - console.log(res.data.length) + //console.log(res.data.length) //数据访问成功 var myEventDetail = { listLength: res.data.length @@ -73,5 +72,4 @@ Component({ }) } } - }) \ No newline at end of file diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml index 901d62a..2ebacac 100644 --- a/components/activity/activity.wxml +++ b/components/activity/activity.wxml @@ -1,39 +1,39 @@ - - - - - 报名中 - 已报满 - 未开始 - 进行中 - 已结束 - 已取消 - - - {{item.title}} - - - - 活动时间：{{item.actStartTime}}至 - - {{item.actEndTime}} - - - 活动地点：{{item.actAddress}} - - - - - 不限名额 - 活动名额 {{item.actQuota}}人 - 已报名 {{item.signupNum}}人 - - - - - - \ No newline at end of file diff --git a/images/home/call.png b/images/home/call.png new file mode 100644 index 0000000..2dbe817 Binary files /dev/null and b/images/home/call.png differ diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index ec3e23b..cac9cbc 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -277,7 +277,7 @@ Page({ let that = this api.getImgUrl("0").then(function (res) { that.setData({ - getImgUrl: res.data[0].imgUrl + getImgUrl: res.data[0] }) }) }, @@ -344,4 +344,25 @@ Page({ url: "/subpages/heart/pages/volunteer/volunteer" }) }, + + //拨打电话 + getPhone (e) { + // return false + wx.showModal({ + title: "拨打电话", + content: "", + cancelColor: "#29B9A5", + confirmColor: "#29B9A5", + success: (res) => { + if (res.confirm) { + console.log("用户点击确定") + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.number + }) + } else if (res.cancel) { + console.log("用户点击取消") + } + } + }) + } }) \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index 56467d8..26cd795 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -1,90 +1,90 @@ - - - - - - - - 志愿者去哪儿 - - - - - - - - - - - - - - - - - - - - - - 订单多多 - - - 志友朵朵 - - - 精彩说说 - - - 积分火火 - - - - - - - - - - - - - - - - - + + + + + + + + 志愿者去哪儿 + + + + + + + + + + + + + + + + + + + + + + 订单多多 + + + 志友朵朵 + + + 精彩说说 + + + 积分火火 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index 54b4b31..527694f 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -1,385 +1,385 @@ -page { - width: 100%; - height: auto; - overflow-y: auto; - background: #f7f7f7; -} - -.header { - position: fixed; - width: 100%; - top: 0; - left: 0; - z-index: 999; -} - -.header .header-bg { - width: 100%; - height: 100%; - position: absolute; - z-index: 10; - left: 0; - top: 0; -} - - - -.header .navigation { - /* width: calc(100% - 46rpx); - margin-left: 46rpx; */ - display: flex; - align-items: center; - /* justify-content: center; */ - position: relative; - z-index: 100; -} - -.header .navigation .goback { - width: 16rpx; - margin-left: 30rpx; - display: flex; - align-items: center; - justify-content: center; -} - -.header .navigation .goback image { - width: 16rpx; - height: 28rpx; -} - -.header .navigation .title { - display: flex; - align-items: center; - /* justify-content: center; */ - width: calc(100% - 46rpx); - margin-left: 46rpx; - color: rgba(255, 255, 255, 0.9); - font-size: 32rpx; - letter-spacing: 2rpx; -} - -.header .navigation .title .title-right { - /* margin-right: 46rpx; */ -} - -.home { - width: 100%; -} - -.belong-grid { - width: 100%; - height: 138rpx; - box-sizing: border-box; - padding-top: 16rpx; - position: relative; -} - -.belong-grid .newbelong-grid { - display: flex; - flex-direction: row; - /* align-items: center; */ - justify-content: space-between; -} - -.belong-grid .belong-grid-bg { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - z-index: 10; -} - -.belong-grid .newbelong-grid .grid { - margin-left: 21rpx; - /* width: 90%; */ - width: calc(100% - 234rpx); - height: 62rpx; - position: relative; - z-index: 100; - display: flex; - align-items: center; -} - -.belong-grid .newbelong-grid .grid image { - width: 100%; - height: 46rpx; -} - -.belong-grid .newbelong-grid .volunteer { - margin-right: 15rpx; - width: 90rpx; - height: 62rpx; - position: relative; - z-index: 100; - display: flex; - align-items: center; -} - -.belong-grid .newbelong-grid .volunteer image { - width: 100%; - height: 100%; -} - -/* banner 样式 */ -.banner-main { - position: absolute; - width: calc(100% - 60rpx); - height: 300rpx; - margin-left: 30rpx; - background-color: #fff; - z-index: 997; - margin-top: -36rpx; - box-shadow: 0px 6px 21px 0px rgba(122, 122, 122, 0.23); - border-radius: 17rpx; -} - - -.page-body { - /* padding-top: 30rpx; */ - /* background: #fff; */ -} - -.page-section { - width: 100%; - margin-bottom: 60rpx; -} - -.page-section_center { - display: flex; - flex-direction: column; - align-items: center; -} - -.page-section:last-child { - margin-bottom: 0; -} - -.page-section-gap { - box-sizing: border-box; - padding: 0 30rpx; -} - -.page-section-spacing { - box-sizing: border-box; - /* padding: 0 20rpx; */ - height: 300rpx; -} - -swiper { - height: 300rpx; -} - -.page-section-title { - font-size: 28rpx; - color: #999; - margin-bottom: 10rpx; - padding-left: 30rpx; - padding-right: 30rpx; -} - -.page-section-gap .page-section-title { - padding-left: 0; - padding-right: 0; -} - -.demo-text-1 { - position: relative; - align-items: center; - justify-content: center; - background-color: #1aad19; - color: #fff; - font-size: 36rpx; -} - -.demo-text-1:before { - content: 'A'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -.demo-text-2 { - position: relative; - align-items: center; - justify-content: center; - background-color: #2782d7; - color: #fff; - font-size: 36rpx; -} - -.demo-text-2:before { - content: 'B'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -.demo-text-3 { - position: relative; - align-items: center; - justify-content: center; - background-color: #f1f1f1; - color: #353535; - font-size: 36rpx; -} - -.demo-text-3:before { - content: 'C'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -button { - margin-bottom: 30rpx; -} - -button:last-child { - margin-bottom: 0; -} - -.page-section-title { - padding: 0; -} - -.swiper-item { - display: block; - height: 300rpx; -} - -.banner { - overflow: hidden; - height: 300rpx; - display: flex; - width: 100%; - border-radius: 16rpx; -} - -.dots { - display: flex; - justify-content: center; - margin-top: -23rpx; - z-index: 999; - position: relative; - - /* padding-bottom: 10rpx; */ -} - -.dots .dot { - width: 20rpx; - height: 6rpx; - margin-left: 8rpx; - background: rgba(247, 247, 247, 1); - opacity: 0.38; - border-radius: 3rpx; - transition: all 0.3s; -} - -.dots .dot.active { - width: 20rpx; - background: rgba(247, 247, 247, 1); - border-radius: 3rpx; - opacity: 1; - /* background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%); */ -} - -/* banner end */ - -.tab-all { - position: absolute; - width: 100%; - height: 370rpx; - background-color: #fff; - z-index: 996; -} - - -.tab-bar { - margin-top: 278rpx; - width: 100%; - height: 92rpx; - background: #fff; - display: flex; - align-items: center; - position: relative; -} - -.tab-bar .tab { - font-size: 34rpx; - font-weight: 500; - color: rgba(171, 171, 171, 1); - width: 25%; - height: 100%; - line-height: 92rpx; - /* text-indent: 20rpx; */ - text-align: center; - position: relative; - z-index: 10; -} - -.tab-bar .tab.select { - font-size: 36rpx; - font-weight: bold; - color: rgba(229, 15, 0, 1); -} - -.tab-bar .select-bar { - position: absolute; - left: 14rpx; - bottom: 0rpx; - width: 30rpx; - height: 8rpx; - border-radius: 4rpx; - background: #fc5555; - z-index: 1; -} - -.tab-bar .tab0.select-bar { - left: calc(12.5% - 15rpx); - transition: left 0.3s linear; -} - -.tab-bar .tab1.select-bar { - left: calc(37.5% - 15rpx); - transition: left 0.3s linear; -} - -.tab-bar .tab2.select-bar { - left: calc(62.5% - 15rpx); - transition: left 0.3s linear; -} - -.tab-bar .tab3.select-bar { - left: calc(87.5% - 15rpx); - transition: left 0.3s linear; -} - -.tab-bar .hover-tab { - background: #f7f7f7; -} - - -/* 内容 */ -.details-top { - margin-top: 385rpx; -} - -.volunteer-box { - display: flex; - align-items: center; - justify-content: space-between; - flex-wrap: wrap; - padding: 0rpx 40rpx 19rpx 40rpx; -} -.show { - padding: 0rpx 40rpx; - height: 24rpx; - font-size: 24rpx; - line-height: 24rpx; - font-weight: 500; - color: #C5C5C5; +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} + +.header { + position: fixed; + width: 100%; + top: 0; + left: 0; + z-index: 999; +} + +.header .header-bg { + width: 100%; + height: 100%; + position: absolute; + z-index: 10; + left: 0; + top: 0; +} + + + +.header .navigation { + /* width: calc(100% - 46rpx); + margin-left: 46rpx; */ + display: flex; + align-items: center; + /* justify-content: center; */ + position: relative; + z-index: 100; +} + +.header .navigation .goback { + width: 16rpx; + margin-left: 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.header .navigation .goback image { + width: 16rpx; + height: 28rpx; +} + +.header .navigation .title { + display: flex; + align-items: center; + /* justify-content: center; */ + width: calc(100% - 46rpx); + margin-left: 46rpx; + color: rgba(255, 255, 255, 0.9); + font-size: 32rpx; + letter-spacing: 2rpx; +} + +.header .navigation .title .title-right { + /* margin-right: 46rpx; */ +} + +.home { + width: 100%; +} + +.belong-grid { + width: 100%; + height: 138rpx; + box-sizing: border-box; + padding-top: 16rpx; + position: relative; +} + +.belong-grid .newbelong-grid { + display: flex; + flex-direction: row; + align-items: flex-end; + justify-content: space-between; +} + +.belong-grid .belong-grid-bg { + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + z-index: 10; +} + +.belong-grid .newbelong-grid .grid { + margin-left: 28rpx; + /* width: 90%; */ + width: calc(100% - 234rpx); + height: 62rpx; + position: relative; + z-index: 100; + display: flex; + align-items: center; +} + +.belong-grid .newbelong-grid .grid image { + width: 532rpx; + height: 66rpx; +} + +.belong-grid .newbelong-grid .volunteer { + margin-right: 15rpx; + width: 108rpx; + height: 68rpx; + position: relative; + z-index: 100; + display: flex; + align-items: center; +} + +.belong-grid .newbelong-grid .volunteer image { + width: 100%; + height: 100%; +} + +/* banner 样式 */ +.banner-main { + position: absolute; + width: calc(100% - 60rpx); + height: 300rpx; + margin-left: 30rpx; + background-color: #fff; + z-index: 997; + margin-top: -36rpx; + box-shadow: 0px 6px 21px 0px rgba(122, 122, 122, 0.23); + border-radius: 17rpx; +} + + +.page-body { + /* padding-top: 30rpx; */ + /* background: #fff; */ +} + +.page-section { + width: 100%; + margin-bottom: 60rpx; +} + +.page-section_center { + display: flex; + flex-direction: column; + align-items: center; +} + +.page-section:last-child { + margin-bottom: 0; +} + +.page-section-gap { + box-sizing: border-box; + padding: 0 30rpx; +} + +.page-section-spacing { + box-sizing: border-box; + /* padding: 0 20rpx; */ + height: 300rpx; +} + +swiper { + height: 300rpx; +} + +.page-section-title { + font-size: 28rpx; + color: #999; + margin-bottom: 10rpx; + padding-left: 30rpx; + padding-right: 30rpx; +} + +.page-section-gap .page-section-title { + padding-left: 0; + padding-right: 0; +} + +.demo-text-1 { + position: relative; + align-items: center; + justify-content: center; + background-color: #1aad19; + color: #fff; + font-size: 36rpx; +} + +.demo-text-1:before { + content: 'A'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.demo-text-2 { + position: relative; + align-items: center; + justify-content: center; + background-color: #2782d7; + color: #fff; + font-size: 36rpx; +} + +.demo-text-2:before { + content: 'B'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.demo-text-3 { + position: relative; + align-items: center; + justify-content: center; + background-color: #f1f1f1; + color: #353535; + font-size: 36rpx; +} + +.demo-text-3:before { + content: 'C'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +button { + margin-bottom: 30rpx; +} + +button:last-child { + margin-bottom: 0; +} + +.page-section-title { + padding: 0; +} + +.swiper-item { + display: block; + height: 300rpx; +} + +.banner { + overflow: hidden; + height: 300rpx; + display: flex; + width: 100%; + border-radius: 16rpx; +} + +.dots { + display: flex; + justify-content: center; + margin-top: -23rpx; + z-index: 999; + position: relative; + + /* padding-bottom: 10rpx; */ +} + +.dots .dot { + width: 20rpx; + height: 6rpx; + margin-left: 8rpx; + background: rgba(247, 247, 247, 1); + opacity: 0.38; + border-radius: 3rpx; + transition: all 0.3s; +} + +.dots .dot.active { + width: 20rpx; + background: rgba(247, 247, 247, 1); + border-radius: 3rpx; + opacity: 1; + /* background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%); */ +} + +/* banner end */ + +.tab-all { + position: absolute; + width: 100%; + height: 370rpx; + background-color: #fff; + z-index: 996; +} + + +.tab-bar { + margin-top: 278rpx; + width: 100%; + height: 92rpx; + background: #fff; + display: flex; + align-items: center; + position: relative; +} + +.tab-bar .tab { + font-size: 34rpx; + font-weight: 500; + color: rgba(171, 171, 171, 1); + width: 25%; + height: 100%; + line-height: 92rpx; + /* text-indent: 20rpx; */ + text-align: center; + position: relative; + z-index: 10; +} + +.tab-bar .tab.select { + font-size: 36rpx; + font-weight: bold; + color: rgba(229, 15, 0, 1); +} + +.tab-bar .select-bar { + position: absolute; + left: 14rpx; + bottom: 0rpx; + width: 30rpx; + height: 8rpx; + border-radius: 4rpx; + background: #fc5555; + z-index: 1; +} + +.tab-bar .tab0.select-bar { + left: calc(12.5% - 15rpx); + transition: left 0.3s linear; +} + +.tab-bar .tab1.select-bar { + left: calc(37.5% - 15rpx); + transition: left 0.3s linear; +} + +.tab-bar .tab2.select-bar { + left: calc(62.5% - 15rpx); + transition: left 0.3s linear; +} + +.tab-bar .tab3.select-bar { + left: calc(87.5% - 15rpx); + transition: left 0.3s linear; +} + +.tab-bar .hover-tab { + background: #f7f7f7; +} + + +/* 内容 */ +.details-top { + margin-top: 385rpx; +} + +.volunteer-box { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + padding: 0rpx 40rpx 19rpx 40rpx; +} +.show { + padding: 0rpx 40rpx; + height: 24rpx; + font-size: 24rpx; + line-height: 24rpx; + font-weight: 500; + color: #C5C5C5; } \ No newline at end of file diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 538ab83..94c1e36 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -71,6 +71,9 @@ Page({ loadMoreType: "none", loadMoreVisible: false, defaultGridId:"",//默认网格 + leaderGridId:"", //领导网格6.22 + completeInfoDialogVisible: false, //完善信息 + homePagePhone: {} }, onShow: function () { if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) { @@ -126,6 +129,14 @@ Page({ // 获取默认网格 this.getResidentConfig() + api.getHomePhone().then( res => { + if (res.code === 0 && res.msg === "success") { + this.data.homePagePhone = res.data[0] + this.setData({ + homePagePhone: this.data.homePagePhone + }) + } + }) }, // 获取默认网格 getResidentConfig (){ @@ -137,6 +148,10 @@ Page({ that.setData({ defaultGridId:item.residentValue }) + } else if (item.residentType === "default_grid" && item.residentCode === "leader_grid") { + that.setData({ + leaderGridId:item.residentValue + }) } }) } @@ -415,6 +430,39 @@ Page({ }) } }, + // 我有事阅 6.22 + wysy () { + if(this.data.departmentId != this.data.leaderGridId){//领导网格处理 + wx.showToast({ + title: "无法使用该板块", + icon: "none", + duration: 3000 + }) + }else{ + if (this.verifyCompleteInfo()) { + return false + } + api.getScrip().then(res => { + if (res.code === 0 && res.msg === "success") { + console.log("getScrip",res.data) + wx.navigateToMiniProgram({ + appId: "wx3ea0a6fb71ddf659", + path: "pages/login/login?scrip="+res.data, + extraData: { + scrip: res.data + }, + envVersion: "trial",//trial //develop + success (res) { + console.log(res) + }, + fail (err) { + console.log(err) + } + }) + } + }) + } + }, dqhd () { wx.navigateTo({ url: "../../subpages/associationNew/pages/associationlist/associationlist" @@ -467,7 +515,7 @@ Page({ // return false wx.showModal({ title: "拨打电话", - content: `您确定拨打${e.currentTarget.dataset.number}`, + content: "", cancelColor: "#29B9A5", confirmColor: "#29B9A5", success: (res) => { @@ -481,5 +529,16 @@ Page({ } } }) + }, + // 检查 是否完善信息6.22 + verifyCompleteInfo () { + if (app.globalData.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return true + } else { + return false + } } }) \ No newline at end of file diff --git a/pages/indexNew/indexNew.json b/pages/indexNew/indexNew.json index c175821..0b63bd2 100644 --- a/pages/indexNew/indexNew.json +++ b/pages/indexNew/indexNew.json @@ -1,9 +1,10 @@ -{ - "navigationBarTitleText": "e锦水", - "navigationStyle": "custom", - "navigationBarTextStyle": "white", - "usingComponents": { - "nav-bar": "/components/navbar/index", - "load-more": "../../components/loadMore/loadMore" - } +{ + "navigationBarTitleText": "e锦水", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "usingComponents": { + "nav-bar": "/components/navbar/index", + "load-more": "../../components/loadMore/loadMore", + "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog" + } } \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml index 4007b30..10b6e37 100644 --- a/pages/indexNew/indexNew.wxml +++ b/pages/indexNew/indexNew.wxml @@ -1,163 +1,169 @@ - - - - e锦水 - - - - - - - - - - - {{departmentName}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 积分排名 - - - - 政策导航 - - - - 了解锦水 - - - - 个人中心 - - - - - - - {{item.newsTitle}} - - - {{item.deptName}}-{{item.newsCategoryName}} - {{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}} - - - - - - - - - - - - \ No newline at end of file + + + + e锦水 + + + + + + + + + + + {{departmentName}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 积分排名 + + + + 政策导航 + + + + 了解锦水 + + + + 个人中心 + + + + + + + {{item.newsTitle}} + + + {{item.deptName}}-{{item.newsCategoryName}} + {{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss index f0bb110..ac9a988 100644 --- a/pages/indexNew/indexNew.wxss +++ b/pages/indexNew/indexNew.wxss @@ -1,627 +1,633 @@ -page { - width: 100%; - height: auto; - overflow-y: auto; - background: #fff; -} - -.header { - position: fixed; - width: 100%; - top: 0; - left: 0; - z-index: 1000; -} - -.header .header-bg { - width: 100%; - height: 100%; - position: absolute; - z-index: 10; - left: 0; - top: 0; -} - -.header .navigation { - width: 100%; - display: flex; - align-items: center; - justify-content: center; - color: rgba(255, 255, 255, 0.9); - font-size: 32rpx; - position: relative; - z-index: 100; - letter-spacing: 2rpx; -} - -.home { - width: 100%; -} - -.belong-grid { - width: 100%; - height: 160rpx; - position: relative; -} - -.belong-grid .newbelong-grid { - display: flex; - flex-direction: row; - /* align-items: center; */ - justify-content: space-between; -} - -.belong-grid .belong-grid-bg { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - z-index: 10; -} - -.belong-grid .newbelong-grid .grid { - /* width: 90%; */ - width: calc(100% - 129rpx); - height: 34rpx; - position: relative; - z-index: 100; - display: flex; - align-items: center; -} - -.belong-grid .newbelong-grid .grid .party-logo { - width: 24rpx; - height: 30rpx; - margin: 0 14rpx 0 22rpx; -} - -.belong-grid .newbelong-grid .grid .grid-name { - font-size: 32rpx; - color: #fff; -} - -.belong-grid .newbelong-grid .grid .more-grid { - width: 16rpx; - height: 22rpx; - margin-left: 10rpx; - margin-top: 5rpx; -} - -.belong-grid .newbelong-grid .my-and-news { - width: 129rpx; - height: 34rpx; - position: relative; - z-index: 100; - display: flex; - align-items: center; - justify-content: flex-end; -} - -.belong-grid .newbelong-grid .my-and-news .news { - width: 34rpx; - height: 34rpx; - margin-right: 24rpx; -} - -.belong-grid .newbelong-grid .my-and-news .my { - width: 34rpx; - height: 34rpx; - margin-left: 30rpx; -} - -.belong-grid .newImage { - position: relative; - height: calc(100% - 34rpx); - z-index: 999; - display: flex; - align-items: center; - justify-content: center; -} - -.belong-grid .newImage image { - width: 576rpx; - height: 52rpx; -} - -/* .belong-grid .news { - width: 34rpx; - height: 34rpx; - margin-right: 22rpx; - position: relative; - z-index: 100; -} */ - -/* bannner *********** start */ - -.banner { - width: 100%; - height: 340rpx; -} - -.banner swiper { - width: 100%; - height: 340rpx; -} - -.banner-item { - width: 100%; - height: 340rpx; - position: relative; -} - -.banner-item .banner-img { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; -} - -.banner-item .banner-content { - position: relative; - width: 100%; - height: 100%; - top: 0; - left: 0; - z-index: 100; - display: flex; - align-items: flex-end; -} - -.banner-item .banner-content .title { - width: 100%; - height: 91rpx; - background: rgba(0, 0, 0, 0.4); - box-sizing: border-box; - padding: 0 20rpx; - display: flex; - /* align-items: center; */ - justify-content: space-between; -} - -.banner-item .banner-content .title .title-text { - width: 75%; - /* height: 50rpx; */ - color: #fff; - font-size: 26rpx; - /* line-height: 50rpx; */ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - margin-top: 10rpx; -} - -/* 自定义轮播指示点样式 */ - -.indication { - height: 70rpx; - display: flex; - position: absolute; - /* bottom: -2rpx; */ - right: 20rpx; - flex-direction: row; - /* align-items: center; */ - justify-content: center; -} - -/* 未选中指示点样式 */ - -.spot { - width: 10rpx; - height: 10rpx; - border-radius: 50%; - margin-right: 10rpx; - background-color: #c6c6c8; -} - -/*选中指示样式 */ - -.spot.active { - width: 10rpx; - height: 10rpx; - border-radius: 50%; - background-color: #fff; -} - -/* bannner *********** end */ - -/* 新版通知 */ - -.newnotice { - width: calc(100% - 88rpx); - height: 102rpx; - margin-left: 24rpx; - position: relative; - z-index: 888; - margin-top: -31rpx; - border-radius: 10rpx; - background: rgba(253, 253, 253, 1); - box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1); - padding: 0 20rpx; - display: flex; - align-items: center; -} - -.newnotice .image1 { - width: 599rpx; - height: 50rpx; -} - -.newnotice .image2 { - width: 174rpx; - height: 40rpx; - margin-left: 11rpx; -} - -.newnotice text { - font-size: 50rpx; - font-family: Impact; - font-weight: 400; - font-style: italic; - color: rgba(72, 72, 72, 1); - margin-left: 25rpx; -} - -/* 通知 start*/ - -.notice { - width: calc(100% - 88rpx); - height: 90rpx; - margin-left: 24rpx; - position: relative; - z-index: 888; - margin-top: -31rpx; - border-radius: 10rpx; - background: rgba(253, 253, 253, 1); - box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1); - padding: 0 20rpx; - display: flex; - align-items: center; -} - -.notice .left { - height: 28rpx; - width: calc(100% - 44rpx); - display: flex; - align-items: center; -} - -.notice .left image { - height: 28rpx; - width: 62rpx; -} - -.notice .left .circle { - width: 8rpx; - height: 8rpx; - background: #666; - border-radius: 50%; - margin-left: 21rpx; -} - -.notice .left .notice-info { - height: 24rpx; - width: calc(100%-148rpx); - font-size: 24rpx; - font-weight: 500; - color: rgba(153, 153, 153, 1); - line-height: 24rpx; - margin-left: 22rpx; -} - -/* 滚动start */ - -.havenotice { - overflow: hidden; - display: flex; - justify-content: space-between; - align-items: center; - height: 100%; - width: calc(100%-148rpx); -} - -.notice-broadcast-content { - margin-left: 12rpx; - width: 85%; - height: 20px; - position: relative; - top: 1px; - overflow: hidden; -} - -.notice_list { - width: 100%; -} - -.li { - color: #333; - font-size: 28rpx; - width: 100%; - height: 40rpx; - line-height: 40rpx; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.notice-broadcast-more { - font-size: 28rpx; - font-weight: normal; - color: #ffa650; - margin-top: 16rpx; -} - -.nomorenotice { - color: #666; - margin-left: 14rpx; -} - -.swiperitem { - height: 100%; - line-height: 30rpx; -} - -.swiper-txt { - font-size: 28rpx; - color: #333; - line-height: 40rpx; -} - -.swiper-position { - position: absolute; - margin: -20rpx 0 0 20rpx; - width: calc(100% - 200rpx); - z-index: 2; - height: 46rpx; - overflow: hidden; -} - -.swiperview .wx-swiper-dots { - display: none; -} - -/* 滚动end */ - -.notice .right { - height: 32rpx; - width: 44rpx; - position: relative; -} - -.notice .right image { - position: absolute; - width: 100%; - height: 100%; - left: 0px; - top: 0px; -} - -.notice .right .name { - position: absolute; - text-align: center; - width: 100%; - height: 100%; - left: 0px; - top: 0px; - font-size: 22rpx; - font-weight: 500; - color: rgba(255, 255, 255, 1); - line-height: 32rpx; -} - -/* 通知 end*/ - -/* 我有事说新版 */ - -.grid-all-new { - height: 278rpx; - width: calc(100% - 42rpx); - margin-top: 29rpx; - margin-left: 21rpx; -} - -.grid-all-new .weui-btn-left { - height: 100%; - width: 50%; - padding: 0; - border: none; - float: left; -} - -.hover-btn { - box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); - border: 1px solid #666; -} - -.weui-btn-left+.weui-btn-left { - margin-top: 0 !important; -} - -.grid-all-new .weui-btn-left image { - height: 100%; - width: 100%; -} - -.grid-all-new .weui-btn-right { - height: 100%; - width: 50%; - float: left; -} - -.grid-all-new .weui-btn-right .weui-btn-top { - height: 50%; - width: 100%; - padding: 0; - border: none; -} - -.weui-btn-top+.weui-btn-top { - margin-top: 0 !important; -} - -.grid-all-new .weui-btn-right .weui-btn-top image { - height: 100%; - width: 100%; -} - -/* 我有事说 */ - -.grid-all { - height: 356rpx; - width: calc(100% - 54rpx); - margin-top: 29rpx; - margin-left: 27rpx; -} - -.grid-all .weui-btn { - height: 50%; - width: 50%; - padding: 0; - border: none; - float: left; -} - -.hover-btn { - box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); - border: 1px solid #666; -} - -.weui-btn+.weui-btn { - margin-top: 0 !important; -} - -.grid-all .weui-btn image { - height: 100%; - width: 100%; -} - -/* 我有事说 end*/ - -/* 列表样式 */ - -.list-all { - width: calc(100% - 48rpx); - margin-left: 21rpx; - margin-top: 50rpx; -} - -.list-all .list-item { - border-bottom: 1rpx solid #eaeaea; - padding: 41rpx 18rpx 31rpx 15rpx; - display: flex; - /* align-items: center; */ -} - -.list-all .list-item:first-child { - border-top: 1rpx solid #eaeaea; -} - -.list-all .list-item:last-child { - border-bottom: none; -} - -.list-all .list-item .item-info { - width: calc(100% - 220rpx); - height: 146rpx; - position: relative; -} - -.list-all .list-item .item-info .item-info-name { - width: calc(100% - 47rpx); - font-size: 32rpx; - font-weight: 500; - color: rgba(63, 63, 63, 1); - line-height: 50rpx; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; -} - -.list-all .list-item .item-info .item-info-time { - width: calc(100% - 23rpx); - height: 22rpx; - position: absolute; - bottom: 5rpx; - display: flex; - flex-direction: row; - justify-content: space-between; -} - -.list-all .list-item .item-info .item-info-time text { - font-size: 22rpx; - font-weight: 500; - color: rgba(170, 170, 170, 1); - line-height: 22rpx; -} - -.list-all .list-item image { - width: 220rpx; - height: 146rpx; - border-radius: 10rpx; -} - -.list-all .list-item .label { - position: absolute; - z-index: 999; - width: 34rpx; - height: 34rpx; - right: 45rpx; -} - -.list-all .list-item .label image { - position: absolute; - width: 100%; - height: 100%; -} - -.nomorenews { - display: flex; - justify-content: center; - align-items: center; - font-size: 28rpx; - color: #999; - padding: 20rpx; -} - -/* 九宫格 */ - -.grid-new { - width: 100%; - height: 174rpx; -} - -.grid-new-item { - width: 25%; - height: 174rpx; - float: left; - /* display: flex; - justify-content: center; *//* align-items: center; */ -} - -.grid-new-item .grid-new-text { - height: 48rpx; - width: 100%; - font-size: 28rpx; - line-height: 48rpx; - font-weight: 500; - color: rgba(63, 63, 63, 1); - text-align: center; -} - -.grid-new-item .grid-new-btn { - height: 126rpx; - width: 126rpx; - padding: 0; - border: none; -} - -.grid-new-btn+.grid-new-btn { - margin-top: 0 !important; -} - -.grid-new-item .grid-new-btn image { - height: 100%; - width: 100%; -} +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #fff; +} + +.header { + position: fixed; + width: 100%; + top: 0; + left: 0; + z-index: 1000; +} + +.header .header-bg { + width: 100%; + height: 100%; + position: absolute; + z-index: 10; + left: 0; + top: 0; +} + +.header .navigation { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + color: rgba(255, 255, 255, 0.9); + font-size: 32rpx; + position: relative; + z-index: 100; + letter-spacing: 2rpx; +} + +.home { + width: 100%; +} + +.belong-grid { + width: 100%; + height: 160rpx; + position: relative; +} + +.belong-grid .newbelong-grid { + display: flex; + flex-direction: row; + /* align-items: center; */ + justify-content: space-between; +} + +.belong-grid .belong-grid-bg { + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + z-index: 10; +} + +.belong-grid .newbelong-grid .grid { + /* width: 90%; */ + width: calc(100% - 129rpx); + height: 34rpx; + position: relative; + z-index: 100; + display: flex; + align-items: center; +} + +.belong-grid .newbelong-grid .grid .party-logo { + width: 24rpx; + height: 30rpx; + margin: 0 14rpx 0 22rpx; +} + +.belong-grid .newbelong-grid .grid .grid-name { + font-size: 32rpx; + color: #fff; +} + +.belong-grid .newbelong-grid .grid .more-grid { + width: 16rpx; + height: 22rpx; + margin-left: 10rpx; + margin-top: 5rpx; +} + +.belong-grid .newbelong-grid .my-and-news { + width: 129rpx; + height: 34rpx; + position: relative; + z-index: 100; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.belong-grid .newbelong-grid .my-and-news .news { + width: 34rpx; + height: 34rpx; + margin-right: 24rpx; +} + +.belong-grid .newbelong-grid .my-and-news .my { + width: 34rpx; + height: 34rpx; + margin-left: 30rpx; +} + +.belong-grid .newImage { + position: relative; + height: calc(100% - 34rpx); + z-index: 999; + display: flex; + align-items: center; + justify-content: center; +} + +.belong-grid .newImage image { + width: 576rpx; + height: 52rpx; +} + +/* .belong-grid .news { + width: 34rpx; + height: 34rpx; + margin-right: 22rpx; + position: relative; + z-index: 100; +} */ + +/* bannner *********** start */ + +.banner { + width: 100%; + height: 340rpx; +} + +.banner swiper { + width: 100%; + height: 340rpx; +} + +.banner-item { + width: 100%; + height: 340rpx; + position: relative; +} + +.banner-item .banner-img { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; +} + +.banner-item .banner-content { + position: relative; + width: 100%; + height: 100%; + top: 0; + left: 0; + z-index: 100; + display: flex; + align-items: flex-end; +} + +.banner-item .banner-content .title { + width: 100%; + height: 91rpx; + background: rgba(0, 0, 0, 0.4); + box-sizing: border-box; + padding: 0 20rpx; + display: flex; + /* align-items: center; */ + justify-content: space-between; +} + +.banner-item .banner-content .title .title-text { + width: 75%; + /* height: 50rpx; */ + color: #fff; + font-size: 26rpx; + /* line-height: 50rpx; */ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-top: 10rpx; +} + +/* 自定义轮播指示点样式 */ + +.indication { + height: 70rpx; + display: flex; + position: absolute; + /* bottom: -2rpx; */ + right: 20rpx; + flex-direction: row; + /* align-items: center; */ + justify-content: center; +} + +/* 未选中指示点样式 */ + +.spot { + width: 10rpx; + height: 10rpx; + border-radius: 50%; + margin-right: 10rpx; + background-color: #c6c6c8; +} + +/*选中指示样式 */ + +.spot.active { + width: 10rpx; + height: 10rpx; + border-radius: 50%; + background-color: #fff; +} + +/* bannner *********** end */ + +/* 新版通知 */ + +.newnotice { + width: calc(100% - 88rpx); + height: 102rpx; + margin-left: 24rpx; + position: relative; + z-index: 888; + margin-top: -31rpx; + border-radius: 10rpx; + background: rgba(253, 253, 253, 1); + box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1); + padding: 0 20rpx; + display: flex; + align-items: center; +} + +.image-call { + width: 126rpx; + height: 72rpx; + margin-left: 70rpx; +} +.newnotice .image1 { + width: 456rpx; + height: 50rpx; +} + +.newnotice .image2 { + width: 174rpx; + height: 40rpx; + margin-left: 11rpx; +} + +.newnotice text { + font-size: 50rpx; + font-family: Impact; + font-weight: 400; + font-style: italic; + color: rgba(72, 72, 72, 1); + margin-left: 25rpx; +} + +/* 通知 start*/ + +.notice { + width: calc(100% - 88rpx); + height: 90rpx; + margin-left: 24rpx; + position: relative; + z-index: 888; + margin-top: -31rpx; + border-radius: 10rpx; + background: rgba(253, 253, 253, 1); + box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1); + padding: 0 20rpx; + display: flex; + align-items: center; +} + +.notice .left { + height: 28rpx; + width: calc(100% - 44rpx); + display: flex; + align-items: center; +} + +.notice .left image { + height: 28rpx; + width: 62rpx; +} + +.notice .left .circle { + width: 8rpx; + height: 8rpx; + background: #666; + border-radius: 50%; + margin-left: 21rpx; +} + +.notice .left .notice-info { + height: 24rpx; + width: calc(100%-148rpx); + font-size: 24rpx; + font-weight: 500; + color: rgba(153, 153, 153, 1); + line-height: 24rpx; + margin-left: 22rpx; +} + +/* 滚动start */ + +.havenotice { + overflow: hidden; + display: flex; + justify-content: space-between; + align-items: center; + height: 100%; + width: calc(100%-148rpx); +} + +.notice-broadcast-content { + margin-left: 12rpx; + width: 85%; + height: 20px; + position: relative; + top: 1px; + overflow: hidden; +} + +.notice_list { + width: 100%; +} + +.li { + color: #333; + font-size: 28rpx; + width: 100%; + height: 40rpx; + line-height: 40rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.notice-broadcast-more { + font-size: 28rpx; + font-weight: normal; + color: #ffa650; + margin-top: 16rpx; +} + +.nomorenotice { + color: #666; + margin-left: 14rpx; +} + +.swiperitem { + height: 100%; + line-height: 30rpx; +} + +.swiper-txt { + font-size: 28rpx; + color: #333; + line-height: 40rpx; +} + +.swiper-position { + position: absolute; + margin: -20rpx 0 0 20rpx; + width: calc(100% - 200rpx); + z-index: 2; + height: 46rpx; + overflow: hidden; +} + +.swiperview .wx-swiper-dots { + display: none; +} + +/* 滚动end */ + +.notice .right { + height: 32rpx; + width: 44rpx; + position: relative; +} + +.notice .right image { + position: absolute; + width: 100%; + height: 100%; + left: 0px; + top: 0px; +} + +.notice .right .name { + position: absolute; + text-align: center; + width: 100%; + height: 100%; + left: 0px; + top: 0px; + font-size: 22rpx; + font-weight: 500; + color: rgba(255, 255, 255, 1); + line-height: 32rpx; +} + +/* 通知 end*/ + +/* 我有事说新版 */ + +.grid-all-new { + height: 278rpx; + width: calc(100% - 42rpx); + margin-top: 29rpx; + margin-left: 21rpx; + margin-bottom: 29rpx; +} + +.grid-all-new .weui-btn-left { + height: 100%; + width: 50%; + padding: 0; + border: none; + float: left; +} + +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); + border: 1px solid #666; +} + +.weui-btn-left+.weui-btn-left { + margin-top: 0 !important; +} + +.grid-all-new .weui-btn-left image { + height: 100%; + width: 100%; +} + +.grid-all-new .weui-btn-right { + height: 100%; + width: 50%; + float: left; +} + +.grid-all-new .weui-btn-right .weui-btn-top { + height: 50%; + width: 100%; + padding: 0; + border: none; +} + +.weui-btn-top+.weui-btn-top { + margin-top: 0 !important; +} + +.grid-all-new .weui-btn-right .weui-btn-top image { + height: 100%; + width: 100%; +} + +/* 我有事说 */ + +.grid-all { + height: 356rpx; + width: calc(100% - 54rpx); + margin-top: 29rpx; + margin-left: 27rpx; +} + +.grid-all .weui-btn { + height: 50%; + width: 50%; + padding: 0; + border: none; + float: left; +} + +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); + border: 1px solid #666; +} + +.weui-btn+.weui-btn { + margin-top: 0 !important; +} + +.grid-all .weui-btn image { + height: 100%; + width: 100%; +} + +/* 我有事说 end*/ + +/* 列表样式 */ + +.list-all { + width: calc(100% - 48rpx); + margin-left: 21rpx; + margin-top: 50rpx; +} + +.list-all .list-item { + border-bottom: 1rpx solid #eaeaea; + padding: 41rpx 18rpx 31rpx 15rpx; + display: flex; + /* align-items: center; */ +} + +.list-all .list-item:first-child { + border-top: 1rpx solid #eaeaea; +} + +.list-all .list-item:last-child { + border-bottom: none; +} + +.list-all .list-item .item-info { + width: calc(100% - 220rpx); + height: 146rpx; + position: relative; +} + +.list-all .list-item .item-info .item-info-name { + width: calc(100% - 47rpx); + font-size: 32rpx; + font-weight: 500; + color: rgba(63, 63, 63, 1); + line-height: 50rpx; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} + +.list-all .list-item .item-info .item-info-time { + width: calc(100% - 23rpx); + height: 22rpx; + position: absolute; + bottom: 5rpx; + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.list-all .list-item .item-info .item-info-time text { + font-size: 22rpx; + font-weight: 500; + color: rgba(170, 170, 170, 1); + line-height: 22rpx; +} + +.list-all .list-item image { + width: 220rpx; + height: 146rpx; + border-radius: 10rpx; +} + +.list-all .list-item .label { + position: absolute; + z-index: 999; + width: 34rpx; + height: 34rpx; + right: 45rpx; +} + +.list-all .list-item .label image { + position: absolute; + width: 100%; + height: 100%; +} + +.nomorenews { + display: flex; + justify-content: center; + align-items: center; + font-size: 28rpx; + color: #999; + padding: 20rpx; +} + +/* 九宫格 */ + +.grid-new { + width: 100%; + height: 174rpx; +} + +.grid-new-item { + width: 25%; + height: 174rpx; + float: left; + /* display: flex; + justify-content: center; *//* align-items: center; */ +} + +.grid-new-item .grid-new-text { + height: 48rpx; + width: 100%; + font-size: 28rpx; + line-height: 48rpx; + font-weight: 500; + color: rgba(63, 63, 63, 1); + text-align: center; +} + +.grid-new-item .grid-new-btn { + height: 126rpx; + width: 126rpx; + padding: 0; + border: none; +} + +.grid-new-btn+.grid-new-btn { + margin-top: 0 !important; +} + +.grid-new-item .grid-new-btn image { + height: 100%; + width: 100%; +} diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 57b103a..4c922fa 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.10" + const versionNum = "1.4.11" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index f61efa7..b41f7fd 100644 --- a/project.config.json +++ b/project.config.json @@ -65,7 +65,7 @@ "id": 0, "name": "带参数二维码", "pathName": "pages/index/index", - "query": "scene=1215152928323555330&inviteUserId=12345", + "query": "scene=1277169327606366209&inviteUserId=12345", "scene": 1011 }, { diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js index d52f4bb..84b4f04 100644 --- a/subpages/integralCentre/pages/index/index.js +++ b/subpages/integralCentre/pages/index/index.js @@ -1,7 +1,8 @@ // subpages/integralCentre/pages/index/index.js import { pointsRecordlist, - userPointsRankinglist + userPointsRankinglist, + gradeRankinglist } from "../../../../utils/api" import { getTimestamp @@ -30,11 +31,16 @@ Page({ type: "1", name: "街道排名", select: false + }, + { + type: "2", + name: "等级排名", + select: false } ], timestamp: getTimestamp(), loadMoreType: "none", - loadMoreVisible: false, + loadMoreVisible: false }, /** * 生命周期函数--监听页面加载 @@ -87,8 +93,11 @@ Page({ loadMoreType: "loading", loadMoreVisible: true, }) - - that.pointsRankinglist() + if ( e.currentTarget.dataset.type == "2") { + that.gradeRankinglist() + } else { + that.pointsRankinglist() + } }, // 积分记录-积分排行接口 @@ -172,6 +181,11 @@ Page({ }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () {}, + /** * 生命周期函数--监听页面隐藏 */ @@ -200,11 +214,9 @@ Page({ this.setData({ loadMoreVisible: true }) - if (this.data.selectTab == "tab1") { // this.pointsRankinglist(); //积分排行 } else { - if (this.data.loadMoreType === "loading") { this.setData({ pageIndex: this.data.pageIndex + 1, @@ -217,6 +229,41 @@ Page({ } }, + //6.28 等级排行榜 + gradeRankinglist () { + let that = this + const para = { + pageIndex: 1, + pageSize: 20, + timestamp: getTimestamp() + } + gradeRankinglist(para).then(res => { + that.setData({ + pointsRankingUser: res.data.currentUser, + pointsRankinglist: that.data.pointsRankinglist.concat(res.data.rank), + }) + if (that.data.pointsRankinglist.length > 0) { + that.setData({ + nodatapointsRanking: false, + loadMoreType: "none", + }) + } else { + that.setData({ + nodatapointsRanking: true, + loadMoreType: "none", + loadMoreVisible: false, + }) + } + }).catch(err => { + that.setData({ + pointsRankinglist: [], + nodatapointsRanking: true, + loadMoreType: "none", + loadMoreVisible: false, + }) + console.log(err) + }) + }, /** * 用户点击右上角分享 */ diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml index 67aaec3..98bdfc8 100644 --- a/subpages/integralCentre/pages/index/index.wxml +++ b/subpages/integralCentre/pages/index/index.wxml @@ -1,73 +1,73 @@ - - - {{points}} - 积分 - - - - 积分排行 - 积分记录 - - - - - - - - - - - - - {{pointsRankingUser.rank}} - - - {{pointsRankingUser.realName}} - - {{pointsRankingUser.points}} - - 注：该排行仅显示已完善信息用户 - - - - - - - - - - {{item.rank}} - - - {{item.realName}} - - {{item.points}} - - - - - - - - - 事件名称 - 积分 - 时间 - - - - {{item.ruleDesc}} - - - - +{{item.points}} - {{item.operationTime}} - - - - - + + + {{points}} + 积分 + + + + 积分排行 + 积分记录 + + + + + + + + + + + + + {{pointsRankingUser.rank}} + + + {{pointsRankingUser.realName||pointsRankingUser.nickName}} + + {{pointsRankingUser.points||pointsRankingUser.grade}} + + 注：该排行仅显示已完善信息用户 + + + + + + + + + + {{item.rank}} + + + {{item.realName||item.nickName}} + + {{item.points||item.grade}} + + + + + + + + + 事件名称 + 积分 + 时间 + + + + {{item.ruleDesc}} + + - + +{{item.points}} + {{item.operationTime}} + + + + + \ No newline at end of file diff --git a/subpages/understandJs/pages/archives/archives.js b/subpages/understandJs/pages/archives/archives.js index d840282..014245e 100644 --- a/subpages/understandJs/pages/archives/archives.js +++ b/subpages/understandJs/pages/archives/archives.js @@ -11,6 +11,9 @@ Page({ /** * 生命周期函数--监听页面加载 */ + onLoad: function () { + + }, /** * 生命周期函数--监听页面初次渲染完成 @@ -59,5 +62,13 @@ Page({ */ onShareAppMessage: function () { + }, + + searchFile () { + wx.showToast({ + title: "未查询到相关档案", + icon: "none", + duration: 2000 + }) } }) \ No newline at end of file diff --git a/subpages/understandJs/pages/archives/archives.wxml b/subpages/understandJs/pages/archives/archives.wxml index 7cc817e..7a7bb79 100644 --- a/subpages/understandJs/pages/archives/archives.wxml +++ b/subpages/understandJs/pages/archives/archives.wxml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - - - 玫瑰街道医疗物质采购档案 - - - 存放位置：玫瑰街道档案室 - - - - 玫瑰街道医疗物质采购档案 - - - 存放位置：玫瑰街道档案室 - - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js index 52c4def..ad5803a 100644 --- a/subpages/understandJs/pages/index/index.js +++ b/subpages/understandJs/pages/index/index.js @@ -85,14 +85,14 @@ Page({ url: `../sclerotia/sclerotia?modulecode=${e.currentTarget.dataset.modulecode}` }) } else if (e.currentTarget.dataset.modulecode == "module_file") {//档案 - wx.showToast({ - title: "敬请期待", - icon: "none", - duration: 1000 - }) - // wx.navigateTo({ - // url: '../archives/archives' + // wx.showToast({ + // title: '敬请期待', + // icon: 'none', + // duration: 1000 // }) + wx.navigateTo({ + url: "../archives/archives" + }) } } }) \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index d729177..49aa293 100644 --- a/utils/api.js +++ b/utils/api.js @@ -52,7 +52,10 @@ module.exports = { completePartyInfoV2: completePartyInfoV2, userPointsRankinglist:userPointsRankinglist, getDefaultGridInfo:getDefaultGridInfo, - getResidentConfig:getResidentConfig + getResidentConfig:getResidentConfig, + getScrip:getScrip, + getHomePhone:getHomePhone, + gradeRankinglist:gradeRankinglist } function getToken (wxCode) { @@ -169,7 +172,7 @@ function changeGrid (gridId) { * @param {*} param0 */ // function getUserInfo() { -// return fly.get("/app-user/user/getInfoById") +// return fly.get('/app-user/user/getInfoById') // } function getUserInfo () { return fly.get("app-user/user/getInfoById") @@ -383,7 +386,7 @@ function clock (data) { // * 志愿者认证 // */ // function authenticate(data) { -// return fly.post("app-user/volunteer/authenticate", data) +// return fly.post('app-user/volunteer/authenticate', data) // } /** @@ -484,4 +487,33 @@ function getDefaultGridInfo () { // 获取居民端配置 function getResidentConfig () { return fly.get("residentConfig/getResidentConfig") +} + +// *****************************获取临时凭证接口****6.22***************end +// 获取临时凭证用于跳转到数据端 +function getScrip () { + return fly.post("admin/getScrip") +} +// 获取首页电话 +function getHomePhone () { + return fly.get("imgConfig/getImgUrl/3") +} + +/** + * 积分记录-等级排行接口 6.28 + * timestamp String 第一页查询发起时的时间 + * pageIndex Number 页码 + * pageSize Number 页容量 + */ + +function gradeRankinglist ({ + timestamp, + pageIndex, + pageSize +}) { + return fly.get("app-user/user/gradeRanking/list", { + timestamp, + pageIndex, + pageSize + }) } \ No newline at end of file