查看消息调准
This commit is contained in:
@@ -56,7 +56,7 @@
|
|||||||
.text {
|
.text {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
max-width: 502rpx;
|
max-width: 502rpx;
|
||||||
padding:10rpx 24rpx;
|
padding:10rpx 30rpx;
|
||||||
line-height: 46rpx;
|
line-height: 46rpx;
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
color: $text-color;
|
color: $text-color;
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
<view class="">
|
<view class="">
|
||||||
<view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
|
<view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
|
||||||
{{ message.content.message }}
|
{{ message.content.message }}
|
||||||
<text class="link" @click="toAnnounce(message.content.extra)"
|
<text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
|
||||||
v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看 </text>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
|
<view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
|
||||||
{{ contact(message.senderUserId).name }} 撤回了一条消息
|
{{ contact(message.senderUserId).name }} 撤回了一条消息
|
||||||
@@ -32,11 +31,11 @@
|
|||||||
import showText from './show/showText'
|
import showText from './show/showText'
|
||||||
import showCall from './show/showCall'
|
import showCall from './show/showCall'
|
||||||
import utils from '@/utils/index.js'
|
import utils from '@/utils/index.js'
|
||||||
import imBase from '../mixins/imBase.js'
|
import imBase from '../mixins/imBase.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [
|
mixins: [
|
||||||
imBase
|
imBase
|
||||||
],
|
],
|
||||||
components: {
|
components: {
|
||||||
showCall,
|
showCall,
|
||||||
@@ -69,10 +68,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 跳转群公告
|
// 跳转群公告
|
||||||
toAnnounce(targetId) {
|
toAnnounce(message) {
|
||||||
if (targetId) {
|
if (message.content.extra) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
|
url: '/pages/im/group/announceCreate?type=cheack&targetId=' + message.targetId + '&aId=' + message.content.extra
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
@@ -126,7 +125,7 @@
|
|||||||
color: #666;
|
color: #666;
|
||||||
|
|
||||||
.link {
|
.link {
|
||||||
color: blue;
|
color: $main-color;
|
||||||
margin-left: 10rpx;
|
margin-left: 10rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="create">
|
<view class="create">
|
||||||
<view class="create-title">公告内容</view>
|
<view class="create-title">公告内容</view>
|
||||||
<block v-if="type !== 'check'">
|
<block v-if="type !== 'cheack'">
|
||||||
<u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
|
<u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
|
||||||
<u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
|
<u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
|
||||||
</block>
|
</block>
|
||||||
<block v-if="type === 'check'">
|
<block v-if="type === 'cheack'">
|
||||||
<view class="content-a"> {{content}} </view>
|
<view class="content-a"> {{content}} </view>
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
@@ -27,13 +27,17 @@
|
|||||||
targetId: '',
|
targetId: '',
|
||||||
content: '',
|
content: '',
|
||||||
aId: '',
|
aId: '',
|
||||||
type: '' // check ' 查看详情'
|
type: '' // cheack ' 查看详情'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
|
console.log(e,'e,,,,,')
|
||||||
this.targetId = e.targetId
|
this.targetId = e.targetId
|
||||||
if (e.type) {
|
if (e.type) {
|
||||||
this.type = e.type
|
this.type = e.type
|
||||||
|
uni.setNavigationBarTitle({
|
||||||
|
title:' 公告内容'
|
||||||
|
})
|
||||||
}
|
}
|
||||||
if (e.aId) {
|
if (e.aId) {
|
||||||
this.aId = e.aId
|
this.aId = e.aId
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
onNavigationBarButtonTap() {
|
onNavigationBarButtonTap() {
|
||||||
if (this.isAdmin) {
|
if (this.isAdmin) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
|
url: '/pages/im/group/announceCreate?targetId=' + this.targetId
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
@@ -121,7 +121,7 @@
|
|||||||
},
|
},
|
||||||
tabA(id) {
|
tabA(id) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
|
url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
onTop(aId) {
|
onTop(aId) {
|
||||||
@@ -134,14 +134,6 @@
|
|||||||
uni.$emit('updateAnnouncement')
|
uni.$emit('updateAnnouncement')
|
||||||
this.initData()
|
this.initData()
|
||||||
})
|
})
|
||||||
// uni.showModal({
|
|
||||||
// title: ' 置顶该公告',
|
|
||||||
// success: (res) => {
|
|
||||||
// if (res.confirm) {
|
|
||||||
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
},
|
},
|
||||||
// 删除公告
|
// 删除公告
|
||||||
onDelete(aId) {
|
onDelete(aId) {
|
||||||
@@ -154,14 +146,6 @@
|
|||||||
uni.$emit('updateAnnouncement')
|
uni.$emit('updateAnnouncement')
|
||||||
this.initData()
|
this.initData()
|
||||||
})
|
})
|
||||||
// uni.showModal({
|
|
||||||
// title: '删除该公告',
|
|
||||||
// success: (res) => {
|
|
||||||
// if (res.confirm) {
|
|
||||||
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user