From b188463cc00ce1a3a1534bbc49ce705eafea142d Mon Sep 17 00:00:00 2001 From: FightingN <18300240052@163.com> Date: Fri, 22 Jan 2021 17:17:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/integralCentre.js | 25 ++ app.json | 377 +++++++++--------- components/loadMore/loadMore.js | 4 +- components/loadMore/loadMore.wxml | 2 +- project.config.json | 26 +- subpages/integralCentre/images/code.png | Bin 0 -> 1701 bytes subpages/integralCentre/images/exchange.png | Bin 0 -> 8781 bytes .../pages/exchangeIndex/exchangeIndex.js | 79 ++++ .../pages/exchangeIndex/exchangeIndex.json | 9 + .../pages/exchangeIndex/exchangeIndex.wxml | 33 ++ .../pages/exchangeIndex/exchangeIndex.wxss | 113 ++++++ subpages/integralCentre/pages/index/index.js | 68 ++-- .../integralCentre/pages/index/index.json | 3 +- .../integralCentre/pages/index/index.wxml | 29 +- .../integralCentre/pages/index/index.wxss | 49 ++- utils/config.js | 1 + 16 files changed, 568 insertions(+), 250 deletions(-) create mode 100644 api/integralCentre.js create mode 100644 subpages/integralCentre/images/code.png create mode 100644 subpages/integralCentre/images/exchange.png create mode 100644 subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js create mode 100644 subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json create mode 100644 subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml create mode 100644 subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss diff --git a/api/integralCentre.js b/api/integralCentre.js new file mode 100644 index 0000000..47d688d --- /dev/null +++ b/api/integralCentre.js @@ -0,0 +1,25 @@ +const request = require("../utils/request") +/** + * 获取积分核销兑换码 + */ +export function getCode() { + return request.get("userpointsverification/getqrcode") +} +/** + * 获取居民兑换记录接口 + * @param behaviorCode 积分动作编码 + * @param pageIndex Number 页码 + * @param pageSize Number 页容量 + */ + +export function getPointsLogs({ + behaviorCode, + pageIndex, + pageSize +}) { + return request.get("userpointsverification/getpointslogs", { + behaviorCode, + pageIndex, + pageSize + }) +} \ No newline at end of file diff --git a/app.json b/app.json index d195bee..9a5ac81 100644 --- a/app.json +++ b/app.json @@ -1,189 +1,190 @@ -{ - "pages": [ - "pages/start/start", - "pages/indexNew/indexNew", - "pages/index/index", - "pages/mine/mine", - "pages/association/association", - "pages/discussion/discussion", - "pages/toRegister/toRegister", - "pages/toScan/toScan", - "pages/complete/complete", - "pages/formid/formid", - "pages/register/register", - "pages/detail/detail", - "pages/accept/accept", - "pages/gridLeaderRegister/gridLeaderRegister", - "pages/heart/heart", - "pages/heartNew/heartNew" - ], - "subPackages": [ - { - "root": "subpages/home", - "name": "home", - "pages": [ - "pages/webview/webview", - "pages/agreement/agreement", - "pages/notice/notice", - "pages/noticeNew/noticeNew", - "pages/info/info", - "pages/noticeDetail/noticeDetail", - "pages/newsDetail/newsDetail", - "pages/newsList/newsList", - "pages/messageDetail/messageDetail" - ] - }, - { - "root": "subpages/changegrid", - "name": "changeGrid", - "pages": [ - "pages/changeGrid/changeGrid" - ] - }, - { - "root": "subpages/association", - "name": "association", - "pages": [ - "pages/joinassociation/joinassociation", - "pages/createassociation/createassociation", - "pages/associationMember/associationMember", - "pages/associationDetail/associationDetail", - "pages/inviteFriend/inviteFriend", - "pages/incomingVerify/incomingVerify", - "pages/unpassAssociation/unpassAssociation", - "pages/topicList/topicList", - "pages/addTopic/addTopic", - "pages/topicDetail/topicDetail", - "pages/replyOrRemark/replyOrRemark", - "pages/changeToIssue/changeToIssue" - ] - }, - { - "root": "subpages/associationNew", - "name": "associationNew", - "pages": [ - "pages/associationlist/associationlist", - "pages/community/community", - "pages/gMembersList/gMembersList", - "pages/gOfficialsList/gOfficialsList", - "pages/talklist/talklist", - "pages/eventlist/eventlist", - "pages/addTopic/addTopic", - "pages/guideInfo/guideInfo" - ] - }, - { - "root": "subpages/discussion", - "name": "discussion", - "pages": [ - "pages/addIssue/addIssue", - "pages/discussionDetail/discussionDetail", - "pages/publishEvaluation/publishEvaluation", - "pages/remarkOrReply/remarkOrReply", - "pages/searchDiscussion/searchDiscussion", - "pages/categoryList/categoryList" - ] - }, - { - "root": "subpages/mine", - "name": "mine", - "pages": [ - "pages/eventDetail/eventDetail", - "pages/inviteRecord/inviteRecord", - "pages/gridManage/gridManage" - ] - }, - { - "root": "subpages/integralCentre", - "name": "integralCentre", - "pages": [ - "pages/index/index" - ] - }, - { - "root": "subpages/heart", - "pages": [ - "pages/heartDetail/heartDetail", - "pages/leaderboard/leaderboard", - "pages/leaderboardNew/leaderboardNew", - "pages/myNews/myNews", - "pages/clockIn/clockIn", - "pages/volunteer/volunteer", - "pages/signed/signed", - "pages/refusedOrEndedDetail/refusedOrEndedDetail", - "pages/cancelDetail/cancelDetail", - "pages/noticeDetail/noticeDetail", - "pages/myApply/myApply", - "pages/myApplyList/myApplyList", - "pages/myApplyDetail/myApplyDetail", - "pages/bannerDetail/bannerDetail", - "pages/groupBuyList/groupBuyList", - "pages/groupBuyListMy/groupBuyListMy", - "pages/groupBuyDetail/groupBuyDetail", - "pages/groupBuyConfirmList/groupBuyConfirmList", - "pages/evaluate/evaluate", - "pages/dropByList/dropByList", - "pages/groupBuyPublish/groupBuyPublish", - "pages/dropByPublish/dropByPublish", - "pages/noticeNewDetail/noticeNewDetail", - "pages/noticeNewList/noticeNewList" - ] - }, - { - "root": "subpages/oneKeyService", - "pages": [ - "pages/index/index", - "pages/directTo/directTo", - "pages/archives/archives", - "pages/archivesDept/archivesDept", - "pages/archivesDetail/archivesDetail", - "pages/noticeDetail/noticeDetail", - "pages/moduleList/moduleList", - "pages/reportIssue/reportIssue", - "pages/reportIssueList/reportIssueList", - "pages/reportIssueDetail/reportIssueDetail" - ] - } - ], - "preloadRule": { - "pages/indexNew/indexNew": { - "network": "all", - "packages": [ - "subpages/changegrid" - ] - }, - "pages/discussion/discussion": { - "network": "all", - "packages": [ - "discussion" - ] - }, - "pages/association/association": { - "network": "all", - "packages": [ - "subpages/association" - ] - }, - "pages/mine/mine": { - "network": "all", - "packages": [ - "mine" - ] - } - }, - "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "black" - }, - "networkTimeout": { - "request": 6000 - }, - "permission": { - "scope.userLocation": { - "desc": "e锦水将获取您的位置信息" - } - }, - "sitemapLocation": "sitemap.json" +{ + "pages": [ + "pages/start/start", + "pages/indexNew/indexNew", + "pages/index/index", + "pages/mine/mine", + "pages/association/association", + "pages/discussion/discussion", + "pages/toRegister/toRegister", + "pages/toScan/toScan", + "pages/complete/complete", + "pages/formid/formid", + "pages/register/register", + "pages/detail/detail", + "pages/accept/accept", + "pages/gridLeaderRegister/gridLeaderRegister", + "pages/heart/heart", + "pages/heartNew/heartNew" + ], + "subPackages": [ + { + "root": "subpages/home", + "name": "home", + "pages": [ + "pages/webview/webview", + "pages/agreement/agreement", + "pages/notice/notice", + "pages/noticeNew/noticeNew", + "pages/info/info", + "pages/noticeDetail/noticeDetail", + "pages/newsDetail/newsDetail", + "pages/newsList/newsList", + "pages/messageDetail/messageDetail" + ] + }, + { + "root": "subpages/changegrid", + "name": "changeGrid", + "pages": [ + "pages/changeGrid/changeGrid" + ] + }, + { + "root": "subpages/association", + "name": "association", + "pages": [ + "pages/joinassociation/joinassociation", + "pages/createassociation/createassociation", + "pages/associationMember/associationMember", + "pages/associationDetail/associationDetail", + "pages/inviteFriend/inviteFriend", + "pages/incomingVerify/incomingVerify", + "pages/unpassAssociation/unpassAssociation", + "pages/topicList/topicList", + "pages/addTopic/addTopic", + "pages/topicDetail/topicDetail", + "pages/replyOrRemark/replyOrRemark", + "pages/changeToIssue/changeToIssue" + ] + }, + { + "root": "subpages/associationNew", + "name": "associationNew", + "pages": [ + "pages/associationlist/associationlist", + "pages/community/community", + "pages/gMembersList/gMembersList", + "pages/gOfficialsList/gOfficialsList", + "pages/talklist/talklist", + "pages/eventlist/eventlist", + "pages/addTopic/addTopic", + "pages/guideInfo/guideInfo" + ] + }, + { + "root": "subpages/discussion", + "name": "discussion", + "pages": [ + "pages/addIssue/addIssue", + "pages/discussionDetail/discussionDetail", + "pages/publishEvaluation/publishEvaluation", + "pages/remarkOrReply/remarkOrReply", + "pages/searchDiscussion/searchDiscussion", + "pages/categoryList/categoryList" + ] + }, + { + "root": "subpages/mine", + "name": "mine", + "pages": [ + "pages/eventDetail/eventDetail", + "pages/inviteRecord/inviteRecord", + "pages/gridManage/gridManage" + ] + }, + { + "root": "subpages/integralCentre", + "name": "integralCentre", + "pages": [ + "pages/index/index", + "pages/exchangeIndex/exchangeIndex" + ] + }, + { + "root": "subpages/heart", + "pages": [ + "pages/heartDetail/heartDetail", + "pages/leaderboard/leaderboard", + "pages/leaderboardNew/leaderboardNew", + "pages/myNews/myNews", + "pages/clockIn/clockIn", + "pages/volunteer/volunteer", + "pages/signed/signed", + "pages/refusedOrEndedDetail/refusedOrEndedDetail", + "pages/cancelDetail/cancelDetail", + "pages/noticeDetail/noticeDetail", + "pages/myApply/myApply", + "pages/myApplyList/myApplyList", + "pages/myApplyDetail/myApplyDetail", + "pages/bannerDetail/bannerDetail", + "pages/groupBuyList/groupBuyList", + "pages/groupBuyListMy/groupBuyListMy", + "pages/groupBuyDetail/groupBuyDetail", + "pages/groupBuyConfirmList/groupBuyConfirmList", + "pages/evaluate/evaluate", + "pages/dropByList/dropByList", + "pages/groupBuyPublish/groupBuyPublish", + "pages/dropByPublish/dropByPublish", + "pages/noticeNewDetail/noticeNewDetail", + "pages/noticeNewList/noticeNewList" + ] + }, + { + "root": "subpages/oneKeyService", + "pages": [ + "pages/index/index", + "pages/directTo/directTo", + "pages/archives/archives", + "pages/archivesDept/archivesDept", + "pages/archivesDetail/archivesDetail", + "pages/noticeDetail/noticeDetail", + "pages/moduleList/moduleList", + "pages/reportIssue/reportIssue", + "pages/reportIssueList/reportIssueList", + "pages/reportIssueDetail/reportIssueDetail" + ] + } + ], + "preloadRule": { + "pages/indexNew/indexNew": { + "network": "all", + "packages": [ + "subpages/changegrid" + ] + }, + "pages/discussion/discussion": { + "network": "all", + "packages": [ + "discussion" + ] + }, + "pages/association/association": { + "network": "all", + "packages": [ + "subpages/association" + ] + }, + "pages/mine/mine": { + "network": "all", + "packages": [ + "mine" + ] + } + }, + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "WeChat", + "navigationBarTextStyle": "black" + }, + "networkTimeout": { + "request": 6000 + }, + "permission": { + "scope.userLocation": { + "desc": "e锦水将获取您的位置信息" + } + }, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/components/loadMore/loadMore.js b/components/loadMore/loadMore.js index 7fb1e3b..8fb57da 100644 --- a/components/loadMore/loadMore.js +++ b/components/loadMore/loadMore.js @@ -1,6 +1,6 @@ Component({ - data: { - }, + externalClasses: ['load-more-child'], + data: {}, properties: { loadMoreVisible: { type: Boolean, diff --git a/components/loadMore/loadMore.wxml b/components/loadMore/loadMore.wxml index 573e607..940a67c 100644 --- a/components/loadMore/loadMore.wxml +++ b/components/loadMore/loadMore.wxml @@ -1,4 +1,4 @@ - + 正在加载中... diff --git a/project.config.json b/project.config.json index f55cca7..c5a11d8 100644 --- a/project.config.json +++ b/project.config.json @@ -49,14 +49,6 @@ "simulatorType": "wechat", "simulatorPluginLibVersion": {}, "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, "plugin": { "list": [] }, @@ -144,6 +136,24 @@ "pathName": "subpages/oneKeyService/pages/moduleList/moduleList", "query": "pid=4d667ea4ff8fb045b03a68a9d24207e9&bannerflag=1&categorycode=notice_jsqf&modulestyle=2&categoryname=锦水清风", "scene": null + }, + { + "name": "积分中心", + "pathName": "subpages/integralCentre/pages/index/index", + "query": "", + "scene": null + }, + { + "name": "积分中心", + "pathName": "subpages/integralCentre/pages/exchangeIndex/exchangeIndex", + "query": "", + "scene": null + }, + { + "name": "带参网格码生成", + "pathName": "pages/index/index", + "query": "scene=1233592630168813569", + "scene": null } ] } diff --git a/subpages/integralCentre/images/code.png b/subpages/integralCentre/images/code.png new file mode 100644 index 0000000000000000000000000000000000000000..b0440406aae7e8098c7f7638a0d04879070873da GIT binary patch literal 1701 zcmV;W23q-vP);LXZuRu^Y_3+TuN24R|7)#JVdni1 zad&P*L{5^V7ZH03wjIWp=j1mI4i4_;IL;^{9^1)jCmS&C>Ns@pj(X-tE1VL~TGfNI! zMnv~#0ImaoTa;3N48!oFZa%cuX8^z`09-u*fSJ#-){0SfbOJN?XUW&6l&TqHHb`F% z01>Y+#{4t0tz_m^aU9R7)oLGPK86rcGjk%j1_1viqI-0B}lSCtHXp zO;XSEPE<;5Wag`^wQDomN<>`M+uM8i@bK`58G!cy;D~~cH;HKelmPg?KZ1y77bb5Y zqSJ~15OJ9?=AI&eS+i!%S-W;^9s!A%L@{qq64Bt400cqs8Z$2_On#q;jw}L@@Db5n znZq=Z$H&Ky9vK;VH;cd)0GM0wv5AOIoDu-v_b-!D%O)c;*R8cTwgH%^g1nNL`B-bM zEG&5>iPkSUz|4{ZFGf+6l8^8EKjeVtc|%I6H30A@B6^`)2K&B09}!6#|Zb}!i5WeH*MOqe@TgVLtf~w5s{bwmb<`p-C<_-r|N^5 z@3Gb{o7ic&Tt2+pWTjL~DYe@e^LeMSl}hEHMx#-ZagO7tBuP*ymHw4aY;hdRn%~xH zwH;}6x-I%^_x}XIk|j%ecJACc!*$)=)oS(Y-vofxdH?`!M8rAF{QJV9UuE}!2oe_n zgx5bwl4MO3MeB;-DwRqpj$_HC7mP7-HK$E$y;yXD<2V;qtJU#xxqO)Gx@+P%zCDVf z*X1%2z82n=wgVBznEAgf?D4;BmPPYVvN~lqL>w^2jN}UiL2w{5%ehW4UIsuexHFh} zhPC#qyy^g81re>0GF*X(tCJ*I6h)DUiAh@!1jjS;CZ*K%VHmDz2Y`sL8e>k%?Y{31 zBjQDkMq}^w>(_tdd7f5EnOsjy5D_AtY>e614S?2KBCv&-S6XXt%g4(RG@H#w5b?0R%zt7&GUWk<6(Q(RoDxh&W`75hay20o`miMJLpw zC`u_>n(zCEDy3%UDmaVaFaQjR0{b~dB$v{u1+)`lq7Z@QM09tDBz%d8ielzRo7P$j z~C#v1_gO2Y@dSF*L@UTL89>nU}b(yKl8x{ZeZ! z_rQ8)zQkJlP{#=5nVUO7L~D%EZ8>mduJI-VptZJwo0$)@)^3{;0J&To$C(EJ!UNwm z8jZK5gk+&ylrr<>*4q0D+1@b%TI)Ih$gArRW6Wni0Z@1s%nifvoyjs<`UVFFXS=TZ zF#!Cc2>dJnt@Tm>cn}eVilt^j%C8-WQi_|+COeKJ=PUJpEfKBmkc1QBGpmB9g^CMD zAha)0N#7Oe+t77gQL_7V+kK&5o>#{Z(fhe=(V|5&N~O}505C#CvPjy3AgIZ64gd}y zqW|Q25D}LeW7efRm9Umdr3;fJ5t^0zT<(LWd;lPe#hJh9h`2*3^-!l5P!I&CGxK&L vO5X-q1b)N=!WVHIpXNBuCaH@5yB_!+I77su+Za-700000NkvXXu0mjf#i0~x literal 0 HcmV?d00001 diff --git a/subpages/integralCentre/images/exchange.png b/subpages/integralCentre/images/exchange.png new file mode 100644 index 0000000000000000000000000000000000000000..4f5b983a6c1a054fe4eb4677ff3d408f8055f066 GIT binary patch literal 8781 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 literal 0 HcmV?d00001 diff --git a/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js new file mode 100644 index 0000000..236ba55 --- /dev/null +++ b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.js @@ -0,0 +1,79 @@ +import { + getCode, + getPointsLogs +} from "../../../../api/integralCentre.js" +Page({ + data: { + codeUrl: '', + behaviorCode: 'points_exchange', //积分动作编码 + pageIndex: 1, + pageSize: 10, + pointList: [], + loadMoreVisible: false, //false + loadMoreType: "none", + showLoading: true, + nodata: false, + _timer: null, + }, + onLoad: function () { + this.getCode() + this.getPointsLogs() + if (this.data._timer) { + clearInterval() + } + let _timer = null + _timer = setInterval(() => { + console.log('刷新') + this.getCode() + }, 1000 * 180) + }, + getCode() { + this.setData({ + showLoading: true + }) + getCode().then(res => { + this.setData({ + codeUrl: res.data.codeUrl, + showLoading: false + }) + }).catch(err => {}) + }, + getNewCode() { + this.getCode() + }, + // 获取居民兑换记录接口 + getPointsLogs() { + let para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + behaviorCode: this.data.behaviorCode, + } + getPointsLogs(para).then((res) => { + this.setData({ + loadMoreVisible: true, + loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none', + pointList: this.data.pointList.concat(res.data) + }) + if (this.data.pointList.length == 0) { + this.setData({ + loadMoreVisible: false, + nodata: true + }) + } + }).catch(() => { + this.setData({ + nodata: true + }) + }) + }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + console.log('下拉了') + if (this.data.loadMoreType === 'loading') { + this.data.pageIndex += 1, + this.getPointsLogs() + } + }, +}) \ No newline at end of file diff --git a/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json new file mode 100644 index 0000000..e343549 --- /dev/null +++ b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore", + "no-data": "../../../../components/nodata/nodata" + }, + "navigationBarTitleText": "积分中心", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#DD5245" +} \ No newline at end of file diff --git a/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml new file mode 100644 index 0000000..06ac63e --- /dev/null +++ b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxml @@ -0,0 +1,33 @@ + + + + + + + 兑换码 + + + + + + 请点击兑换码刷新 + + + + + 兑换时间 + 说明 + 积分 + + + + {{item.operationTime}} + {{item.remark?item.remark:'暂无核销记录说明'}} + + {{item.operationType==='1'? '+':'-'}}{{item.points}} + + + + + + \ No newline at end of file diff --git a/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss new file mode 100644 index 0000000..80ea4eb --- /dev/null +++ b/subpages/integralCentre/pages/exchangeIndex/exchangeIndex.wxss @@ -0,0 +1,113 @@ +page { + /* background: #f7f7f7; */ +} + +.exchange-index { + width: 100%; + box-sizing: border-box; +} + +.exchange-header { + height: 680rpx; + /* border: 1rpx solid red; */ +} + +.exchange-header .background { + box-sizing: border-box; + width: 100%; + height: 80rpx; + background: #DD5245; +} + +.exchange-header .exchange-code { + box-sizing: border-box; + width: 660rpx; + height: 630rpx; + margin: 0 auto; + position: absolute; + top: 2%; + left: 50%; + transform: translate(-50%, 0%); + background: #FFFFFF; + border-radius: 20rpx; + padding: 40rpx 30rpx; + box-shadow: 0px 0px 20rpx #eee; +} + +.exchange-code .code-text { + color: 32rpx; + font-weight: bold; +} + +.exchange-code .code-text text { + vertical-align: middle; +} + +.exchange-code .code-text .code { + width: 32rpx; + height: 32rpx; + vertical-align: middle; + margin-right: 10rpx; +} + +.exchange-code .code-img { + width: 400rpx; + height: 400rpx; + margin-left: 110rpx; + margin-top: 50rpx; +} + +.loading { + width: 60rpx; + height: 60rpx; + margin-top: 170rpx; + margin-left: 150rpx; +} + +.exchange-code .code-footer { + margin-left: 200rpx; + font-size: 28rpx; + color: #999; +} + +.exchange-time .time-title { + box-sizing: border-box; + width: 100%; + font-weight: bold; + font-size: 30rpx; + color: #151515; +} + +.time-item-box { + padding: 0 20rpx; +} + +.exchange-time .time-item-box .time-item { + box-sizing: border-box; + width: 100%; + display: flex; + justify-content: space-around; + font-size: 30rpx; + margin-top: 50rpx; +} + +.exchange-time .time-item-box .time-item .time-item-time { + width: 45%; + color: #151515; +} + +.exchange-time .time-item-box .time-item .time-item-remark { + width: 40%; + color: #151515; +} + +.exchange-time .time-item-box .time-item .time-item-num { + width: 15%; + color: #D60000; + text-align: center; +} + +/* 覆盖组件样式 */ +.load-more-exchange { + background: #fff !important; +} \ No newline at end of file diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js index 872da1f..0bb0871 100644 --- a/subpages/integralCentre/pages/index/index.js +++ b/subpages/integralCentre/pages/index/index.js @@ -1,4 +1,5 @@ // subpages/integralCentre/pages/index/index.js +const app = getApp() import { pointsRecordlist, userPointsRankinglist, @@ -23,36 +24,39 @@ Page({ rankingType: 0, //排名方式 selectTab: "tab1", typeList: [{ //排名方式：0-周，1-月 - type: "0", - name: "网格排名", - select: true - }, - { - type: "1", - name: "街道排名", - select: false - }, - { - type: "2", - name: "等级排名", - select: false - } + type: "0", + name: "网格排名", + select: true + }, + { + type: "1", + name: "街道排名", + select: false + }, + { + type: "2", + name: "等级排名", + select: false + } ], timestamp: getTimestamp(), loadMoreType: "none", - loadMoreVisible: false + loadMoreVisible: false, + infoCompleted: 0, //是否完善了用户信息 + completeInfoDialogVisible: false, }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { this.setData({ //前面页面传过来的积分总数 - points: options.points + points: options.points, + infoCompleted: app.globalData.infoCompleted }) this.pointsRankinglist(); //初始化加载积分记录列表 }, // tab 切换 - onTabChange (e) { + onTabChange(e) { this.setData({ pageIndex: 1, pageSize: 15, @@ -60,7 +64,7 @@ Page({ loadMoreVisible: true, pointsRecordlist: [], pointsRankinglist: [], - pointsRankingUser: {},//当前用户排名信息 + pointsRankingUser: {}, //当前用户排名信息 selectTab: e.currentTarget.dataset.tab, nodatapointsRecord: false, nodatapointsRanking: false, @@ -93,15 +97,15 @@ Page({ loadMoreType: "loading", loadMoreVisible: true, }) - if ( e.currentTarget.dataset.type == "2") { + if (e.currentTarget.dataset.type == "2") { that.gradeRankinglist() } else { that.pointsRankinglist() - } + } }, // 积分记录-积分排行接口 - pointsRankinglist () { + pointsRankinglist() { let that = this const para = { pageIndex: 1, @@ -138,7 +142,7 @@ Page({ }, // 积分记录-积分记录接口 - pointsRecordlist () { + pointsRecordlist() { let that = this const para = { pageIndex: this.data.pageIndex, @@ -170,10 +174,6 @@ Page({ console.log(err) }) }, - - - - /** * 生命周期函数--监听页面初次渲染完成 */ @@ -230,7 +230,7 @@ Page({ }, //6.28 等级排行榜 - gradeRankinglist () { + gradeRankinglist() { let that = this const para = { pageIndex: 1, @@ -264,12 +264,24 @@ Page({ console.log(err) }) }, - bindtapIntegralRule () { + bindtapIntegralRule() { console.log('获取积分规则') wx.navigateTo({ url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?categorycode=notice_points_rule&categoryname=积分规则` }) }, + // 积分兑换页面 + goExchangeIndex() { + if (this.data.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return false + } + wx.navigateTo({ + url: '/subpages/integralCentre/pages/exchangeIndex/exchangeIndex' + }) + }, /** * 用户点击右上角分享 */ diff --git a/subpages/integralCentre/pages/index/index.json b/subpages/integralCentre/pages/index/index.json index ed0a78d..7012490 100644 --- a/subpages/integralCentre/pages/index/index.json +++ b/subpages/integralCentre/pages/index/index.json @@ -4,6 +4,7 @@ "navigationBarBackgroundColor": "#DD5245", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", - "no-data":"../../../../components/nodata/nodata" + "no-data": "../../../../components/nodata/nodata", + "completeInfo-dialog": "../../../../components/completeInfoDialog/completeInfoDialog" } } \ No newline at end of file diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml index a128684..32bfb97 100644 --- a/subpages/integralCentre/pages/index/index.wxml +++ b/subpages/integralCentre/pages/index/index.wxml @@ -2,12 +2,22 @@ {{points}} 积分 - 积分规则 + + + + + 积分规则 + + - 积分排行 - 积分记录 + + 积分排行 + + + 积分记录 + @@ -40,15 +50,15 @@ --> - - {{item.rank}} + + {{item.rank}} + {{item.realName||item.nickName}} {{item.points||item.grade}} - @@ -64,11 +74,14 @@ {{item.ruleDesc}} - - +{{item.points}} + + + {{item.points}} + {{item.operationTime}} - + + \ No newline at end of file diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss index 2b29b9f..1107acf 100644 --- a/subpages/integralCentre/pages/index/index.wxss +++ b/subpages/integralCentre/pages/index/index.wxss @@ -35,19 +35,35 @@ page { } .title .rule { + box-sizing: border-box; + width: 100%; color: white; position: absolute; display: flex; align-items: center; - left: 570rpx; - top: 40rpx; + /* left: 570rpx; */ + top: 10rpx; font-size: 28rpx; + padding-left: 20rpx; } -.title .rule image{ + +.title .rule .note { width: 30rpx; height: 30rpx; margin-left: 10rpx; + /* margin-right: 382rpx; */ +} + +.exchange-box { + margin-right: 360rpx; +} + +.title .exchange { + width: 190rpx; + height: 90rpx; + vertical-align: middle; } + .tab-bar { width: 100%; height: 80rpx; @@ -277,30 +293,35 @@ button::after { margin-top: 3rpx; margin-left: 1rpx; } -.list-number_frist{ + +.list-number_frist { position: relative; z-index: 100; width: 100%; height: 38rpx; line-height: 38rpx; text-align: center; - font-size:38rpx; - font-weight:bold; - font-style:italic; - color:rgba(51,51,51,1); + font-size: 38rpx; + font-weight: bold; + font-style: italic; + color: rgba(51, 51, 51, 1); } -.color1_{ - color:#d42e31; + +.color1_ { + color: #d42e31; text-align: center; } -.color2_{ - color:#dd5800; + +.color2_ { + color: #dd5800; text-align: center; } -.color3_{ - color:#ffa800; + +.color3_ { + color: #ffa800; text-align: center; } + .list-number_ { position: relative; z-index: 100; diff --git a/utils/config.js b/utils/config.js index e11d713..27e5b70 100644 --- a/utils/config.js +++ b/utils/config.js @@ -9,6 +9,7 @@ function BASEURL() { return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.8:9094/epdc-api/api/' + // return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/' } function WEBROOT() {