diff --git a/.env.development b/.env.development index ea92cff2..67f5d356 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' @@ -14,7 +14,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://192.168.108.129' # dev -# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/pages.json b/src/pages.json index 20c296e6..6909ab85 100644 --- a/src/pages.json +++ b/src/pages.json @@ -515,6 +515,7 @@ "path": "pages/sparring/result", "style": { "navigationBarTitleText": "AI陪练报告", + "disableSwipeBack": true, "app-plus": { "titleNView": false } diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 5bc4ab0a..4f4c9688 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -87,7 +87,8 @@ import { onShow, onLoad, - onUnload + onUnload, + onBackPress } from '@dcloudio/uni-app'; import common from '@/common/common' import Feedback from './components/feedback.vue'; @@ -275,6 +276,7 @@ getData() }); onMounted(() => {}) + onBackPress((res) => res.from === 'backbutton');