diff --git a/pages.json b/pages.json index 98a5c10..26657a2 100644 --- a/pages.json +++ b/pages.json @@ -493,7 +493,7 @@ }, { "path": "pages/im/group/reviewed", - "name": "imGroupInvite", + "name": "imGroupReviewed", "style": { "navigationBarTitleText": "群聊邀请确认" } diff --git a/pages/im/components/messagePreview.nvue b/pages/im/components/messagePreview.vue similarity index 100% rename from pages/im/components/messagePreview.nvue rename to pages/im/components/messagePreview.vue diff --git a/pages/im/components/sentMessageBar.nvue b/pages/im/components/sentMessageBar.vue similarity index 100% rename from pages/im/components/sentMessageBar.nvue rename to pages/im/components/sentMessageBar.vue diff --git a/pages/im/components/sentPopups.nvue b/pages/im/components/sentPopups.vue similarity index 100% rename from pages/im/components/sentPopups.nvue rename to pages/im/components/sentPopups.vue diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.vue similarity index 100% rename from pages/im/components/sentText.nvue rename to pages/im/components/sentText.vue diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.vue similarity index 100% rename from pages/im/components/sentVoice.nvue rename to pages/im/components/sentVoice.vue diff --git a/pages/im/components/showImage.nvue b/pages/im/components/showImage.vue similarity index 100% rename from pages/im/components/showImage.nvue rename to pages/im/components/showImage.vue diff --git a/pages/im/components/showText.nvue b/pages/im/components/showText.vue similarity index 100% rename from pages/im/components/showText.nvue rename to pages/im/components/showText.vue diff --git a/pages/im/components/showVoice.nvue b/pages/im/components/showVoice.vue similarity index 100% rename from pages/im/components/showVoice.nvue rename to pages/im/components/showVoice.vue diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.vue similarity index 85% rename from pages/im/group/chat.nvue rename to pages/im/group/chat.vue index c62d24e..73ef8b0 100644 --- a/pages/im/group/chat.nvue +++ b/pages/im/group/chat.vue @@ -1,19 +1,23 @@ @@ -163,24 +167,24 @@ diff --git a/pages/im/group/reviewedInfo.vue b/pages/im/group/reviewedInfo.vue new file mode 100644 index 0000000..dc5a399 --- /dev/null +++ b/pages/im/group/reviewedInfo.vue @@ -0,0 +1,62 @@ + + + + + + diff --git a/pages/im/index.vue b/pages/im/index.vue index b4b715d..0555e65 100644 --- a/pages/im/index.vue +++ b/pages/im/index.vue @@ -99,7 +99,7 @@ code, conversations }) => { - if (code === 0) { + if (code === 0) { this.conversations = conversations } }) diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue index f4be96d..e92287c 100644 --- a/pages/im/private/call.nvue +++ b/pages/im/private/call.nvue @@ -10,8 +10,7 @@ - + {{ contact(targetId).name }} 等待对方接听 已接通 @@ -68,10 +67,10 @@ }, onLoad(e) { this.targetId = e.targetId - this.mediaType = e.mediaType - // 进入页面开启外呼 - CallLib.startSingleCall(this.targetId, this.mediaType, ''); - + this.mediaType = e.mediaType + // 进入页面开启外呼 + CallLib.startSingleCall(this.targetId, this.mediaType, ''); + // 响铃 this.startRing() // 监听通话链接状态 uni.$once('onCallConnected', this.onCallConnected) @@ -92,11 +91,11 @@ }, windowHeight() { return uni.getSystemInfoSync().windowHeight - }, - contact() { - return function(targetId) { - return this.$store.getters.contactInfo(targetId) - } + }, + contact() { + return function(targetId) { + return this.$store.getters.contactInfo(targetId) + } } }, methods: { @@ -120,10 +119,8 @@ if (this.mediaType == 1) { const session = CallLib.getCurrentCallSession() setTimeout(() => { - CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, - false) - CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, - true) + CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false) + CallLib.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, true) }, 200) } }, diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.vue similarity index 85% rename from pages/im/private/chat.nvue rename to pages/im/private/chat.vue index ea795d3..1175f79 100644 --- a/pages/im/private/chat.nvue +++ b/pages/im/private/chat.vue @@ -1,9 +1,9 @@ @@ -78,7 +79,7 @@ this.targetId = e.targetId this.userInfo = this.$store.getters.contactInfo(this.targetId) uni.setNavigationBarTitle({ - title: this.userInfo.name + title: this.contact(this.targetId).name }) // 获取消息列表 this.getMessageList() @@ -169,31 +170,25 @@ /* 窗口 */ .chat { background: $window-color; - flex: 1; - + height: 100vh; + display: flex; + flex-direction: column; .body { flex: 1; + overflow: scroll; .cell { padding: 10rpx 30rpx; .time { - justify-content: center; - align-items: center; - padding-bottom: 20rpx; - - .text { - background: #fff; - font-size: 24rpx; - color: #666; - line-height: 40rpx; - padding: 0 20rpx; - border-radius: 10rpx; - } + text-align: center; + font-size: 24rpx; + color: #666; } .cell-item { + display: flex; width: 690rpx; justify-content: flex-start; @@ -223,7 +218,7 @@ .state-text-active { font-size: $title-size-m - 2; - color: #cecece; + color: #cecece; } } } diff --git a/utils/im/index.js b/utils/im/index.js index d969209..320af90 100644 --- a/utils/im/index.js +++ b/utils/im/index.js @@ -18,7 +18,9 @@ const initIm = (KEY) => { // 初始化的时候 自动链接 if (store.getters.getToken !== '') { getImToken().then(res => { - connect(res.token, res.userInfo, () => {}) + connect(res.token, res.userInfo, (res) => { + console.log('IM.CONNECT', res); + }) }) } }