diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 21397279..ce425527 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -119,6 +119,8 @@ + + @@ -134,6 +136,8 @@ import TalkingItem from '@/pages/course/components/talkingItem.vue' import ImagePreview from '@/components/image-preview/image-preview.vue' import PreviewDetail from '@/components/image-preview/preview-detail.vue' import TouchBtn from '@/pages/course/components/touchBtn.vue' +import badge from '@/components/points-and-badge/badge'; +import points from '@/components/points-and-badge/points'; import { useSocketStore } from '@/store/socket.js' import { useStorageStore } from '@/store/storage.js' @@ -159,6 +163,8 @@ const flagVal = ref('1') const isUploadingVoice = ref(false) const isPreview = ref(false) const IsAndEnv = ref(getPhoneEnvBool('AND')) +const badgeRef = ref(null); +const pointsRef = ref(null); const ajaxApi = computed(() => (isPreview.value ? textChartPreviewApi : textChartApi)) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index ae474ff7..8a047825 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -163,6 +163,7 @@ } from '@/api/dialog.js'; import Feedback from './components/feedback.vue'; import History from './components/history.vue'; + import badge from '@/components/points-and-badge/badge'; const { statusBarHeight } = uni.getWindowInfo(); diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index dcdadc6b..a309e982 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -99,6 +99,7 @@ } from "@/api/sparring.js" const traId = ref('') const execId = ref('') + const talkingType = ref('') const feedbackRef = ref() const roleInfo = ref({}) const showAllTalk = ref(false) @@ -251,6 +252,7 @@ onLoad((params) => { traId.value = params.traId; execId.value = params.execId + talkingType.value = params.type; showLoading.value = true getData() }); diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index 6b97136a..2e318ba0 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -249,7 +249,7 @@ const answerText = ref('') const touchBtnCallBack = ref(null) const initsocketTask = () => { - let _src = talkingType.value === 'preview'?'/trapractice/partnersocket/open':'/trapractice/partnersocket/open' + let _src = talkingType.value === 'preview'?'/trapractice/previewsocket/open':'/trapractice/partnersocket/open' socketStore.creatSocket(_src + '?summary='); // unref(SocketObj).on('open', (res)=>{ // if(!answerIsOver.value){ @@ -404,11 +404,12 @@ const overTalking = () => { partnerChatReportTrigger({ execId: execId.value, - traId: traId.value + traId: traId.value, + talkingType: talkingType.value }).then(res=>{ watchFlag.value = 1; socketStore?.closeSocket(); - common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value) + common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value) }) } const sendMessage = (data) => {