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

修改bug

Browse Source
This commit is contained in:
田岩
2025-07-11 16:00:56 +08:00
parent 297875755a
commit ff3ed2a765
6 changed files with 11173 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/picture-upload/picture-upload.vue
+18 -3
View File
@@ -52,7 +52,13 @@
mark: {
type: [String, Number],
default: ''
}
},
fileType: {
type: Array,
default: function() {
return ['jpg', 'png']
}
},
})
// 状态管理
const fileList = reactive([])
@@ -105,13 +111,22 @@
success: async ({
tempFilePaths
}) => {
const valid = tempFilePaths.every(url => {
if (props.fileType.length === 0) return true;
console.log(url);
const lastDotIndex = url.lastIndexOf('.')
if (lastDotIndex === -1) return false;
const extension = url.slice(lastDotIndex + 1).split('?')[0].toLowerCase()
return props.fileType.includes(extension)
})
if (!valid) return common.msg('您选择的图片格式有误。')
console.log(valid)
const data = {
bizScen: 'S3005'
}
console.log(tempFilePaths[0]);
const upload_map = tempFilePaths.map((file) => uploadFile(file, data))
Promise.all(upload_map).then(res => {
fileList.push(...res)
fileList.push(...res.splice(0, props.limit - fileList.length))
emits('update:modelValue', fileList.map(res => res.fileId))
}).catch(() => {
src/pages/courseDetail/components/knowledge.vue
+13 -3
View File
@@ -5,9 +5,9 @@
<view class="blue-ball">
<view class="ball"></view>
</view>
<view class="fz-30 font_pf title">知识点0{{ index + 1 }}</view>
<view class="fz-30 font_pf title">知识点{{ item.pgrphNm }}</view>
<view class="fl1">
</view>
<view class="font_pf fz-24 study-status" >
{{ item.pgrphStdyStateName }}
@@ -21,14 +21,24 @@
</template>
<script setup>
import {computed} from "vue"
import common from '@/common/common';
const emit = defineEmits(['toStudyPrgh'])
const props = defineProps({
modelValue: Object
})
const min_no_success_id = computed(() => {
const find_item = props.modelValue?.pgrphData.find(res => (res.pgrphStdyStateName == '未学习' || res.pgrphStdyStateName == '学习中'))
return find_item?.pgrphId || ''
})
const toDetail = (item) => {
emit('toStudyPrgh', item)
if (item.pgrphStdyStateName == '已学习' || item.pgrphStdyStateName == '学习中' || min_no_success_id.value == item.pgrphId) {
emit('toStudyPrgh', item)
} else {
common.msg('请按顺序学习知识点')
}
}
</script>
src/pages/courseDetail/index.vue
+1
View File
@@ -82,6 +82,7 @@
import {
getCourseDetailApi
} from '@/api/courseDetail.js';
import common from '@/common/common';
import introduceVue from './components/introduce.vue';
import knowledge from './components/knowledge.vue';
src/pages/courseDetail/submit.vue
+2 -4
View File
@@ -37,7 +37,7 @@
</view>
<view class="input-textarea">
<uv-textarea v-model="formData.bbsContent" height="124" count
:maxlength="TextareaInputLimitCharacter"
:maxlength="100"
:placeholder="formData.bbsTag == 'SUG'?'请输入你的建议...':'请输入你的问题...'"></uv-textarea>
</view>
</view>
@@ -53,9 +53,7 @@
reactive,
ref
} from 'vue';
import {
TextareaInputLimitCharacter
} from "@/enum.js"
import {
onLoad
} from '@dcloudio/uni-app';
src/pages/me/index.vue
+310 -295
View File
@@ -10,7 +10,8 @@
<view class="profile">
<!-- <image-preview v-if="user_info.imageAddr" class="img_100" :src="user_info.imageAddr"></image-preview> -->
<image v-if="user_info.imagePath" class="img_100" :src="user_info.imagePath"></image>
<image-preview v-else-if="user_info.imageAddr" class="img_100" :src="user_info.imageAddr"></image-preview>
<image-preview v-else-if="user_info.imageAddr" class="img_100"
:src="user_info.imageAddr"></image-preview>
<image v-else class="img_100" src="/static/images/me/default_user_avatar.png"></image>
</view>
<view class="personal_information_data">
@@ -19,8 +20,10 @@
{{ user_info.userName }}
</view>
<view class="sex">
<image v-if="user_info.gender === 'f'" class="img_100" src="/static/images/me/wuman.png"></image>
<image v-if="user_info.gender === 'm'" class="img_100" src="/static/images/me/man.png"></image>
<image v-if="user_info.gender === 'f'" class="img_100"
src="/static/images/me/wuman.png"></image>
<image v-if="user_info.gender === 'm'" class="img_100" src="/static/images/me/man.png">
</image>
</view>
</view>
<view class="work_number_div">工号：{{ user_info.userId }}</view>
@@ -32,31 +35,25 @@
<view class="item">
<view class="top">累计学习时长</view>
<view class="bottom">
<uv-count-to
:startVal="statistics_data['startAccmPoint']"
:endVal="statistics_data['accmPoint']"
:useEasing="true"
:decimals="1"
ref="accmPointRef"
></uv-count-to>
h
<uv-count-to :startVal="statistics_data['startStdtTmLen']"
:endVal="statistics_data['stdtTmLen']" :useEasing="true" :decimals="1"
ref="stdtTmLenRef"></uv-count-to>h
</view>
</view>
<view class="item">
<view class="top">累计完成任务</view>
<view class="bottom">
<uv-count-to
:startVal="statistics_data['startAccmTaskCnt']"
:endVal="statistics_data['accmTaskCnt']"
:useEasing="true"
ref="accmTaskCntRef"
></uv-count-to>
<uv-count-to :startVal="statistics_data['startAccmTaskCnt']"
:endVal="statistics_data['accmTaskCnt']" :useEasing="true"
ref="accmTaskCntRef"></uv-count-to>
</view>
</view>
<view class="item">
<view class="top">累计获得积分</view>
<view class="bottom">
<uv-count-to :startVal="statistics_data['startStdtTmLen']" :endVal="statistics_data['stdtTmLen']" :useEasing="true" ref="stdtTmLenRef"></uv-count-to>
<uv-count-to :startVal="statistics_data['startAccmPoint']"
:endVal="statistics_data['accmPoint']" :useEasing="true"
ref="accmPointRef"></uv-count-to>
</view>
</view>
</view>
@@ -95,7 +92,8 @@
<uv-cell-group :border="false">
<uv-cell title="设置" :isLink="true" @click="common.navigateTo('/pages/setting/index')"></uv-cell>
<uv-cell title="客服" :isLink="true" @click="goTest"></uv-cell>
<uv-cell title="退出登录" :isLink="true" :clickable="false" :border="false" @click="click_loginout()"></uv-cell>
<uv-cell title="退出登录" :isLink="true" :clickable="false" :border="false"
@click="click_loginout()"></uv-cell>
</uv-cell-group>
</view>
<tabbar-shadow></tabbar-shadow>
@@ -103,308 +101,325 @@
</template>
<script setup>
import { ref, computed, reactive } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import common from '@/common/common';
import { getUserInfo } from '@/common/common';
import { onPullDownRefresh } from '@dcloudio/uni-app';
import { loginOut } from '@/api/login.js';
import { queryTraStdyStatisticsSelf } from '@/api/user.js';
import { useSocketStore } from "@/store/socket.js"
const socketStore = useSocketStore()
import {
ref,
computed,
reactive
} from 'vue';
import {
onShow
} from '@dcloudio/uni-app';
import common from '@/common/common';
import {
getUserInfo
} from '@/common/common';
import {
onPullDownRefresh
} from '@dcloudio/uni-app';
import {
loginOut
} from '@/api/login.js';
import {
queryTraStdyStatisticsSelf
} from '@/api/user.js';
import {
useSocketStore
} from "@/store/socket.js"
const socketStore = useSocketStore()
const accmTaskCntRef = ref(null);
const accmPointRef = ref(null);
const stdtTmLenRef = ref(null);
const statistics_data = reactive({
stdtTmLen: 0, // 累计学习时长
accmTaskCnt: 0, // 累计完成任务
accmPoint: 0, // 累计获得积分
startStdtTmLen: 0, // 起始累计学习时长
startAccmTaskCnt: 0, // 起始累计完成任务
startAccmPoint: 0, // 起始累计获得积分
request_time: 0, // 上次请求时间
init: function () {
// 初始化统计数据
const me_statistics_data = common.getValue('me_statistics_data'); // 获取缓存
if (me_statistics_data) {
this.stdtTmLen = me_statistics_data.stdtTmLen;
this.accmTaskCnt = me_statistics_data.accmTaskCnt;
this.accmPoint = me_statistics_data.accmPoint;
}
},
get_statistics_data: async function () {
try {
const time_now = Date.now();
if (time_now - this.request_time > 300) {
this.request_time = time_now;
// 获取最新数据
const res = await queryTraStdyStatisticsSelf();
common.setValue('me_statistics_data', res.body);
const accmPoint = res.body.accmPoint;
const accmTaskCnt = res.body.accmTaskCnt;
const stdtTmLen = res.body.stdtTmLen;
if (accmPoint != this.accmPoint) {
// 不相等就执行
this.startAccmPoint = this.accmPoint;
this.accmPoint = accmPoint;
accmPointRef.value.start();
const accmTaskCntRef = ref(null);
const accmPointRef = ref(null);
const stdtTmLenRef = ref(null);
const statistics_data = reactive({
stdtTmLen: 0, // 累计学习时长
accmTaskCnt: 0, // 累计完成任务
accmPoint: 0, // 累计获得积分
startStdtTmLen: 0, // 起始累计学习时长
startAccmTaskCnt: 0, // 起始累计完成任务
startAccmPoint: 0, // 起始累计获得积分
request_time: 0, // 上次请求时间
init: function() {
// 初始化统计数据
const me_statistics_data = common.getValue('me_statistics_data'); // 获取缓存
if (me_statistics_data) {
this.stdtTmLen = me_statistics_data.stdtTmLen;
this.accmTaskCnt = me_statistics_data.accmTaskCnt;
this.accmPoint = me_statistics_data.accmPoint;
}
},
get_statistics_data: async function() {
try {
const time_now = Date.now();
if (time_now - this.request_time > 300) {
this.request_time = time_now;
// 获取最新数据
const res = await queryTraStdyStatisticsSelf();
common.setValue('me_statistics_data', res.body);
const accmPoint = res.body.accmPoint;
const accmTaskCnt = res.body.accmTaskCnt;
const stdtTmLen = res.body.stdtTmLen;
if (accmPoint != this.accmPoint) {
// 不相等就执行
this.startAccmPoint = this.accmPoint;
this.accmPoint = accmPoint;
accmPointRef.value.start();
}
if (accmTaskCnt != this.accmTaskCnt) {
// 不相等就执行
this.startAccmTaskCnt = this.accmTaskCnt;
this.accmTaskCnt = accmTaskCnt;
accmTaskCntRef.value.start();
}
if (stdtTmLen != this.stdtTmLen) {
// 不相等就执行
this.startStdtTmLen = this.stdtTmLen;
this.stdtTmLen = stdtTmLen;
stdtTmLenRef.value.start();
}
console.log('统计数据已更新');
} else {
console.log('时间没到无需更新');
}
if (accmTaskCnt != this.accmTaskCnt) {
// 不相等就执行
this.startAccmTaskCnt = this.accmTaskCnt;
this.accmTaskCnt = accmTaskCnt;
accmTaskCntRef.value.start();
}
if (stdtTmLen != this.stdtTmLen) {
// 不相等就执行
this.startStdtTmLen = this.stdtTmLen;
this.stdtTmLen = stdtTmLen;
stdtTmLenRef.value.start();
}
console.log('统计数据已更新');
} else {
console.log('时间没到无需更新');
} catch (error) {
console.error('获取统计数据失败:', error);
}
} catch (error) {
console.error('获取统计数据失败:', error);
}
}
});
const user_info = reactive({
userName: '',
userId: '',
imageAddr: '',
});
const goTest = () => {
const now = Date.now();
if (now - lastClickTime.value > 500) {
clickCount.value = 0;
}
clickCount.value++;
lastClickTime.value = now;
if (clickCount.value == 6) {
common.navigateTo('/pages/test/index');
clickCount.value = 0;
}
};
const click_loginout = () => {
common.show('确定退出登录？').then(async (res) => {
console.log(res);
if (!res) return;
try {
common.loading('正在退出登录');
socketStore.closeSocket()
await loginOut();
} catch (e) {}
common.hideLoading();
// 主动退出登录后，再次登录应该进首页
common.reLaunch('/pages/login/login');
});
};
onShow(() => {
const user_info_cache = getUserInfo();
Object.assign(user_info, user_info_cache);
console.log('user_info', user_info);
statistics_data['get_statistics_data'](); // 获取统计数据
});
onPullDownRefresh(() => {
console.log('下拉刷新');
uni.stopPullDownRefresh();
});
const user_info = reactive({
userName: '',
userId: '',
imageAddr: '',
});
const goTest = () => {
const now = Date.now();
if (now - lastClickTime.value > 500) {
clickCount.value = 0;
}
clickCount.value++;
lastClickTime.value = now;
if (clickCount.value == 6) {
common.navigateTo('/pages/test/index');
clickCount.value = 0;
}
};
const click_loginout = () => {
common.show('确定退出登录？').then(async (res) => {
console.log(res);
if (!res) return;
try {
common.loading('正在退出登录');
socketStore.closeSocket()
await loginOut();
} catch (e) {}
common.hideLoading();
// 主动退出登录后，再次登录应该进首页
common.reLaunch('/pages/login/login');
});
};
onShow(() => {
const user_info_cache = getUserInfo();
Object.assign(user_info, user_info_cache);
console.log('user_info', user_info);
statistics_data['get_statistics_data'](); // 获取统计数据
});
onPullDownRefresh(() => {
console.log('下拉刷新');
uni.stopPullDownRefresh();
});
</script>
<style scoped lang="scss">
$bg-margin-left: 50rpx;
$bg-margin-left: 50rpx;
// 下方单元格
.cell_div {
margin: 30rpx $bg-margin-left 0 $bg-margin-left;
background: #ffffff;
border-radius: 15rpx;
z-index: 101;
overflow: hidden;
// 下方单元格
.cell_div {
margin: 30rpx $bg-margin-left 0 $bg-margin-left;
background: #ffffff;
border-radius: 15rpx;
z-index: 101;
overflow: hidden;
// 为了让线缩进来24单位
:deep(.uv-line) {
width: calc(100% - 48rpx) !important;
margin: 0 24rpx !important;
// 为了让线缩进来24单位
:deep(.uv-line) {
width: calc(100% - 48rpx) !important;
margin: 0 24rpx !important;
}
:deep(.uv-cell__body) {
padding: 12px 15px;
}
}
:deep(.uv-cell__body) {
padding: 12px 15px;
}
}
// 快捷导航栏
.navigation_div {
margin: 30rpx $bg-margin-left 0 $bg-margin-left;
padding: 24rpx 0 20rpx 0;
background-color: #ffffff;
border-radius: 23rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
z-index: 101;
.group {
display: flex;
justify-content: space-around;
}
.item {
// 快捷导航栏
.navigation_div {
margin: 30rpx $bg-margin-left 0 $bg-margin-left;
padding: 24rpx 0 20rpx 0;
background-color: #ffffff;
border-radius: 23rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
justify-content: space-around;
z-index: 101;
// background-color: red;
.icon {
width: 88rpx;
height: 86rpx;
}
.title {
margin-top: 10rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 25rpx;
color: #323e57;
line-height: 35rpx;
text-align: left;
font-style: normal;
}
}
}
.bg_div {
display: flex;
flex-direction: column;
position: relative;
padding: 0 $bg-margin-left;
z-index: 50;
.bg_img {
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: -1;
height: 858rpx;
}
// 个人信息
.user_data_div {
margin-top: 158rpx;
background: linear-gradient(180deg, rgba(241, 245, 255, 0.5) 0%, #f6f9fe 50%, #ffffff 100%);
border-radius: 14rpx;
border: 2rpx solid #ffffff;
box-shadow: #f6f8ff 0 0 2rpx;
.personal_information {
padding: 20rpx 18rpx 0 26rpx;
display: flex;
// 个人头像框框
.profile {
border-radius: 100%;
border: 2px solid #ffffff;
width: 108rpx;
height: 108rpx;
overflow: hidden;
}
// 头像右边的信息
.personal_information_data {
flex: 1;
display: flex;
flex-direction: column;
margin-left: 26rpx;
overflow: hidden;
// 上边的姓名性别盒子
.name_sex_div {
display: flex;
margin-top: 6rpx;
.name {
font-family: PingFangSC;
font-weight: 600;
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
}
.sex {
margin-left: 10rpx;
width: 30rpx;
height: 30rpx;
}
}
.work_number_div {
font-family: PingFangSC;
font-weight: 400;
font-size: 25rpx;
color: #666666;
line-height: 38rpx;
text-align: left;
font-style: normal;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
.study_information {
.group {
display: flex;
justify-content: space-around;
z-index: 20;
margin: 30rpx 50rpx;
}
.item {
flex: 1;
.item {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
// background-color: red;
.icon {
width: 88rpx;
height: 86rpx;
}
.title {
margin-top: 10rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 25rpx;
color: #323e57;
line-height: 35rpx;
text-align: left;
font-style: normal;
}
}
}
.bg_div {
display: flex;
flex-direction: column;
position: relative;
padding: 0 $bg-margin-left;
z-index: 50;
.bg_img {
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: -1;
height: 858rpx;
}
// 个人信息
.user_data_div {
margin-top: 158rpx;
background: linear-gradient(180deg, rgba(241, 245, 255, 0.5) 0%, #f6f9fe 50%, #ffffff 100%);
border-radius: 14rpx;
border: 2rpx solid #ffffff;
box-shadow: #f6f8ff 0 0 2rpx;
.personal_information {
padding: 20rpx 18rpx 0 26rpx;
display: flex;
flex-direction: column;
justify-content: center;
.top {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 25rpx;
color: #666666;
line-height: 35rpx;
text-align: center;
font-style: normal;
// 个人头像框框
.profile {
border-radius: 100%;
border: 2px solid #ffffff;
width: 108rpx;
height: 108rpx;
overflow: hidden;
}
.bottom {
margin-top: 5%;
font-weight: bold;
font-size: 50rpx;
color: #000000;
line-height: 58rpx;
text-align: left;
font-style: normal;
text-align: center;
// 头像右边的信息
.personal_information_data {
flex: 1;
display: flex;
flex-direction: column;
margin-left: 26rpx;
overflow: hidden;
// 数字滚动组件
:deep(.uv-count-num) {
font-weight: bold !important;
font-size: 50rpx !important;
color: #000000 !important;
// 上边的姓名性别盒子
.name_sex_div {
display: flex;
margin-top: 6rpx;
.name {
font-family: PingFangSC;
font-weight: 600;
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
}
.sex {
margin-left: 10rpx;
width: 30rpx;
height: 30rpx;
}
}
.work_number_div {
font-family: PingFangSC;
font-weight: 400;
font-size: 25rpx;
color: #666666;
line-height: 38rpx;
text-align: left;
font-style: normal;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
.study_information {
display: flex;
justify-content: space-around;
z-index: 20;
margin: 30rpx 50rpx;
.item {
flex: 1;
display: flex;
flex-direction: column;
justify-content: center;
.top {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 25rpx;
color: #666666;
line-height: 35rpx;
text-align: center;
font-style: normal;
}
.bottom {
margin-top: 5%;
font-weight: bold;
font-size: 50rpx;
color: #000000;
line-height: 58rpx;
text-align: left;
font-style: normal;
text-align: center;
// 数字滚动组件
:deep(.uv-count-num) {
font-weight: bold !important;
font-size: 50rpx !important;
color: #000000 !important;
}
}
}
}
}
}
}
.main_div {
display: flex;
flex-direction: column;
background-color: #f6f8ff;
}
</style>
.main_div {
display: flex;
flex-direction: column;
background-color: #f6f8ff;
}
</style>