tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2025-09-18 09:30:19 +08:00
parent 2848d09f87 08aa896325
commit c6deeaf412
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+3 -3
View File
@@ -24,16 +24,16 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# dev
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7002'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# sit
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
# UAT
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# 任东
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
# 张建成
src/enum.js
+2 -1
View File
@@ -31,4 +31,5 @@ export const SUBJECT_TYPE = [{
value: "ES",
label: "问答题",
}
]
]
export const defaultAvatar = '/static/images/me/default_user_avatar.png'
src/pages/course/components/talkingItem.vue
+13 -1
View File
@@ -389,12 +389,24 @@
pauseVoice()
})
talkVoiceObj.value.onEnded(()=>{
console.log('onEnded')
emit('changePlay', '')
talkVoiceObj.value.src = ''
})
talkVoiceObj.value.onError(()=>{
talkVoiceObj.value.onStop(()=>{
console.log('onStop')
emit('changePlay', '')
talkVoiceObj.value.src = ''
})
talkVoiceObj.value.onPause(()=>{
console.log('onPause')
emit('changePlay', '')
})
talkVoiceObj.value.onError(()=>{
console.log('onError')
talkVoiceObj.value.src = ''
emit('changePlay', '')
})
const pauseVoice = () => {
if(!talkVoiceObj.value) return
talkVoiceObj.value.pause()
src/pages/examRanking/index.vue
+7 -3
View File
@@ -28,7 +28,8 @@
</view>
<view class="user-column">
<view class="avatar-box">
<image-preview class="avatar-image" :src="item.ossKey" mode="aspectFit"></image-preview>
<image-preview v-if="item.ossAddr" class="avatar-image" :src="item.ossAddr" mode="aspectFit"></image-preview>
<image v-else class="avatar-image" :src="defaultAvatarSrc"></image>
</view>
<view class="user-name">{{item.userName}}</view>
<view class="user-org">{{item.orgName}}</view>
@@ -48,7 +49,8 @@
</view>
<view class="user-column">
<view class="avatar-box">
<image-preview class="avatar-image" :src="userRankObj.ossKey" mode="aspectFit"></image-preview>
<image-preview v-if="item.ossAddr" class="avatar-image" :src="userRankObj.ossAddr" mode="aspectFit"></image-preview>
<image class="avatar-image" v-else :src="defaultAvatarSrc"></image>
</view>
<view class="user-name">{{userRankObj.userName}}</view>
<view class="user-org">{{userRankObj.orgName}}</view>
@@ -63,6 +65,7 @@
<script>
import { queryTraCrsRankingList } from "@/api/courseDetail.js"
import { queryPaperExamRankingList } from "@/api/examination.js"
import { defaultAvatar } from "@/enum.js"
import common from '@/common/common'
export default {
data() {
@@ -70,7 +73,8 @@
crsId: '',
papersId : '',
userList: [],
userRankObj:{}
userRankObj:{},
defaultAvatarSrc: defaultAvatar
}
},
onLoad(params){
src/pages/me/index.vue
+3 -1
View File
@@ -13,7 +13,7 @@
class="img_100"
:src="user_info.imageAddr"
></image-preview>
<image v-else class="img_100" src="/static/images/me/default_user_avatar.png"></image>
<image v-else class="img_100" :src="defaultAvatarSrc"></image>
</view>
<view class="personal_information_data">
<view class="name_sex_div">
@@ -156,6 +156,8 @@
import { uploadFile } from '@/api/common';
import { setMascot } from '@/common/mascot.js';
import { queryCurrentUser } from '@/api/login.js';
import { defaultAvatar } from "@/enum.js"
const defaultAvatarSrc = computed(()=> defaultAvatar)
const badgeList = [
{
name: '黑铁',