From d645e5491fda5d116b1f19c41709a44f35f4f120 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 25 六月 2024 16:04:06 +0800
Subject: [PATCH] ''
---
admin/src/api/business/block.js | 8 +++++---
admin/src/views/business/blackmailPersonnel.vue | 8 ++++----
admin/src/views/business/freezePersonnel.vue | 7 ++++---
h5/pages/notice/notice.vue | 24 +++++++++++++++---------
admin/src/views/business/approvalConfiguration.vue | 2 ++
admin/src/views/operation/serviceCar/apprConfig.vue | 2 ++
admin/src/views/business/approvalReport.vue | 2 ++
7 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/admin/src/api/business/block.js b/admin/src/api/business/block.js
index c3eaff6..3f23fa8 100644
--- a/admin/src/api/business/block.js
+++ b/admin/src/api/business/block.js
@@ -9,9 +9,11 @@
// 浜哄憳绉婚櫎-瑙ｅ喕
export function updateRemoveStatusById (data) {
- return request.post('/visitsAdmin/cloudService/business/member/updateRemoveStatusById', data, {
- trim: true
- })
+ return request.get('/visitsAdmin/cloudService/business/member/batchRemoveFreeze?ids=' + data)
+}
+// 浜哄憳绉婚櫎-榛戝悕鍗�
+export function updateRemoveBlackById (data) {
+ return request.get('/visitsAdmin/cloudService/business/member/batchRemoveBlock?ids=' + data)
}
// 瀵煎嚭Excel
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index e9c66d7..8e374e7 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -319,6 +319,8 @@
item.level = index + 1
if (item.objIds && item.objIds.length > 0) {
item.objIds = item.objIds.map(i => i.id).join(',')
+ } else {
+ item.objIds = ''
}
})
approveTemplSave({
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index 3f9c573..49fee30 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/admin/src/views/business/approvalReport.vue
@@ -306,6 +306,8 @@
item.level = index + 1
if (item.objIds && item.objIds.length > 0) {
item.objIds = item.objIds.map(i => i.id).join(',')
+ } else {
+ item.objIds = ''
}
})
approveTemplSave({
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 7735fb3..e5208c4 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -80,7 +80,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { findAllList } from '@/api/system/common'
-import { updateRemoveStatusById } from '@/api/business/block'
+import { updateRemoveBlackById } from '@/api/business/block'
export default {
name: 'blackmailPersonnel',
extends: BaseTable,
@@ -111,9 +111,9 @@
thaws () {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
- return { id: item.id }
+ return item.id
})
- updateRemoveStatusById(ids)
+ updateRemoveBlackById(ids.join(','))
.then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.search()
@@ -125,7 +125,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- updateRemoveStatusById([{ id: ids }])
+ updateRemoveBlackById(ids)
.then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.search()
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index b5435b6..af0cf2e 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -48,7 +48,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="thaw([{id: row.id}])" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
+ <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
</template>
</el-table-column>
</el-table>
@@ -98,9 +98,10 @@
thaws () {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
- return { id: item.id }
+ // return { id: item.id }
+ return item.id
})
- this.thaw(ids)
+ this.thaw(ids.join(','))
},
thaw (ids) {
this.$confirm('纭畾瑙ｅ喕姝ょ敤鎴峰悧?', '鎻愮ず', {
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index c860674..e977f26 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -328,6 +328,8 @@
item.level = index + 1
if (item.objIds && item.objIds.length > 0) {
item.objIds = item.objIds.map(i => i.id).join(',')
+ } else {
+ item.objIds = ''
}
})
approveTemplSave({
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index 4e60ae9..4ad99a7 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -1,16 +1,19 @@
<template>
- <div class="container">
+ <view class="container">
<!-- <video
src="https://vdept3.bdstatic.com/mda-nj7gwfue9kdnbtsh/sc/cae_h264/1665488517815949255/mda-nj7gwfue9kdnbtsh.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1715141591-0-0-6dfdf4d4c3d94b60b9adeb53368a72f3&bcevod_channel=searchbox_feed&pd=1&cr=2&cd=0&pt=3&logid=0791905773&vid=13790089500387859718&klogid=0791905773&abtest="
></video> -->
<scroll-view scroll-y class="content">
- <div>
- <div v-html="content"></div>
- </div>
- <div class="empty"></div>
+ <view>
+ <view v-html="content"></view>
+ </view>
+ <view class="empty"></view>
</scroll-view>
- <div class="button" @click="toapply">宸茬煡鏅擄紝涓嬩竴姝�({{ num }}绉�)</div>
- </div>
+ <view class="button" :class="{disable: num > 0}" @click="toapply">
+ 宸茬煡鏅擄紝涓嬩竴姝�
+ <text v-if="num > 0">({{ num }}绉�)</text>
+ </view>
+ </view>
</template>
<script>
@@ -33,7 +36,7 @@
timer = setInterval(() => {
this.num--
if (this.num === 0) {
- this.toapply()
+ clearInterval(timer)
}
}, 1000)
},
@@ -67,7 +70,7 @@
})
},
toapply() {
- clearInterval(timer)
+ if(this.num > 0) return
if (this.answer === '0') {
uni.navigateTo({
url: '/pages/userinfo/userinfo'
@@ -122,5 +125,8 @@
bottom: 30rpx;
left: 30rpx;
}
+ .disable{
+ background-color: #cccccc;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3