diff --git a/.env.development b/.env.development
index cf5bbd49..8723b259 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
@@ -23,7 +23,7 @@ VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
# DEV
# app入口
-# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
# VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
diff --git a/.env.development.yh b/.env.development.yh
index 0e2f8894..e9359d3e 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -4,7 +4,7 @@ ENV = 'development.yh'
VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
diff --git a/src/manifest.json b/src/manifest.json
index 05f2606c..0a4b6c05 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -35,7 +35,8 @@
"Camera" : {},
"Barcode" : {},
"Record" : {},
- "VideoPlayer" : {}
+ "VideoPlayer" : {},
+ "LivePusher" : {}
},
/* 应用发布信息 */
"distribute" : {
diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index ae72030d..c8819362 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -250,7 +250,7 @@
isLoading.value = false
setTimeout(() => {
showLoading.value = false
- if(isPass.value && isOver.value){
+ if(isPass.value && isOver.value && canLoad.value){
pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{})
}
}, 800)
@@ -280,7 +280,9 @@
common.navigateBack()
}
}
+ const canLoad= ref(false)
onLoad((params) => {
+ canLoad.value= true
traId.value = params.traId;
execId.value = params.execId
talkingType.value = params.type;
@@ -289,6 +291,9 @@
isOver.value = params.isOver === '1'
getData()
});
+ onUnload(()=>{
+ canLoad.value= false
+ })
onMounted(() => {})
onBackPress((res) => res.from === 'backbutton');
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index 970ee47a..f696c2b2 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -2,5 +2,5 @@
\ No newline at end of file
diff --git a/src/pages/sparring/talkCom.nvue b/src/pages/sparring/talkCom.nvue
new file mode 100644
index 00000000..098c07b0
--- /dev/null
+++ b/src/pages/sparring/talkCom.nvue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/sparring/talkCom.vue b/src/pages/sparring/talkCom.vue
deleted file mode 100644
index 280ed09d..00000000
--- a/src/pages/sparring/talkCom.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file