From e1369a96aee2af72a04f98cdddefb03684dcb122 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 12 Aug 2021 17:39:10 +0800
Subject: [PATCH] 视频10 中文名
---
components/submit/submit.vue | 4 ++--
pages/groupChat/chating.vue | 4 +++-
pages/videoCall/videoCall.nvue | 10 ++++++++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/components/submit/submit.vue b/components/submit/submit.vue
index 0c2348f..68266b2 100644
--- a/components/submit/submit.vue
+++ b/components/submit/submit.vue
@@ -76,7 +76,7 @@
const recorderManager = uni.getRecorderManager()
export default {
- props: ['names'],
+ props: ['names','callname'],
data() {
return {
isrecord: false,
@@ -294,7 +294,7 @@
// // }
// }
var url = '../videoCall/videoCall?state=' + val + '&type=video' + '&myname=' + this.names[0] +
- '&toname=' + this.names[1]
+ '&toname=' + this.names[1] + '&callname=' + this.callname
console.log(url)
uni.navigateTo({
url: url
diff --git a/pages/groupChat/chating.vue b/pages/groupChat/chating.vue
index 909fe42..8042b6d 100644
--- a/pages/groupChat/chating.vue
+++ b/pages/groupChat/chating.vue
@@ -125,7 +125,7 @@
</view>
<!-- <view class="padbt"></view> -->
</scroll-view>
- <submit @inputs="inputs" :names="name"
+ <submit @inputs="inputs" :names="name" :callname="callName"
@heights="heights"/>
</view>
</template>
@@ -171,6 +171,8 @@
var data = JSON.parse(option.data)
console.log(data,55555555555555555555555)
this.name = ['wo',data.id];
+ // console.log(data)
+ this.callName = data.name;
},
methods:{
// 返回键
diff --git a/pages/videoCall/videoCall.nvue b/pages/videoCall/videoCall.nvue
index 1b13617..1b1c5c9 100644
--- a/pages/videoCall/videoCall.nvue
+++ b/pages/videoCall/videoCall.nvue
@@ -4,7 +4,7 @@
<view class="index" v-if="!videoShow">
<view class="Mains" v-if="isMain">
<view class="Mains-t">
- <text class="activetext">正在呼叫{{toName}}</text>
+ <text class="activetext">正在呼叫{{callname}}</text>
<u-loading size="36" mode="flower"></u-loading>
</view>
<!-- 挂断 -->
@@ -15,7 +15,7 @@
</view>
<view class="Receiver" v-if="!isMain">
<view class="Mains-t">
- <text class="activetext">是否接收来自{{formName}}的{{Otype}}请求</text>
+ <text class="activetext">是否接收来自{{callname}}的{{Otype == 'video'? '视频': '音频'}}请求</text>
<text class="activetext">接受进入{{channel}}</text>
<u-loading size="36" mode="flower"></u-loading>
</view>
@@ -209,6 +209,10 @@
formName: '',
+callname: '',
+
+
+
faqiid: '',
jieshouid: ''
@@ -223,6 +227,7 @@
onLoad(option) {
var that = this;
that.toName = option.toname;
+ that.callname = option.callname;
console.log(option)
if (option.type) {
that.Otype = option.type;
@@ -302,6 +307,7 @@
} else if (option.state == "Receiver") {
that.userName = 'jieshouren';
// that.formName = 'wo';
+ that.callname = option.name;
that.channel = option.room;
that.faqiid = option.faqiid;
that.jieshouid = that.$store.state.puserID;
--
Gitblit v1.9.3