diff --git a/.env.development b/.env.development index b3a21f5c..24eca2f5 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' @@ -16,7 +16,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # dev # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit -#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' + +VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' + # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' @@ -28,7 +30,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址x2 - +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.150:9601' # dev #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit diff --git a/.env.development.yh b/.env.development.yh index 910048f4..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/api/talk.js b/src/api/talk.js index bf91d768..357ea49c 100644 --- a/src/api/talk.js +++ b/src/api/talk.js @@ -1,10 +1,11 @@ import request from '@/api/request' -export const prepareApi = (name) => { +export const prepareApi = (data) => { return request({ - url: '/trapractice/audio/session/prepare?name=' + name, + url: '/trapractice/traPartnerVoiceCall/voiceCallPrepare' , method: 'post', toastErrors: true, + data, baseUrl: 'http://25.64.32.157:9603' }); }; \ No newline at end of file diff --git a/src/components/points-and-badge/badge.vue b/src/components/points-and-badge/badge.vue index a1e6da12..20ada5e1 100644 --- a/src/components/points-and-badge/badge.vue +++ b/src/components/points-and-badge/badge.vue @@ -20,7 +20,8 @@ - {{ item.pointsBadgeName }} + {{ item.pointsBadgeName }} + {{ item.remark }} @@ -30,7 +31,6 @@ - badgesList.value.length > 1); const titleNumberText = ['', '两', '三', '四', '五', '六', '七', '八', '九', '十']; const title = computed(() => - badgesList.value.length === 1 - ? '恭喜你获得徽章' - : `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章` + badgesList.value.length === 1 ? '恭喜你获得徽章' : `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章` ); const buttonColor = 'linear-gradient( 270deg, #F81758 0%, #FFA062 100%)'; const customStyle = { @@ -101,7 +99,7 @@ // 点击 const clickFun = (status = true) => { emits('confirm', status, pointsList.value, badgesList.value, () => {}); - CloseComplete(status, pointsList.value, badgesList.value) + CloseComplete(status, pointsList.value, badgesList.value); }; const open = (points = [], badges = [], complete = () => {}) => { @@ -110,7 +108,7 @@ return; } console.log('badges', badges); - CloseComplete = complete + CloseComplete = complete; badgesList.value = badges; pointsList.value = points; opacity.value = 1; @@ -118,8 +116,7 @@ uni.$emit('update_me_data', true); popup.value.open('center'); }; - onUnmounted(() => { - }); + onUnmounted(() => {}); defineExpose({ open, close }); @@ -130,20 +127,28 @@ align-items: center; justify-content: space-between; .swiper { - height: 660rpx; + height: 700rpx; flex: 1; margin: 0 50rpx; + // background-color: red; .swiper-item-div { display: flex; align-items: center; - justify-content: center; + // justify-content: center; flex-direction: column; + .points-title-div { + margin-top: 40rpx; + // position: absolute; + // bottom: 60rpx; + } .points-msg-div { - position: absolute; - bottom: -30rpx; + margin: 30rpx 20rpx 0 20rpx; + // position: absolute; + // bottom: 0rpx; } .img-div { + margin-top: 60rpx; position: relative; display: flex; align-items: center; @@ -215,15 +220,21 @@ flex-direction: column; } } - .points-msg-div { - height: 120rpx; + .points-title-div { + // height: 120rpx; font-family: PingFangSC, PingFang SC; font-weight: 500; font-size: 36rpx; color: #dec38c; - line-height: 120rpx; text-align: center; - font-style: normal; + } + .points-msg-div { + // height: 120rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 500; + font-size: 26rpx; + color: #dec38c; + text-align: center; } .button-div { height: 80rpx; diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue index 33f61916..a4f29369 100644 --- a/src/pages/competition/matching.vue +++ b/src/pages/competition/matching.vue @@ -75,6 +75,8 @@ {{ data_info.isAnony === 'N' ? data_info.orgIdName : '机构不显示' }} + + @@ -195,7 +197,6 @@ comId }); const pkData = pkDataBody.body; - // 下面两行是给后端擦屁股,后端传回的数值为空 pkData.orgId = orgId; pkData.papersId = papersId; pkData.userId = data_info.userId; @@ -214,6 +215,7 @@ }); // 2. 执行匹配成功动画（等待1.5秒） await new Promise((resolve) => setTimeout(resolve, 600)); + // 3. 清除计时器 if (practiceTimeTimer) { clearInterval(practiceTimeTimer); diff --git a/src/pages/competition/ranking.vue b/src/pages/competition/ranking.vue index 181895c5..67a00174 100644 --- a/src/pages/competition/ranking.vue +++ b/src/pages/competition/ranking.vue @@ -8,7 +8,6 @@ - { + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } }else{ showOverlayTalking(obj); @@ -310,18 +316,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -340,10 +345,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } diff --git a/src/pages/sparring/components/touchBtn.vue b/src/pages/sparring/components/touchBtn.vue index 5f51cd64..dd26ed33 100644 --- a/src/pages/sparring/components/touchBtn.vue +++ b/src/pages/sparring/components/touchBtn.vue @@ -6,7 +6,7 @@ {{'语音对话'}} - @@ -239,7 +239,13 @@ let _res = await getPermission() if (_res) { hasPermission.value = true - showOverlayTalking(obj); + setTimeout(()=>{ + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } } else { showOverlayTalking(obj); @@ -253,18 +259,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -283,10 +288,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } @@ -359,8 +364,12 @@ }; onShow(()=>{ // stopRecord() + // if(isGettingPermission.value){ + // hideOverlayTalking() + // } }) onHide(()=>{ + console.log('onHide') isGettingPermission.value = true }) diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 13afc20e..da1247cf 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -251,12 +251,14 @@ isLoading.value = false setTimeout(() => { showLoading.value = false - if(isPass.value && isOver.value && canLoad.value){ + if(isPass.value && isOver.value){ pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{}) } }, 800) } else { - setTimeout(getData, 2000) + if(canLoad.value){ + setTimeout(getData, 2000) + } } }).catch(()=>{ isLoading.value = false @@ -276,6 +278,7 @@ const isOver = ref(false) const goBack = () => { if(isOver.value){ + console.log(3) common.navigateBack(3) }else{ common.navigateBack() diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue index b3ef3b56..e01bbd05 100644 --- a/src/pages/sparring/talk.vue +++ b/src/pages/sparring/talk.vue @@ -1,5 +1,5 @@