diff --git a/src/mods/conv/score/AppCreditPoints/AppCreditPoints.vue b/src/mods/conv/score/AppCreditPoints/AppCreditPoints.vue index 42787bc..874c52a 100644 --- a/src/mods/conv/score/AppCreditPoints/AppCreditPoints.vue +++ b/src/mods/conv/score/AppCreditPoints/AppCreditPoints.vue @@ -5,8 +5,8 @@
{{ item }}
+ - @@ -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; } diff --git a/src/mods/conv/score/AppCreditPoints/bindWorkUser.vue b/src/mods/conv/score/AppCreditPoints/bindWorkUser.vue new file mode 100644 index 0000000..b744f0e --- /dev/null +++ b/src/mods/conv/score/AppCreditPoints/bindWorkUser.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/mods/conv/score/AppCreditPoints/components/familyRank.vue b/src/mods/conv/score/AppCreditPoints/components/familyRank.vue index 0417f30..6ed8fd5 100644 --- a/src/mods/conv/score/AppCreditPoints/components/familyRank.vue +++ b/src/mods/conv/score/AppCreditPoints/components/familyRank.vue @@ -16,27 +16,27 @@ -
+
{{ $formatName(info['列表'][1].name) }}
-

{{ info['列表'][1].name }}家

+

{{ info['列表'][1].name }}

{{ info['列表'][1].integral }}

{{ $formatName(info['列表'][0].name) }}
-

{{ info['列表'][0].name }}家

+

{{ info['列表'][0].name }}

{{ info['列表'][0].integral }}

{{ $formatName(info['列表'][2].name) }}
-

{{ info['列表'][2].name }}家

+

{{ info['列表'][2].name }}

{{ info['列表'][2].integral }}

@@ -45,11 +45,23 @@ {{ index + 1 }}
{{ $formatName(item.name) }}
- {{ item.name }}家 + {{ item.name }} {{ item.integral }}
+
+
积分明细
+
+
+

{{ item.residentName + ':' }}{{ item.eventDesc }}

+    {{ item.doTime }} +
+
+ {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }} +
+
+
@@ -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; diff --git a/src/mods/conv/score/AppCreditPoints/components/userRank.vue b/src/mods/conv/score/AppCreditPoints/components/userRank.vue index 97ed79b..2fbafc8 100644 --- a/src/mods/conv/score/AppCreditPoints/components/userRank.vue +++ b/src/mods/conv/score/AppCreditPoints/components/userRank.vue @@ -50,7 +50,7 @@
积分明细
-

{{ item.residentName + ':' }}{{ item.ruleName }}

+

{{ item.residentName + ':' }}{{ item.eventDesc }}

   {{ item.doTime }}
@@ -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}¤t=${this.current}&size=10` //积分明细 let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&type=1¤t=${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; diff --git a/src/mods/conv/score/AppCreditPoints/components/workRank.vue b/src/mods/conv/score/AppCreditPoints/components/workRank.vue new file mode 100644 index 0000000..62e9e22 --- /dev/null +++ b/src/mods/conv/score/AppCreditPoints/components/workRank.vue @@ -0,0 +1,264 @@ + + + diff --git a/src/mods/conv/score/AppIntegralApply/add.vue b/src/mods/conv/score/AppIntegralApply/add.vue index 70010e1..e461526 100644 --- a/src/mods/conv/score/AppIntegralApply/add.vue +++ b/src/mods/conv/score/AppIntegralApply/add.vue @@ -16,11 +16,11 @@
- +
@@ -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, diff --git a/src/mods/conv/score/AppIntegralApply/detail.vue b/src/mods/conv/score/AppIntegralApply/detail.vue index e57d5f0..7286b44 100644 --- a/src/mods/conv/score/AppIntegralApply/detail.vue +++ b/src/mods/conv/score/AppIntegralApply/detail.vue @@ -20,12 +20,12 @@
-
+
事件描述