From 619abedc695a266da3e82fa90970f7cf5307a584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 16 Oct 2023 11:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pagesB/Behaviorpoints/index.js | 16 ++- api/pagesB/PointsMall/index.js | 15 ++- api/pagesC/Onlinesigning/index.js | 10 +- pages.json | 5 +- pagesB/Behaviorpoints/Behaviorpoints.scss | 32 +++--- pagesB/Behaviorpoints/Behaviorpoints.vue | 56 +++++----- pagesB/PointsMall/PointsMall.vue | 76 ++++++++----- pagesB/exchangerecords/exchangerecords.vue | 101 ++++++++++++------ pagesB/mysigning/mysigning.vue | 3 +- pagesC/Onlinesigning/Onlinesigning.vue | 12 +-- .../contractsigningprotocol.vue | 4 +- 11 files changed, 202 insertions(+), 128 deletions(-) diff --git a/api/pagesB/Behaviorpoints/index.js b/api/pagesB/Behaviorpoints/index.js index f06dcf5..a4157da 100644 --- a/api/pagesB/Behaviorpoints/index.js +++ b/api/pagesB/Behaviorpoints/index.js @@ -1,12 +1,22 @@ import request from "../../request.js" -export function prizeExchangelist(data, region) { +export function scorelist(data) { return request({ - url: `/applet/score/prizeExchange/list`, + url: `/applet/score/list`, method: 'get', data: data, header: { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} +//总积分 +export function scoretotal(cardNo) { + return request({ + url: `/applet/score/total/${cardNo}`, + method: 'get', + header: { + region: uni.getStorageSync('region'), + } + }) +} diff --git a/api/pagesB/PointsMall/index.js b/api/pagesB/PointsMall/index.js index 055997e..4139fac 100644 --- a/api/pagesB/PointsMall/index.js +++ b/api/pagesB/PointsMall/index.js @@ -1,6 +1,6 @@ import request from "../../request.js" -export function prizelist(data, region) { +export function prizelist(data) { return request({ url: `/applet/score/prize/list`, method: 'get', @@ -9,4 +9,15 @@ export function prizelist(data, region) { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} +//兑换奖品 +export function prizeExchangesave(data) { + return request({ + url: `/applet/score/prizeExchange/save`, + method: 'post', + data: data, + header: { + region: uni.getStorageSync('region'), + } + }) +} diff --git a/api/pagesC/Onlinesigning/index.js b/api/pagesC/Onlinesigning/index.js index 6d39f26..dc28e3d 100644 --- a/api/pagesC/Onlinesigning/index.js +++ b/api/pagesC/Onlinesigning/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" // 获取区划列表 -export function arealist(pid, region) { +export function arealist(pid) { return request({ url: `/applet/signinfo/area/list/${pid}`, method: 'get', @@ -12,7 +12,7 @@ export function arealist(pid, region) { } //提交签约 -export function applysave(data, region) { +export function applysave(data) { return request({ url: `/applet/sign/apply/save`, method: 'post', @@ -24,7 +24,7 @@ export function applysave(data, region) { } //人群 -export function getCrowd(identity, region) { +export function getCrowd(identity) { return request({ url: `/applet/signinfo/getCrowd/${identity}`, method: 'get', @@ -35,7 +35,7 @@ export function getCrowd(identity, region) { } //服务包 -export function getPackageByCrowdNo(data, region) { +export function getPackageByCrowdNo(data) { return request({ url: `/applet/signinfo/getPackageByCrowdNo`, method: 'post', @@ -44,4 +44,4 @@ export function getPackageByCrowdNo(data, region) { region: uni.getStorageSync('region'), } }) -} \ No newline at end of file +} diff --git a/pages.json b/pages.json index a532f0a..0ebb63a 100644 --- a/pages.json +++ b/pages.json @@ -316,7 +316,8 @@ "path": "exchangerecords/exchangerecords", "style": { "navigationBarTitleText": "兑换记录", - "enablePullDownRefresh": false + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true } }, { "path": "familymemberdetail/familymemberdetail", @@ -551,4 +552,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pagesB/Behaviorpoints/Behaviorpoints.scss b/pagesB/Behaviorpoints/Behaviorpoints.scss index e785c9e..ae5cb13 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.scss +++ b/pagesB/Behaviorpoints/Behaviorpoints.scss @@ -9,11 +9,12 @@ margin: 0 auto; .content { position: relative; + image { width: 100%; height: 319rpx; } - + .Exchangerecords { width: 180rpx; height: 54rpx; @@ -38,23 +39,21 @@ text-align: center; line-height: 54rpx; } - + .name { width: 90%; height: 100rpx; font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; position: absolute; top: 10%; left: 5%; line-height: 33rpx; - + } .number { font-size: 56rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; position: absolute; @@ -66,26 +65,21 @@ } } .bottomitem{ - position: relative; background-color: #FFF; margin: 0 auto; - + padding-bottom: 100rpx; + .item{ + position: relative; + } .Establishingarchives{ font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #333333; line-height: 38rpx; padding: 8px 10px 5px 18px; } .integraltwo{ - position: absolute; - top: 75%; - right: 3%; - color: red; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + color: red !important; } .integral{ position: absolute; @@ -98,7 +92,6 @@ } .timeone{ font-size: 20rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #333333; line-height: 38rpx; @@ -107,7 +100,6 @@ } .PointsRecord { font-size: 30rpx; - font-family: Source Han Sans CN; font-weight: 400; color: #000000; line-height: 33rpx; @@ -115,6 +107,6 @@ } } } - - - } \ No newline at end of file + + + } diff --git a/pagesB/Behaviorpoints/Behaviorpoints.vue b/pagesB/Behaviorpoints/Behaviorpoints.vue index c32ae9b..b280a9d 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.vue +++ b/pagesB/Behaviorpoints/Behaviorpoints.vue @@ -5,7 +5,7 @@ 我的积分 - 1000 + {{score?score:0}} 积分商城 @@ -18,32 +18,31 @@ 积分记录 - - 建立档案 - - - +20000 - - - 2023-03-09 13:23:12 - - - 兑换商品 - - - -2000000000 - - - 2023-03-09 13:23:12 + + + + {{item.actName}} + + + {{'+'+item.score}} + + + {{item.score}} + + + {{item.scoreDate}} + + + - \ No newline at end of file + diff --git a/pagesB/PointsMall/PointsMall.vue b/pagesB/PointsMall/PointsMall.vue index f585848..7f3142e 100644 --- a/pagesB/PointsMall/PointsMall.vue +++ b/pagesB/PointsMall/PointsMall.vue @@ -1,45 +1,66 @@ \ No newline at end of file + diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index bce8af2..b6127cc 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -164,8 +164,7 @@ }, // 签约信息 detailinfo() { - // detail(uni.getStorageSync('userinfo').cardNo, this.region).then(res => { - detail('372424194703207523', '1').then(res => { + detail(uni.getStorageSync('userinfo').cardNo).then(res => { if (res.code == 200) { this.list = res.data this.list.rescindType = null diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 51dace4..e0a5a5c 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -349,14 +349,14 @@ this.query.county = e[0].value this.query.countyName = e[0].label const pid = this.countylist.find(m => m.areaCode === e[0].value).id - this.arealistinfo(pid, '1', 'Township') + this.arealistinfo(pid, 'Township') }, //选择乡镇 Townshipconfirm(e) { this.query.town = e[0].value this.query.townName = e[0].label const pid = this.Townshiplist.find(m => m.streetCode === e[0].value).id - this.arealistinfo(pid, '1', 'village') + this.arealistinfo(pid, 'village') }, //选择村 villageconfirm(e) { @@ -364,8 +364,8 @@ this.query.committeeName = e[0].label }, //区县list - arealistinfo(code, code2, list) { - arealist(code, code2).then(res => { + arealistinfo(code, list) { + arealist(code).then(res => { if (list == 'county') { this.countylist = res.data } else if (list == 'Township') { @@ -442,7 +442,7 @@ }, //人群list getCrowdinfo() { - getCrowd('370882199909092123', '1').then(res => { + getCrowd(uni.getStorageSync('userinfo').cardNo).then(res => { res.data.forEach(e => { e.checked = false }) @@ -515,7 +515,7 @@ }, }, onLoad(options) { - this.arealistinfo('371400000000 ', '1', 'county'); + this.arealistinfo('371400000000 ', 'county'); this.getCrowdinfo(); let date = new Date(); let year = date.getFullYear(); diff --git a/pagesC/contractsigningprotocol/contractsigningprotocol.vue b/pagesC/contractsigningprotocol/contractsigningprotocol.vue index c430642..8218836 100644 --- a/pagesC/contractsigningprotocol/contractsigningprotocol.vue +++ b/pagesC/contractsigningprotocol/contractsigningprotocol.vue @@ -190,14 +190,12 @@ this.signatureshow = false }, info() { - getSignProtocol(this.cardNo, '1').then(res => { + getSignProtocol(uni.getStorageSync('userinfo').cardNo, '1').then(res => { this.list = res.data }) }, }, onLoad(options) { - this.cardNo = options.cardNo - this.cardNo = '372424194703207523' this.info(); }, }