Merge branch 'dev5.9.0' of Software/android-cloud-H5 into master

pages/introductionCloudPhone/index.vue

@@ -169,7 +169,7 @@ export default {
     },
     getSuggestApp() {
       this.$axios.$post('/public/v1/market/getSuggestApp', {
-        pageNum: 1, pageSize: -1
+        pageNum: 1, pageSize: -1, merchantCode: this.$route.query.merchantCode,
       }).then((res) => {
         this.applicationList = res.data
       });
@@ -181,7 +181,7 @@ export default {
     search() {
       if (!this.searchText) return
       this.appSeatchList.slice(0, this.appSeatchList.length)
-      this.$axios.$post('/public/v1/market/clientSearchSuggestApp', { pageSize: 100, pageNum: 1, appName: this.searchText }).then((res) => {
+      this.$axios.$post('/public/v1/market/clientSearchSuggestApp', { pageSize: 100, pageNum: 1, appName: this.searchText, merchantCode: this.$route.query.merchantCode }).then((res) => {
         this.appSeatchList = res.data.list
         this.isShow = false
         this.appSeatchList.forEach(element => {
@@ -194,7 +194,7 @@ export default {
         this.pay()
         return 
       }
-      let url = `/introductionCloudPhone/onlineService?token=${this.$route.query.token}`
+      let url = `/introductionCloudPhone/onlineService?token=${this.$route.query.token}&merchantCode=${this.$route.query.merchantCode}`
       if(this.$route.query.isWeixin) {
         url+= '&isWeixin=1'
       }

pages/transferDuration/components/tansferDuration.vue

@@ -152,7 +152,7 @@ export default {
         },
         // 获取云机列表
         getTransferPhoneList() {
-            this.$axios.$get('resources/v5/time/transfer/getTransferPhoneList', { header: { token: this.token, versionName: '5.7.4' } }).then(res => {
+            this.$axios.$get('resources/v5/time/transfer/getTransferPhoneList', { header: { token: this.token, versionName: '5.9.0' } }).then(res => {
                 if (res.success) {
                     this.transferPhoneList = res.data
                 }
@@ -168,7 +168,7 @@ export default {
 
         // 获取手续费比例
         getFeeRatio() {
-            this.$axios.$get('resources/v5/time/transfer/getFeeRatio', { headers: { Authorization: this.token, versionName: '5.7.4' } }).then(res => {
+            this.$axios.$get('resources/v5/time/transfer/getFeeRatio', { headers: { Authorization: this.token, versionName: '5.9.0' } }).then(res => {
                 if (res.success) {
                     res.data.transferMinDay = res.data.transferMinDay * 24 * 60
                     this.countObj = res.data
@@ -181,14 +181,14 @@ export default {
         // 确定提交
         async confirm() {
             // 获取服务器时间
-            let requestTime = await this.$axios.$get('pay/v1/order/getSystemTime', { headers: { Authorization: this.token, versionName: '5.7.4' } })
+            let requestTime = await this.$axios.$get('pay/v1/order/getSystemTime', { headers: { Authorization: this.token, versionName: '5.9.0' } })
 
             requestTime = new Date(requestTime.data * 1000).$formatTime()
             const requestTimeSign = sha256("Register_SZX_2023:" + requestTime)
             this.$axios.$post('resources/v5/time/transfer/transferDurationOperation', {
                 ...this.params,
                 requestTime
-            }, { headers: { Authorization: this.token, versionName: '5.7.4', requestTimeSign } }).then(res => {
+            }, { headers: { Authorization: this.token, versionName: '5.9.0', requestTimeSign } }).then(res => {
                 if (res.success) {
                     this.init()
                     Toast.success(res.msg)
@@ -240,7 +240,7 @@ export default {
             this.$axios.$get('/public/v4/agreement/content', {
                 params: {
                     agreementCoding: 'YJSBSJZY2024'
-                }, headers: { Authorization: this.token, versionName: '5.7.4' }
+                }, headers: { Authorization: this.token, versionName: '5.9.0' }
             }).then(res => {
                 const html = res.data.content;
                 const rx = /<body[^>]*>([\s\S]+?)<\/body>/i;

pages/transferDuration/components/transferRecord.vue

@@ -91,7 +91,7 @@ export default {
         // 获取转移记录
         getTransferDurationRecode() {
             this.pageLoading = true
-            this.$axios.$post('/resources/v5/time/transfer/getUserTransferRecode', { ...this.params }, { headers: { Authorization: this.token, versionName: '5.7.4' } }).then(res => {
+            this.$axios.$post('/resources/v5/time/transfer/getUserTransferRecode', { ...this.params }, { headers: { Authorization: this.token, versionName: '5.9.0' } }).then(res => {
                 if (res.success) {
                     this.list.push(...res.data.list)
                     this.total = res.data.total

plugins/axios.js

@@ -15,7 +15,7 @@ export default function ({ $axios, $auth, $userAgent, query, redirect }) {
     } else {
       config.headers.client = 7;
     }
-    config.headers.versionname = '5.8.2'
+    config.headers.versionname = '5.9.0';
     return config;
   });
   $axios.onResponse(async (response) => {

static/rtcEngine/js/WXtrialInterface.js

@@ -166,7 +166,7 @@ const app = new Vue({
             let { token, validTime } = this.parametersData
             // 给api增加需要的参数
             request.defaults.headers.Authorization = token
-            request.defaults.headers.versionname = '5.8.7'
+            request.defaults.headers.versionname = '5.9.0'
             window.onresize = () => {
                 this.getInitSize()
             }
@@ -176,13 +176,16 @@ const app = new Vue({
         connectWebRtc() {
             // console.time('获取推流响应消耗时间：')
             this.plugFlowStartTime = +new Date()
-            const { sn: topic, cardToken: authToken, internetHttps, internetHttp, webrtcTransferCmnet, webrtcTransferTelecom, webrtcTransferUnicom } = this.userCardInfoData;
+            const { sn: topic, cardToken: authToken, internetHttps, internetHttp, webrtcNetwork, webrtcTransferCmnet, webrtcTransferTelecom, webrtcTransferUnicom } = this.userCardInfoData;
             const isWss = location.protocol === 'https:'
             const url = `${isWss ? 'wss://' : 'ws://'}${isWss ? internetHttps : internetHttp}/nats`;
             const ICEServerUrl = [
-                { "CMNET": webrtcTransferCmnet || '' }, // 移动
-                { 'CHINANET-GD': webrtcTransferTelecom || '' }, // 电信
-                { 'UNICOM-GD': webrtcTransferUnicom || '' }, // 联通
+                // { "CMNET": webrtcTransferCmnet || '' }, // 移动
+                // { 'CHINANET-GD': webrtcTransferTelecom || '' }, // 电信
+                // { 'UNICOM-GD': webrtcTransferUnicom || '' }, // 联通
+                { "CMNET": webrtcNetwork },
+                { 'CHINANET-GD': webrtcNetwork  },
+                { 'UNICOM-GD': webrtcNetwork },
             ];
             const connection = {
                 name: "猪猪令是猪",
@@ -545,6 +548,15 @@ const app = new Vue({
                 5204: '云机异常，正在为你重新分配云机'
             }
             request.post('/api/resources/user/cloud/connect', { userCardId }).then(async res => {
+                console.log('res', res);
+                if (!res.success) { return }
+
+                const webrtcNetworkAnalysisReq = await request.get(res.data.webrtcNetworkAnalysis);
+                
+                console.log('webrtcNetworkAnalysisReq', webrtcNetworkAnalysisReq);
+                // 保存获取的连接地址到上个请求的响应中, 方便后面使用
+                res.data.webrtcNetwork = webrtcNetworkAnalysisReq.data;
+
                 const { isWeixin } = this.parametersData;
                 switch (res.status) {
                     case 0:

static/webRtcYJ/WXdraw.js

@@ -90,7 +90,7 @@ function doConnectDirectives() {
       url: baseUrl + '/api/public/v5/pushflow/popup',
       headers: {
         Authorization: token,
-        versionName: '5.8.0'
+        versionName: '5.9.0'
       },
       type: 'get',
       dataType: 'json',