diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index 6c71b55d..68bde947 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -487,29 +487,37 @@ const overTalking = () => { }) } const overNow = (cb = () => {}) => { - partnerChatReportTrigger({ - execId: execId.value, - traId: traId.value, - talkingType: isPreview.value ? 'preview' : 'practice' - }) - .then(res => { - watchFlag.value = 1 - sendMessage({ - commond: 'ASK-STOP', - body: { - execId: execId.value || '' - } - }) - socketStore?.closeSocket() - changePlayItemId('') - common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ? '1' : '')) - // pointAndBadgesRun(talkingType.value === '01'? '07': '08', '', ()=>{ - // common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':'')) - // }) - }) - .catch(() => { - cb() - }) + watchFlag.value = 1 + sendMessage({ + commond: 'ASK-STOP', + body: { + execId: execId.value || '' + } + }) + socketStore?.closeSocket() + changePlayItemId('') + common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ? '1' : '')) + + // partnerChatReportTrigger({ + // execId: execId.value, + // traId: traId.value, + // talkingType: isPreview.value ? 'preview' : 'practice' + // }) + // .then(res => { + // watchFlag.value = 1 + // sendMessage({ + // commond: 'ASK-STOP', + // body: { + // execId: execId.value || '' + // } + // }) + // socketStore?.closeSocket() + // changePlayItemId('') + // common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ? '1' : '')) + // }) + // .catch(() => { + // cb() + // }) } const sendMessage = data => { unref(SocketObj).send(data)