diff --git a/.env.development.yh b/.env.development.yh
index 95d4857d..193ce295 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -4,8 +4,8 @@ ENV = 'development.yh'
# VITE_APP_BASE_H5_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.78:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# 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'
diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue
index 429f1f15..cd94d9df 100644
--- a/src/pages/analytics/study.vue
+++ b/src/pages/analytics/study.vue
@@ -131,7 +131,7 @@
-
+
{{suggestObj.content}}
@@ -238,6 +238,8 @@
common.msg('学习分析生成中,请稍后再试!')
}
const getInfoNow = async (params) => {
+ statisticsObj.value = []
+ dimesionList.value =[]
loading.value = true
loading2.value = true
loading1.value = true
@@ -267,6 +269,10 @@
suggestObj.value = {
..._res4.body[0]
}
+ }else{
+ suggestObj.value = {
+ content: ''
+ }
}
loading3.value = false
}).catch(() => {
diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index 4a561726..16324113 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -296,8 +296,7 @@
const isOver = ref(false)
const goBack = () => {
if (isOver.value) {
- console.log(3)
- common.navigateBack(3)
+ common.navigateBack(2)
} else {
common.navigateBack()
}
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 139b29f0..f598ce35 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -69,6 +69,7 @@
{{ detailInfo.sceneDesc }}
+ 陪练角色不具备主动终止场景陪练的功能,当用户完成预设陪练目标时,需由用户手动发起结束陪练操作。
-请点击下方按钮开始{{ detailInfo.traInterTypDesc }}
@@ -259,7 +260,7 @@
traInterTyp: detailInfo.value.traInterTyp,
traInterTypDesc: detailInfo.value.traInterTypDesc,
});
- common.navigateTo(
+ common.redirectTo(
'/pages/sparring/talk?traId=' +
traId.value +
'&chaId=' +
@@ -331,7 +332,7 @@
reconcatNum.value += 1;
// common.redirectTo(`/pages/index/dialog`);
socketStore?.closeSocket();
- common.navigateTo(
+ common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -466,7 +467,8 @@
if (commond === 'ASK-OVER') {
console.log(body);
console.log('陪练已结束,去结果页面!');
- common.navigateTo(
+ socketStore?.closeSocket();
+ common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -528,7 +530,7 @@
});
socketStore?.closeSocket();
changePlayItemId('');
- common.navigateTo(
+ common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -539,7 +541,7 @@
(isPreview.value ? '1' : '')
);
// pointAndBadgesRun(talkingType.value === '01'? '07': '08', '', ()=>{
- // common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
+ // common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
// })
})
.catch(() => {
@@ -890,7 +892,13 @@
text-align: center;
}
}
-
+ .talking-desc{
+ // padding-top: 24rpx;
+ padding: 24rpx 20rpx 0;
+ font-size: 24rpx;
+ // text-align: center;
+ color: #999;
+ }
.talking-box {
padding-top: 24rpx;
.tip-text {