diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue index 6291e097..f1d3dba2 100644 --- a/src/views/modules/heart/actuserclock-detail.vue +++ b/src/views/modules/heart/actuserclock-detail.vue @@ -2,39 +2,56 @@
-
处理操作 :
- - - 确认加积分 - 拒绝加积分 - - - - - - {{ $t('confirm') }} - {{ '返回' }} - - +
+
处理操作 :
+ + + 确认加积分 + 拒绝加积分 + + + + + + {{ $t('confirm') }} + {{ '返回' }} + + +
+
+ {{dataForm.status}} +
本次活动已确认加积分
+
如有积分调整,请在“志愿者管理-积分调整”里对该用户进行增或减积分操作
+ {{ '返回' }} +
+
+ {{dataForm.status}} +
本次活动已拒绝加积分
+
如有积分调整,请在“志愿者管理-积分调整”里对该用户进行增或减积分操作
+ {{ '返回' }} +
+
打卡位置 : {{dataForm.address}}
@@ -259,12 +276,13 @@ export default { ...this.dataForm, ...res.data } - if (res.data.status !== '5' && res.data.status !== '6') { - this.dataForm.status = '5' - this.dataForm.failureReason = '' - } else { - this.isAble = true - } + this.dataForm.status = '5'; + // if (res.data.status != '5' && res.data.status != '6') { + // this.dataForm.status = '5'; + // this.dataForm.failureReason = ''; + // } else { + // this.isAble = true; + // } this.setMap(res.data) this.getDataList() @@ -306,9 +324,9 @@ export default { if (this.dataForm.failureReason.length > 100) { return this.$message.error('处理意见不超过100字') } - this.isAble = true + // this.isAble = true this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm).then(({ data: res }) => { - this.isAble = false + // this.isAble = false if (res.code !== 0) { return this.$message.error(res.msg) } @@ -458,5 +476,10 @@ export default { text-align: center; } } + .info { + height: 100%; + background: #fff; + margin-bottom: 0px; + } } diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue index 2ecc7e42..6683267c 100644 --- a/src/views/modules/heart/actuserrelation.vue +++ b/src/views/modules/heart/actuserrelation.vue @@ -170,6 +170,7 @@ export default { mounted () { this.dataForm.actId = this.$route.query.id this.getDataList() + this.dataListLoading = false }, methods: { backToActList () {