Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_app

shuishen

2021-08-12 15a30e7b56c5a862e9c7d5001ec62e2251221231

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_app

 pages/videoCall/videoCall.nvue

@@ -208,10 +208,10 @@
                Otype: '',

                formName: '',
				

                faqiid: '',
                jieshouid:''
				
                jieshouid: ''

            }
        },
        // 页面初始加载（仅执行一次）
@@ -231,13 +231,13 @@
            }
            console.log(option.state);
            if (option.state == "Mains") {
				

                that.jieshouid = option.toname;
                that.faqiid = that.$store.state.puserID;

                that.isMain = true;
                var call = false;
                this.userName = that.$store.state.puserID + '-faqiren';
                this.userName = 'faqiren';
                this.init();
                // setTimeout(res => {
                //发起请求  给后端双方姓名
@@ -300,7 +300,7 @@

                // }, 5000)
            } else if (option.state == "Receiver") {
                that.userName = that.$store.state.puserID + '-jieshouren';
                that.userName = 'jieshouren';
                // that.formName = 'wo';
                that.channel = option.room;
                that.faqiid = option.faqiid;
@@ -450,6 +450,20 @@

                console.log("拒绝进入视频");
                uni.navigateBack();
                var data = {
                    sentId: this.faqiid,
                    acceptId: this.jieshouid
                }
                // uni.navigateBack();
                uni.request({
                    url: this.$store.state.api + '/pushMsg/closeVideoCall',
                    data: data,
                    success: (res) => {
                        // RtcModule.leaveChannel((res) => {});
                        // this.closeAll();
                        console.log(res, '成功关闭');
                    }
                })

                // RtcModule.leaveChannel((res) => {});
                // this.closeAll();
@@ -461,17 +475,17 @@
                // RtcModule.leaveChannel((res) => {});
                // this.closeAll();
                var data = {
                    sentId:this.faqiid,
                    sentId: this.faqiid,
                    acceptId: this.jieshouid
                }
                // uni.navigateBack();
                uni.navigateBack();
                uni.request({
                    url: this.$store.state.api + '/pushMsg/closeVideoCall',
                    data:data,
                    success:(res)=> {
                    data: data,
                    success: (res) => {
                        // RtcModule.leaveChannel((res) => {});
                        // this.closeAll();
                        console.log(res,'成功关闭');
                        console.log(res, '成功关闭');
                    }
                })
            },