积分明细

This commit is contained in:
liuye
2022-05-13 15:51:56 +08:00
parent 5d0801ac21
commit 551dca7540
7 changed files with 359 additions and 292 deletions

View File

@@ -5,8 +5,8 @@
<div class="header-tab">
<div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}<span class="active-line" v-if="tabIndex == index"></span></div>
</div>
<family-rank v-if="tabIndex == 0" :showDetail="showDetail"></family-rank>
<user-rank v-if="tabIndex == 1" :showDetail="showDetail"></user-rank>
<family-rank v-if="tabIndex != 1"></family-rank>
</div>
</div>
</div>
@@ -15,18 +15,19 @@
import {mapState} from 'vuex'
import userRank from './components/userRank.vue'
import familyRank from './components/familyRank.vue'
import workRank from './components/workRank.vue'
export default {
name: "AppCreditPoints",
appName: "我的积分",
computed: {
...mapState(['user', 'token'])
},
components: {userRank, familyRank},
components: {userRank, familyRank, workRank},
data() {
return {
tabList: ['家庭积分', '个人积分'],
tabIndex: 0,
showDetail: false
showDetail: true
}
},
onLoad(options) {
@@ -52,270 +53,6 @@ export default {
overflow-x: hidden;
background-color: #f3f6f9;
.credit-points {
.bg-blue {
width: 100%;
height: 176px;
background-color: #4181FF;
}
.header-content {
width: 690px;
height: 256px;
background: #FFF;
border-radius: 16px;
margin: -130px 0 40px 30px;
padding: 100px 60px 40px 60px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
position: relative;
.item {
text-align: center;
z-index: 99;
.num {
font-family: DIN;
font-size: 52px;
font-weight: bold;
line-height: 60px;
}
.label {
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
color: #999;
line-height: 40px;
margin-top: 10px;
}
.color-5AAD6A {
color: #5AAD6A;
}
.color-4185F5 {
color: #4185F5;
}
.color-CD413A {
color: #CD413A;
}
}
img {
position: absolute;
width: 360px;
height: 250px;
top: -40px;
right: 0;
}
}
.ranking-content {
padding: 94px 30px 0;
background-color: #fff;
.item {
display: inline-block;
width: 216px;
box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
border-radius: 12px;
padding: 40px 0 76px 0;
text-align: center;
box-sizing: border-box;
position: relative;
.user-name {
font-size: 30px;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #333;
line-height: 42px;
}
.item-num {
font-size: 46px;
font-weight: 6000;
color: #2C51CE;
line-height: 54px;
}
.top-img {
width: 100%;
height: 34px;
position: absolute;
top: -11px;
left: 0;
}
}
.item-top {
margin: -46px 20px 0;
.user-img {
width: 104px;
height: 104px;
}
.user-name-bg {
width: 104px;
height: 104px;
border-radius: 50%;
background-color: #4E8EEE;
font-size: 28px;
line-height: 104px;
text-align: center;
color: #fff;
}
.top-img-one {
width: 100%;
position: absolute;
top: -22px;
left: 0;
height: 46px;
}
}
}
.ranking-list {
background-color: #fff;
.item {
width: 100%;
height: 120px;
line-height: 120px;
background: #FFF;
padding: 0 64px;
box-sizing: border-box;
.item-num {
display: inline-block;
width: 68px;
color: #858594;
font-size: 28px;
}
.user-img {
margin-right: 24px;
vertical-align: middle;
}
.item-name {
color: #333;
font-size: 30px;
display: inline-block;
width: 240px;
}
.item-point {
display: inline-block;
width: 210px;
text-align: right;
font-size: 30px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
}
.mar-r24 {
margin-right: 24px;
}
}
}
.user-img {
width: 80px;
height: 80px;
border-radius: 50%;
}
.user-name-bg {
display: inline-block;
width: 80px;
height: 80px;
border-radius: 50%;
background-color: #4E8EEE;
font-size: 28px;
line-height: 80px;
text-align: center;
color: #fff;
}
.mar-b4 {
margin-bottom: 8px;
}
.mar-b8 {
margin-bottom: 16px;
}
.detail-content {
width: 690px;
background: #FFF;
border-radius: 16px;
margin: 432px 0 0 32px;
padding: 30px 30px 94px;
box-sizing: border-box;
.title {
font-size: 34px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
line-height: 48px;
margin-bottom: 30px;
}
.item {
padding: 34px 0 32px 0;
border-bottom: 2px solid #ddd;
display: flex;
.item-info {
width: 500px;
p {
word-break: break-all;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333;
line-height: 44px;
}
span {
display: inline-block;
margin-top: 8px;
font-size: 24px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999;
line-height: 34px;
}
}
.item-num {
width: calc(100% - 500px);
text-align: right;
font-size: 36px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
line-height: 50px;
}
}
}
}
.color-0 {
color: #2C51CE !important;
}
.color-1 {
color: #E6736E !important;
}
.fixed-top {
z-index: 999;
}

View File

@@ -0,0 +1,35 @@
<template>
<div class="page">
</div>
</template>
<script>
import {mapState} from 'vuex'
export default {
name: "bindWorkUser",
appName: "绑定员工账号",
computed: {
...mapState(['user', 'token'])
},
data() {
return {
}
},
onLoad(options) {
},
methods: {
},
}
</script>
<style scoped lang="scss">
@import "../../../../../node_modules/dvcp-wui/common";
.page {
width: 100vw;
overflow-x: hidden;
background-color: #f3f6f9;
}
</style>

View File

@@ -16,27 +16,27 @@
</div>
<img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
</div>
<div>
<div v-if="!showDetail">
<div class="ranking-content" v-if="info['列表'] && info['列表'].length">
<div class="item" v-if="info['列表'].length > 1">
<img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
<img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
<div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
<p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
<p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
<p class="item-num">{{ info['列表'][1].integral }}</p>
</div>
<div class="item-top item" v-if="info['列表'].length > 0">
<img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
<img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
<div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
<p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
<p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
<p class="item-num">{{ info['列表'][0].integral }}</p>
</div>
<div class="item" v-if="info['列表'].length > 2">
<img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
<img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
<div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
<p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
<p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
<p class="item-num">{{ info['列表'][2].integral }}</p>
</div>
</div>
@@ -45,11 +45,23 @@
<span class="item-num">{{ index + 1 }}</span>
<img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
<div class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(item.name) }}</div>
<span class="item-name">{{ item.name }}</span>
<span class="item-name">{{ item.name }}</span>
<span class="item-point">{{ item.integral }}</span>
</div>
</div>
</div>
<div class="detail-content" v-if="showDetail && list.length">
<div class="title">积分明细</div>
<div class="item" v-for="(item, index) in list" :key="index">
<div class="item-info">
<p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
<span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
</div>
<div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
{{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
</div>
</div>
</div>
</div>
</template>
<script>
@@ -61,19 +73,27 @@ export default {
computed: {
...mapState(['user', 'token'])
},
props: {
showDetail: { //true 积分明细 false积分排行
type: Boolean
}
},
data() {
return {
info: {},
current: 1,
list: [],
}
},
mounted() {
this.getInfo()
if(this.showDetail) {
this.getList()
}
},
methods: {
// 积分排行
getInfo() {
getInfo() {// 积分排行
this.info = {}
// var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}` //积分排行
var url = `/app/appresident/rank?id=${this.user.residentId}&type=0&areaId=${this.user?.areaId}` //积分排行
this.$instance.post(url).then(res => {
if (res.code === 0) {
@@ -81,6 +101,18 @@ export default {
}
})
},
getList() {// 积分明细列表
// var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10` //积分明细
let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&type=0&current=${this.current}&size=10` //积分明细
this.$instance.post(url).then(res => {
if (res?.data) {
if (this.current > res.data.pages) {
return
}
this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
}
})
},
},
}
</script>
@@ -294,7 +326,7 @@ export default {
width: 690px;
background: #FFF;
border-radius: 16px;
margin: 432px 0 0 32px;
margin: 0 0 0 32px;
padding: 30px 30px 94px;
box-sizing: border-box;

View File

@@ -50,7 +50,7 @@
<div class="title">积分明细</div>
<div class="item" v-for="(item, index) in list" :key="index">
<div class="item-info">
<p>{{ item.residentName + ':' }}{{ item.ruleName }}</p>
<p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
<span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
</div>
<div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
@@ -70,7 +70,7 @@ export default {
...mapState(['user', 'token'])
},
props: {
showDetail: {
showDetail: { //true 积分明细 false积分排行
type: Boolean
}
},
@@ -88,8 +88,7 @@ export default {
}
},
methods: {
// 积分排行
getInfo() {
getInfo() {// 积分排行
this.info = {}
// var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}` //积分排行
var url = `/app/appresident/rank?id=${this.user.residentId}&type=1&areaId=${this.user?.areaId}` //积分排行
@@ -99,8 +98,8 @@ export default {
}
})
},
// 积分明细列表
getList() {
getList() {// 积分明细列表
// var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10` //积分明细
let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&type=1&current=${this.current}&size=10` //积分明细
this.$instance.post(url).then(res => {
@@ -331,7 +330,7 @@ export default {
width: 690px;
background: #FFF;
border-radius: 16px;
margin: 432px 0 0 32px;
margin: 0 0 0 32px;
padding: 30px 30px 94px;
box-sizing: border-box;

View File

@@ -0,0 +1,264 @@
<template>
<div class="page">
<div class="bg-blue"></div>
<div class="header-content">
<!-- <div class="item">
<div class="num color-5AAD6A">{{ info['家庭积分'] || '0' }}</div>
<div class="label">家庭总分</div>
</div>
<div class="item">
<div class="num color-4185F5">{{ info['剩余总分'] || '0' }}</div>
<div class="label">剩余总分</div>
</div>
<div class="item">
<div class="num color-CD413A">{{ info['家庭排行'] || '0' }}</div>
<div class="label">家庭排名</div>
</div> -->
<div class="left-content">
<p class="info"><span>绑定账号</span>当前未绑定账号</p>
<p class="info num"><span>总积分</span>4233</p>
</div>
<div class="cancel-btn">解除账号绑定</div>
<img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
</div>
<div class="btn">进行账号绑定</div>
<div class="detail-content" v-if="list.length">
<div class="title">积分明细</div>
<div class="item" v-for="(item, index) in list" :key="index">
<div class="item-info">
<p>{{ item.residentName + ':' }}{{ item.ruleName }}</p>
<span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
</div>
<div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
{{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
</div>
</div>
</div>
</div>
</template>
<script>
import {mapState} from 'vuex'
export default {
name: "workRank",
appName: "员工积分",
computed: {
...mapState(['user', 'token'])
},
data() {
return {
info: {},
current: 1,
list: [],
}
},
mounted() {
this.getInfo()
},
methods: {
// 积分排行
getInfo() {
this.info = {}
// var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}` //积分排行
var url = `/app/appresident/rank?id=${this.user.residentId}&type=0&areaId=${this.user?.areaId}` //积分排行
this.$instance.post(url).then(res => {
if (res.code === 0) {
this.info = res.data
}
})
},
getList() {
// var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10` //积分明细
let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&type=1&current=${this.current}&size=10` //积分明细
this.$instance.post(url).then(res => {
if (res?.data) {
if (this.current > res.data.pages) {
return
}
this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
}
})
},
},
onReachBottom() {
if (this.list.length < 50) {
this.current++;
this.getList()
}
},
}
</script>
<style scoped lang="scss">
@import "../../../../../../node_modules/dvcp-wui/common";
.page {
width: 100vw;
overflow-x: hidden;
background-color: #f3f6f9;
.bg-blue {
width: 100%;
height: 176px;
background-color: #4181FF;
}
.header-content {
width: 690px;
height: 184px;
background: #FFF;
border-radius: 16px;
margin: -130px 0 40px 30px;
padding: 32px;
box-sizing: border-box;
position: relative;
.left-content{
position: absolute;
top: 32px;
left: 32px;
z-index: 99;
}
.info{
height: 40px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
color: #333;
line-height: 40px;
span{
display: inline-block;
width: 140px;
color: #999;
}
}
.num{
margin-top: 40px;
font-size: 40px;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: #5AAD6A;
line-height: 48px;
span{
display: inline-block;
width: 140px;
color: #999;
font-weight: 400;
font-size: 28px;
line-height: 40px;
}
}
.cancel-btn{
width: 198px;
height: 56px;
line-height: 56px;
text-align: center;
border-radius: 28px;
border: 1px solid #4181FF;;
font-size: 26px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #4181FF;
position: absolute;
bottom: 32px;
right: 32px;
z-index: 99
;
}
img {
position: absolute;
width: 360px;
height: 250px;
top: -40px;
right: 0;
}
}
.btn{
width: 480px;
height: 88px;
line-height: 88px;
text-align: center;
background: #4181FF;
border-radius: 44px;
margin: 160px 0 0 136px;
font-size: 34px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FFF;
}
.mar-b4 {
margin-bottom: 8px;
}
.mar-b8 {
margin-bottom: 16px;
}
.detail-content {
width: 690px;
background: #FFF;
border-radius: 16px;
margin: 432px 0 0 32px;
padding: 30px 30px 94px;
box-sizing: border-box;
.title {
font-size: 34px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
line-height: 48px;
margin-bottom: 30px;
}
.item {
padding: 34px 0 32px 0;
border-bottom: 2px solid #ddd;
display: flex;
.item-info {
width: 500px;
p {
word-break: break-all;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333;
line-height: 44px;
}
span {
display: inline-block;
margin-top: 8px;
font-size: 24px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999;
line-height: 34px;
}
}
.item-num {
width: calc(100% - 500px);
text-align: right;
font-size: 36px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
line-height: 50px;
}
}
}
.color-0 {
color: #2C51CE !important;
}
.color-1 {
color: #E6736E !important;
}
.fixed-top {
z-index: 999;
}
}
</style>

View File

@@ -16,11 +16,11 @@
<div class="line"></div>
<u-form-item label="积分类型" prop="applyIntegralType" required :border-bottom="false" right-icon="arrow-right">
<!-- <u-form-item label="积分类型" prop="applyIntegralType" required :border-bottom="false" right-icon="arrow-right">
<u-input v-model="forms.applyIntegralType" disabled placeholder="请选择积分类型" @click="showStstus = true" />
<u-select v-model="showStstus" :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
</u-form-item>
</u-form-item> -->
<div class="form-item form-item__textarea">
<div class="form-item__wrapper">
@@ -61,7 +61,7 @@ export default {
forms: {
phone: '',
auditTime: '',
applyIntegralType: '',
// applyIntegralType: '',
applyIntegralTypeValue: '',
description: '',
applyFiles: [],
@@ -104,9 +104,9 @@ export default {
return this.$u.toast('请输入正确的手机号')
}
if (!this.forms.applyIntegralType) {
return this.$u.toast('请选择积分类型')
}
// if (!this.forms.applyIntegralType) {
// return this.$u.toast('请选择积分类型')
// }
if (!this.forms.content) {
return this.$u.toast('请输入事件描述')
}
@@ -122,7 +122,7 @@ export default {
.post(`/app/appvillagerintegraldeclare/addOrUpdate`, {
name: this.user.realName,
residentPhone: this.forms.phone,
applyIntegralType: this.forms.applyIntegralTypeValue,
// applyIntegralType: this.forms.applyIntegralTypeValue,
description: this.forms.content,
applyFiles: imgs || [],
residentId: this.user.residentId,

View File

@@ -20,12 +20,12 @@
</div>
</div>
<div class="cards">
<!-- <div class="cards">
<div class="cards-left">积分类型</div>
<div class="cards-right">
{{ $dict.getLabel('atWillReportType', detail.applyIntegralType) }}
</div>
</div>
</div> -->
<div class="cardss">
<div class="cards-left">事件描述</div>