From 0c889c9076f327c0e673e084d543782c9fdc9fb3 Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 29 Jun 2022 18:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sanjianxi/AppApplyPoint/AppApplyPoint.vue | 14 ++++- src/project/sanjianxi/AppApplyPoint/add.vue | 4 ++ .../sanjianxi/AppApplyPoint/detail.vue | 4 ++ src/project/sanjianxi/AppApplyPoint/list.vue | 4 ++ .../sanjianxi/AppPartyPoint/AppPartyPoint.vue | 25 +++++--- .../AppPartyPoint/pointDetailList.vue | 59 ++++++++++++++++--- .../AppPartyPoint/pointRankingList.vue | 21 +++++++ .../sanjianxi/AppPartyPoint/search.vue | 4 ++ 8 files changed, 118 insertions(+), 17 deletions(-) diff --git a/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue b/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue index 641fcf4..60c54fd 100644 --- a/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue +++ b/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue @@ -42,11 +42,23 @@ export default { }; }, onLoad() { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) this.getList() }, methods: { toAdd(row) { - uni.navigateTo({url: `./add?integralRuleId=${row.id}&integralRuleName=${row.eventName}`}) + this.$instance.post(`/app/apppartyintegralrule/integralApply?integralId=${row.id}&partyId=${this.user.partyId}`).then(res => { + if (res.code == 0) { + uni.navigateTo({url: `./add?integralRuleId=${row.id}&integralRuleName=${row.eventName}`}) + }else { + this.$u.toast(res.msg) + } + }).catch((err) => { + this.$u.toast(err) + }) }, getList() { if(this.current > this.pages) return diff --git a/src/project/sanjianxi/AppApplyPoint/add.vue b/src/project/sanjianxi/AppApplyPoint/add.vue index 1457fc2..ac6ac8d 100644 --- a/src/project/sanjianxi/AppApplyPoint/add.vue +++ b/src/project/sanjianxi/AppApplyPoint/add.vue @@ -47,6 +47,10 @@ export default { }; }, onLoad(options) { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) this.integralRuleId = options.integralRuleId this.integralRuleName = options.integralRuleName }, diff --git a/src/project/sanjianxi/AppApplyPoint/detail.vue b/src/project/sanjianxi/AppApplyPoint/detail.vue index a9b9602..af13b8c 100644 --- a/src/project/sanjianxi/AppApplyPoint/detail.vue +++ b/src/project/sanjianxi/AppApplyPoint/detail.vue @@ -75,6 +75,10 @@ export default { }; }, onLoad(options) { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) this.id = options.id this.$dict.load("integralDeclareStatus").then(() => { this.getDetail() diff --git a/src/project/sanjianxi/AppApplyPoint/list.vue b/src/project/sanjianxi/AppApplyPoint/list.vue index c5568cc..1034391 100644 --- a/src/project/sanjianxi/AppApplyPoint/list.vue +++ b/src/project/sanjianxi/AppApplyPoint/list.vue @@ -56,6 +56,10 @@ export default { }; }, onLoad() { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) this.getTypeList() this.$dict.load("integralDeclareStatus").then(() => { this.getList() diff --git a/src/project/sanjianxi/AppPartyPoint/AppPartyPoint.vue b/src/project/sanjianxi/AppPartyPoint/AppPartyPoint.vue index 6c515ca..d72cab6 100644 --- a/src/project/sanjianxi/AppPartyPoint/AppPartyPoint.vue +++ b/src/project/sanjianxi/AppPartyPoint/AppPartyPoint.vue @@ -6,10 +6,10 @@
- 王守义 + {{user.realName}}
-

178

+

{{info.integral}}

累计获得积分

@@ -22,11 +22,11 @@
本月获得积分
-
30
+
{{info.nowMonthIntegral}}
-
双山街道排名
-
第11名
+
{{info.partyOrgName}}排名
+
第{{info.orderIndex}}名
@@ -45,15 +45,26 @@ export default { }, data() { return { - + info: {} }; }, onLoad() { - + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) + this.getDetail() }, methods: { linkTo(url) { uni.navigateTo({ url }) + }, + getDetail() { + this.$instance.post(`/app/apppartyintegralinfo/integralInfoForWX?partyId=${this.user.partyId}`).then((res) => { + if (res.code == 0) { + this.info = res.data + } + }); } } }; diff --git a/src/project/sanjianxi/AppPartyPoint/pointDetailList.vue b/src/project/sanjianxi/AppPartyPoint/pointDetailList.vue index 03b9770..61bf6eb 100644 --- a/src/project/sanjianxi/AppPartyPoint/pointDetailList.vue +++ b/src/project/sanjianxi/AppPartyPoint/pointDetailList.vue @@ -3,20 +3,21 @@
{{searchDate}}
-
获得积分 1500
+
获得积分 {{integral}}
-
+
-

积分申报

-

08-31 13:45

+

{{ $dict.getLabel('partyIntegralDetailType', item.type) }}

+

{{item.createTime.substring(5, 16)}}

-

＋20

-

疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控疫情防控

+

{{item.integralType == 1 ? '+' : '-'}}{{item.integral}}

+

{{item.remark}}

+
@@ -36,24 +37,64 @@ export default { showDate: false, dateParams: { year: true, - month: true, + month: false, day: false, hour: false, minute: false, second: false }, + current: 1, + pages: 2, + list: [], + integral: 0 }; }, onLoad() { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) var datetime = new Date(); var year = datetime.getFullYear(); var month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1; - this.searchDate = `${year}-${month}` + this.searchDate = `${year}` + this.$dict.load("partyIntegralDetailType").then(() => { + this.getList() + }) }, methods: { selectDate(e) { - this.searchDate = `${e.year}-${e.month}` + this.searchDate = `${e.year}` + this.getListInit() }, + getListInit() { + this.current = 1 + this.pages = 2 + this.list = [] + this.integral = 0 + this.getList() + }, + getList() { + if (this.current > this.pages) return; + this.$instance.post(`/app/apppartyintegralinfo/integralDetailForWX`, null, { + params: { + partyId: this.user.partyId, + current: this.current, + year: this.searchDate, + } + }).then((res) => { + if (res.code == 0) { + this.integral = res.data.integral + const list = this.current > 1 ? [...this.list, ...res.data.infoIPage.records] : res.data.infoIPage.records + this.pages = res.data.infoIPage.pages + this.list = list + } + }); + } + }, + onReachBottom() { + this.current ++ + this.getList() } }; diff --git a/src/project/sanjianxi/AppPartyPoint/pointRankingList.vue b/src/project/sanjianxi/AppPartyPoint/pointRankingList.vue index 0c45ec6..b369367 100644 --- a/src/project/sanjianxi/AppPartyPoint/pointRankingList.vue +++ b/src/project/sanjianxi/AppPartyPoint/pointRankingList.vue @@ -56,6 +56,10 @@ export default { }; }, onLoad() { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) uni.$on('selectParty', (res) => { this.partyName = res.name this.partyId = res.id @@ -80,6 +84,23 @@ export default { }, toSelect() { uni.navigateTo({url: './search'}) + }, + getList() { + if (this.current > this.pages) return; + this.$instance.post(`/app/apppartyintegralinfo/integralDetailForWX`, null, { + params: { + partyId: this.user.partyId, + current: this.current, + year: this.searchDate, + } + }).then((res) => { + if (res.code == 0) { + this.integral = res.data.integral + const list = this.current > 1 ? [...this.list, ...res.data.infoIPage.records] : res.data.infoIPage.records + this.pages = res.data.infoIPage.pages + this.list = list + } + }); } } }; diff --git a/src/project/sanjianxi/AppPartyPoint/search.vue b/src/project/sanjianxi/AppPartyPoint/search.vue index da9069e..29dc593 100644 --- a/src/project/sanjianxi/AppPartyPoint/search.vue +++ b/src/project/sanjianxi/AppPartyPoint/search.vue @@ -35,6 +35,10 @@ export default { }; }, onLoad() { + uni.setNavigationBarColor({ + frontColor: "#ffffff", + backgroundColor: "#E76056", + }) this.historyList = uni.getStorageSync("historyList") }, methods: {