Browse Source

Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/ZhiHuiJiaoWu_UniApp

master
王泽彦 10 months ago
parent
commit
c2f0719a4a
  1. 105
      api/apiRoute.js
  2. 12
      components/AQ/AQUplodeImgMulti.vue
  3. 1208
      pages/coach/class/info.vue
  4. 20
      pages/coach/course/info_list.vue
  5. 45
      pages/coach/student/info.vue
  6. 56
      pages/coach/student/physical_examination.vue
  7. 67
      pages/common/feedback.vue
  8. 41
      pages/common/im_chat_info.vue
  9. 29
      pages/common/my_message.vue
  10. 144
      pages/student/index/index.vue
  11. 253
      pages/student/index/physical_examination.vue
  12. 49
      pages/student/my/personal_data.vue

105
api/apiRoute.js

@ -143,13 +143,27 @@ export default {
//↓↓↓↓↓↓↓↓↓↓↓↓-----教练接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
//体测报告-详情
physicalTestInfo(data = {}) {
let url = '/class/physicalTest/info'
return http.get(url, data).then(res => {
return res;
})
},
//体测报告-列表
physicalTest(data = {}) {
let url = '/class/physicalTest'
return http.get(url, data).then(res => {
return res;
})
},
//获取学员详情
jlStudentsInfo(data = {}) {
let url = '/class/jlStudentsInfo'
return http.get(url, data).then(res => {
return res;
})
},
//获取添加学员列表
addStudentList(data = {}) {
let url = '/course/addStudentList'
@ -190,6 +204,13 @@ export default {
return res;
})
},
//获取班级课程列表
classCourseList(data = {}) {
let url = '/course/classCourseList'
return http.get(url, data).then(res => {
return res;
})
},
//获取课程详情
courseInfo(data = {}) {
let url = '/course/courseInfo'
@ -417,6 +438,76 @@ export default {
return res;
})
},
//学生详情-修改
xy_memberEdit(data = {}) {
let url = '/customerResourcesAuth/edit'
return http.post(url, data).then(res => {
return res;
})
},
//学生-意见反馈-添加
xy_userFeedbackAdd(data = {}) {
let url = '/userFeedback/add'
return http.post(url, data).then(res => {
return res;
})
},
//学生端-获取好友关系绑定详情
xy_chatGetChatFriendsInfo(data = {}) {
let url = '/xy/chat/getChatFriendsInfo'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-获取聊天消息列表
xy_chatGetChatMessagesList(data = {}) {
let url = '/xy/chat/getChatMessagesList'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-发送聊天消息
xy_chatSendChatMessages(data = {}) {
let url = '/xy/chat/sendChatMessages'
return http.post(url, data).then(res => {
return res;
})
},
//学生端-好友关系列表
xy_chatGetChatFriendsList(data = {}) {
let url = '/xy/chat/getChatFriendsList'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-体测报告-列表
xy_physicalTest(data = {}) {
let url = '/xy/physicalTest'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-体测报告-详情
xy_physicalTestInfo(data = {}) {
let url = '/xy/physicalTest/info'
return http.get(url, data).then(res => {
return res;
})
},
//学生端-学生课程安排-列表
xy_personCourseSchedule(data = {}) {
let url = '/xy/personCourseSchedule'
return http.get(url, data).then(res => {
return res;
})
},

12
components/AQ/AQUplodeImgMulti.vue

@ -27,6 +27,11 @@ import {Api_url} from "../../common/config";
},
props: {
//
//url
uploadApiUrl:{
type: String,
default: `${Api_url}/file/image`
},
//
inputName: {
type: String,
@ -48,7 +53,8 @@ import {Api_url} from "../../common/config";
return {
inputName: this.inputName,
inputValue: this.inputValue,
maxFileNum: this.maxFileNum
maxFileNum: this.maxFileNum,
uploadApiUrl: this.uploadApiUrl
};
}
},
@ -99,7 +105,7 @@ import {Api_url} from "../../common/config";
},
//
uploadApiUrl: `${Api_url}/file/image`,
// uploadApiUrl: `${Api_url}/file/image`,
//
imageStyles: {
@ -168,7 +174,7 @@ import {Api_url} from "../../common/config";
console.log('xxx',_arr)
this.fileList.push(_arr)
console.log('上传成功2',_arr);
this.filePathArr.push(res.data.path)
this.filePathArr.push(res.data.url)
//
this.emitUploadSuccess(this.filePathArr)
}else{

1208
pages/coach/class/info.vue

File diff suppressed because it is too large

20
pages/coach/course/info_list.vue

@ -11,11 +11,11 @@
<view class="isbtn" @click="addStudent">
添加学员
</view>
<view v-if="courseInfo.status == 'ongoing'" class="tag" style="background-color: #FAD24E;">上课中
<view v-if="isNowBetween(courseInfo.student_courses[0].start_date, courseInfo.student_courses[0].end_date)" class="tag" style="background-color: #FAD24E;">上课中
</view>
<view v-if="courseInfo.status == 'completed'" class="tag" style="background-color: #e2e2e2;">已结束
<view v-if="!isCourseFuture(courseInfo.student_courses[0].end_date)" class="tag" style="background-color: #e2e2e2;">已结束
</view>
<view v-if="courseInfo.status == 'pending'" class="tag" style="background-color: #1cd188;">未开始
<view v-if="isCourseFuture(courseInfo.student_courses[0].start_date)" class="tag" style="background-color: #1cd188;">未开始
</view>
</view>
@ -189,6 +189,20 @@
async init() {
this.getCourseInfo()
},
isNowBetween(start_date, end_date) {
const now = new Date();
const start = new Date(start_date);
const end = new Date(end_date);
return now >= start && now <= end;
},
isCourseFuture(courseDate) {
const courseTime = new Date(courseDate).getTime();
const nowTime = new Date().getTime();
return courseTime > nowTime;
},
//-
async getCourseInfo() {

45
pages/coach/student/info.vue

@ -10,23 +10,24 @@
<view class="user_section">
<view class="box">
<view class="left">
<image class="pic" :src="$util.img(studentsInfo.header)"></image>
<view class="btn_box" v-if="checkExpireTime(studentsInfo.expire_time)">
<image class="pic" :src="$util.img(studentsInfo.customerResources.member.headimg)"></image>
<!-- <view class="btn_box" v-if="checkExpireTime(studentsInfo.expire_time)">
<view class="btn">即将到期</view>
</view>
</view> -->
</view>
<view class="right">
<view class="item">
<view class="name">{{studentsInfo.name}}</view>
<view class="age">
{{studentsInfo.age}}
<!-- {{formatAgeMonth(studentsInfo.age)}} -->
{{studentsInfo.customerResources.age}}
</view>
</view>
<!-- <view class="item">-->
<!-- <view class="title">家长姓名黄大呢</view>-->
<!-- </view>-->
<view class="item">
<view class="title">电话{{studentsInfo.phone}}</view>
<view class="title">电话{{studentsInfo.customerResources.phone_number}}</view>
</view>
</view>
</view>
@ -111,10 +112,10 @@
:key="k" @click="openViewPhysicalExamination(v)"
>
<view class="top">
<view class="title">综合评分:{{v.score}}</view>
<view class="title">综合评分:{{v.calculateChildHealthScore}}</view>
<!-- <view class="hint">打败了99%学员</view>-->
</view>
<view class="bottom">测试时间{{v.create_time}}</view>
<view class="bottom">测试时间{{$util.formatToDateTime(v.created_at, 'Y-m-d')}}</view>
</view>
</scroll-view>
</view>
@ -133,7 +134,7 @@
<script>
import memberApi from '@/api/member.js';
import AQTabber from "@/components/AQ/AQTabber.vue"
import apiRoute from '@/api/apiRoute.js';
export default {
components: {
@ -157,14 +158,13 @@ export default {
page:1,//
limit:10,//
total:10,//
students_id: '',//id
user_id: '',//id
},
surveyList:[],//
}
},
onLoad(options) {
this.students_id = options.students_id//id
this.filteredData.students_id = options.students_id//id
},
onShow(){
this.init()//
@ -174,14 +174,26 @@ export default {
async init(){
//
await this.getStudentsInfo()
this.getSurveyList()
await this.getSurveyList()
},
formatAgeMonth(input) {
let str = String(input);
//
let [yearPart, monthPart] = str.split('.');
// 0
if (!monthPart) {
monthPart = '00';
}
// 00 0
monthPart = monthPart === '00' ? '0' : monthPart;
return `${yearPart}${monthPart}`;
},
//
async getStudentsInfo(){
let data = {
students_id:this.students_id
}
let res = await memberApi.jlStudentsInfo(data)
let res = await apiRoute.jlStudentsInfo(data)
if (res.code != 1){
uni.showToast({
title: res.msg,
@ -192,7 +204,8 @@ export default {
this.studentsInfo = res.data//
this.assignmentsList = res.data.assignments_list//
this.assignmentsList = res.data.physical_test//
this.filteredData.user_id = res.data.user_id
},
// expire_time 5
@ -253,7 +266,7 @@ export default {
}
//-
let res = await memberApi.surveyList(data)
let res = await apiRoute.physicalTest(data)
this.loading = false
this.isReachedBottom = false;
if (res.code != 1){
@ -264,10 +277,10 @@ export default {
return
}
this.surveyList = this.surveyList.concat(res.data.list.data); // 使 concat
this.surveyList = this.surveyList.concat(res.data.data); // 使 concat
console.log('列表',this.surveyList)
this.filteredData.total = res.data.list.total
this.filteredData.total = res.data.total
this.filteredData.page++
},

56
pages/coach/student/physical_examination.vue

@ -1,41 +1,41 @@
<!--体测数据-->
<!--体测数据-详情页-->
<template>
<view class="overall">
<view class="date">{{$util.formatToDateTime(surveyInfo.create_time,'Y-m-d')}}</view>
<view class="content">
<view class="circle-container">
<view class="card-con-txt1-left">
<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
</view>
<view class="card-con-txt1-left-txt">{{surveyInfo.score}}</view>
<view class="card-con-txt1-left-txt top1">综合评分</view>
</view>
<view style="height: 170rpx;"></view>
<view style="display: flex;justify-content: space-around;">
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">身高 (CM)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{surveyInfo.height}}</view>
</view>
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">体重 (KG)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{surveyInfo.weight}}</view>
</view>
</view>
<view class="coach-message">
<view>
<image :src="$util.img('/uniapp_src/static/images/index/lv.png')" class="drop-image"></image>
</view>
<view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">{{surveyInfo.content}}</view>
</view>
<!-- <view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>-->
<view class="circle-container">
<view class="card-con-txt1-left">
<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
</view>
<view class="card-con-txt1-left-txt">{{v.score}}</view>
<view class="card-con-txt1-left-txt top1">综合评分</view>
</view>
<view style="height: 170rpx;"></view>
<view style="display: flex;justify-content: space-around;">
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">身高 (CM)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{(v.height * 100)}}</view>
</view>
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">体重 (KG)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{v.weight}}</view>
</view>
</view>
<view class="coach-message">
<view>
<image :src="$util.img('/uniapp_src/static/images/index/lv.png')" class="drop-image"></image>
</view>
<view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">{{v.content}}</view>
</view>
<view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>
</view>
</view>
</template>
<script>
import memberApi from '@/api/member.js';
import apiRoute from '@/api/apiRoute.js';
export default {
data() {
return {
@ -61,7 +61,7 @@ import memberApi from '@/api/member.js';
let data = {
survey_id:this.survey_id
}
let res = await memberApi.jlSurveyInfo(data)
let res = await apiRoute.physicalTestInfo(data)
if(res.code != 1){
uni.showToast({
title: res.msg,

67
pages/common/feedback.vue

@ -5,28 +5,28 @@
<view class="main_section">
<view class="section">
<view class="text_input">
<fui-textarea placeholder="请输入反馈内容" v-model="formData.content"></fui-textarea>
<fui-textarea placeholder="请输入反馈内容" v-model="formData.feedback_text"></fui-textarea>
</view>
</view>
<view class="section">
<view class="upload_box">
<view>上传图片</view>
<AQUplodeImgMulti :inputName="`images_arr`" :inputValue="formData.images_arr || []"
<AQUplodeImgMulti :inputName="`attachment_url_arr`" :inputValue="formData.attachment_url_arr || []" :uploadApiUrl="uploadApiUrl" :maxFileNum="1"
@AQUploadSuccess="AQUploadSuccess" />
</view>
</view>
<view class="section">
<view class="input_box">
<fui-input label="邮箱方式" borderTop placeholder="请输入邮箱" v-model="formData.mailbox"></fui-input>
</view>
</view>
<!-- <view class="section">-->
<!-- <view class="input_box">-->
<!-- <fui-input label="邮箱方式" borderTop placeholder="请输入邮箱" v-model="formData.mailbox"></fui-input>-->
<!-- </view>-->
<!-- </view>-->
<view class="describe">
反馈的相关问题会第一时间通过邮箱解答
</view>
<!-- <view class="describe">-->
<!-- 反馈的相关问题会第一时间通过邮箱解答-->
<!-- </view>-->
<view class="btn" @click="submitForm()">提交</view>
</view>
@ -34,9 +34,13 @@
</template>
<script>
import apiRoute from '@/api/apiRoute.js';
import memberApi from '@/api/member.js';
import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
import AQTabber from "@/components/AQ/AQTabber"
import {
Api_url
} from "@/common/config.js";
export default {
@ -46,16 +50,40 @@
},
data() {
return {
uploadApiUrl:`${Api_url}/memberUploadImage`,//url
formData: {
images_arr: [],
images:'',
content:'',
mailbox:'',
attachment_url_arr: [],
attachment_url:undefined,//,使,
feedback_text:'',//
user_id:'',//ID|school_customer_resourcesid
},
}
},
onLoad() {},
onShow(){
this.init()
},
methods: {
async init(){
//
await this.getMemberInfo()
},
//
async getMemberInfo() {
let res = await apiRoute.xy_memberInfo({})
if(res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
this.formData.user_id = res.data.id
console.log('xxxx',res.data)
},
//######AQ######
//
AQUploadSuccess(res) {
@ -67,13 +95,16 @@
}
this.formData[res.inputName] = _inputValue
// console.log('AQxxx1',res)
// console.log('AQxxx2',this.formData.member_store_certification_arr)
// console.log('AQxxx2',this.formData[res.inputName])
},
async submitForm() {
let data = {...this.formData}
data.images = data.images_arr.join(',')
if(!data.content){
if(data.attachment_url_arr.length){
data.attachment_url = data.attachment_url_arr.join(',')
}
if(!data.feedback_text){
//
uni.showToast({
title:'反馈内容为必填项',
@ -81,7 +112,7 @@
})
return
}
let res = await memberApi.setFeedback(data)
let res = await apiRoute.xy_userFeedbackAdd(data)
if(res.code != 1){
uni.showToast({
title:res.msg,

41
pages/common/im_chat_info.vue

@ -102,7 +102,7 @@ export default {
},
data() {
return {
uploadUrl: `${Api_url}/uploadImage`,
uploadUrl: `${Api_url}/uploadImage`,//|
scrollTop:'',//,
@ -182,6 +182,8 @@ export default {
this.formData.from_type = 'customer'//
this.formData.from_id = this.to_id//id()
this.formData.to_id = this.from_id//id()
this.uploadUrl = `${Api_url}/memberUploadImage`//|
}
//
await this.getChatFriendsInfo()
@ -200,7 +202,17 @@ export default {
personnel_id: this.chatFriendsInfoParams.personnel_id,//ID
customer_resources_id: this.chatFriendsInfoParams.customer_resources_id,//ID
}
let res = await apiRoute.xs_chatGetChatFriendsInfo(params)
let res
if( this.from_type == 'personnel'){
//
res = await apiRoute.xs_chatGetChatFriendsInfo(params)
}else{
//
res = await apiRoute.xy_chatGetChatFriendsInfo(params)
}
if (res.code != 1){
uni.showToast({
title: res.msg,
@ -253,7 +265,17 @@ export default {
this.tableList = []
}
let res = await apiRoute.xs_chatGetChatMessagesList(data)//
let res
if( this.from_type == 'personnel'){
//
res = await apiRoute.xs_chatGetChatMessagesList(data)//
}else{
//
res = await apiRoute.xy_chatGetChatMessagesList(data)//
}
this.loading = false
this.isReachedBottom = false;
if (res.code != 1){
@ -327,7 +349,16 @@ export default {
})
return
}
let res = await apiRoute.xs_chatSendChatMessages(data)
let res
if( this.from_type == 'personnel'){
//
res = await apiRoute.xs_chatSendChatMessages(data)
}else{
//
res = await apiRoute.xy_chatSendChatMessages(data)
}
if (res.code != 1) {
uni.showToast({
title: res.msg,
@ -370,7 +401,7 @@ export default {
this.moreShow = false
},
//
//
uplodeImageRes(resData,extraData){
console.log('上传成功回调',resData,extraData)
//

29
pages/common/my_message.vue

@ -103,11 +103,12 @@ export default {
}else{
//
this.from_type = 'customer'//
await this.getMemberInit()
}
this.getContactList()
},
//
//
async getPersonnelUserInfo(){
let data = {}
let res = await apiRoute.getPersonnelInfo(data);
@ -130,6 +131,20 @@ export default {
this.filteredData.personnel_id = res.data.id
},
//
async getMemberInit() {
let res = await apiRoute.xy_memberInfo({})
if(res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
this.member_info = res.data
this.filteredData.customer_resources_id = res.data.id//id
},
//
async getContactList(){
let params = {...this.filteredData}
@ -147,7 +162,17 @@ export default {
this.contactList = []
}
let res = await apiRoute.xs_chatGetChatFriendsList(params)
let res
//1=,2=,3=
if (['1', '2'].includes(String(this.userType))) {
//
res = await apiRoute.xs_chatGetChatFriendsList(params)
}else{
//
res = await apiRoute.xy_chatGetChatFriendsList(params)
}
this.loading = false
this.isReachedBottom = false;

144
pages/student/index/index.vue

@ -29,37 +29,39 @@
<view class="card-con-txt1">
<view class="card-con-txt1-left">
<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
<view class="card-con-txt1-left-txt top">{{memberIndexData.tx.score}}</view>
<view class="card-con-txt1-left-txt top">{{physicalTestInfo.calculateChildHealthScore}}</view>
<view class="card-con-txt1-left-txt top1">综合评分</view>
</view>
<view class="card-con-txt1-right">
<view style="color: #AAAAAA;padding: 5rpx;">数据测评时间{{$util.formatToDateTime(memberIndexData.tx.create_time,'Y-m-d')}}</view>
<view style="color: #AAAAAA;padding: 5rpx;">数据测评时间{{$util.formatToDateTime(physicalTestInfo.created_at,'Y-m-d')}}</view>
<view style="display: flex;justify-content: space-around;margin-top: 20rpx;">
<view>
<view style="font-size: 48rpx;color: #29d3b4;">{{memberIndexData.tx.height * 100}}</view>
<view style="font-size: 48rpx;color: #29d3b4;">{{physicalTestInfo.height}}</view>
<view style="color: #AAAAAA;font-size: 30rpx;">身高CM</view>
</view>
<view>
<view style="font-size: 48rpx;color: #29d3b4;">{{memberIndexData.tx.weight}}</view>
<view style="font-size: 48rpx;color: #29d3b4;">{{physicalTestInfo.weight}}</view>
<view style="color: #AAAAAA;font-size: 30rpx;">体重KG</view>
</view>
</view>
</view>
</view>
<view class="more" @click="physical_examination(memberIndexData)">更多</view>
<view class="more" @click="physical_examination()">更多</view>
</view>
<view class="upcomin-classes">
<view class="upcomin-classes" v-if="personCourseScheduleInfo.id">
<view class="upcomin-classes-div">
<view class="upcomin-classes-div-con">
<view class="upcomin-classes-div-con-left">课程预告</view>
<view class="upcomin-classes-div-con-centre"
style="width: 2rpx;height: 60rpx;background-color: #fff;margin-left: 25rpx;"></view>
<view style="margin-left: 25rpx;">
<view>{{$util.formatToDateTime(memberIndexData.kcyg.date_time,'m-d')}} {{memberIndexData.kcyg.weekday}} {{memberIndexData.kcyg.time_slot[0]}}-{{memberIndexData.kcyg.time_slot[1]}}</view>
<view>{{memberIndexData.kcyg.address}} {{memberIndexData.kcyg.courses_name}}</view>
</view>
<view class="upcomin-classes-div-con-right" @click="openViewTimetableInfo(memberIndexData.kcyg)">
<view class="centre_box">
<view class="upcomin-classes-div-con-centre"></view>
<view class="centre">
<view>{{$util.formatToDateTime(personCourseScheduleInfo.course_date,'m-d')}} {{personCourseScheduleInfo.time_slot}}</view>
<view style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{personCourseScheduleInfo.venue.venue_name}} {{personCourseScheduleInfo.course.course_name}}xxxx123123</view>
</view>
</view>
<view class="upcomin-classes-div-con-right" @click="openViewTimetableInfo(personCourseScheduleInfo)">
详情
</view>
</view>
@ -170,6 +172,17 @@
},
thisPath:'',//('')
openPath:'',//('')
physicalTestInfo:{
created_at:'',//
calculateChildHealthScore:'0',//
height:'0',//
weight:'0',//
},//
personCourseScheduleInfo:{
id:'',
},//
}
},
onLoad() {
@ -186,11 +199,61 @@
//
async init(){
await this.member_init()
await this.getPhysicalTestList()
await this.getPersonCourseScheduleList()
this.getMemberIndex()
this.getList()
this.getJobAssignmentsInfo()
},
//
async getPhysicalTestList(){
let params = {
page: 1,//
limit: 1,//
total: 1,//
resource_id:this.member_info.id,//id
}
let res = await apiRoute.xy_physicalTest(params)
if(res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
}
console.log('tc',res.data)
let arr = res.data.data
if(arr.length){
this.physicalTestInfo = arr[0]
}
},
//--
async getPersonCourseScheduleList(){
let params = {
page: 1,//
limit: 1,//
total: 1,//
resources_id:this.member_info.id,//id
}
let res = await apiRoute.xy_personCourseSchedule(params)
if(res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
}
console.log('kc',res.data)
let arr = res.data.data
if(arr.length){
this.personCourseScheduleInfo = arr[0]
}
},
async openViewHome_COPY(){
@ -301,10 +364,10 @@
})
},
//
physical_examination(e){
let students_id = e.students_id
physical_examination(){
let resource_id = this.member_info.id
uni.navigateTo({
url: `/pages/student/index/physical_examination?students_id=${students_id}`
url: `/pages/student/index/physical_examination?resource_id=${resource_id}`
})
},
//
@ -664,32 +727,37 @@
.upcomin-classes-div-con {
display: flex;
justify-content: space-between;
align-items: center;
color: #fff;
padding: 0 40rpx;
.upcomin-classes-div-con-left {
width: 60rpx;
text-align: right;
}
.centre_box{
display: flex;
align-items: center;
.upcomin-classes-div-con-centre {
margin: 0 20rpx;
width: 2rpx;
height: 60rpx;
background-color: #fff;
}
.centre{
width:80%;
}
}
.upcomin-classes-div-con-right {
width: 100rpx;
height: 50rpx;
background-color: #32baa1;
text-align: center;
line-height: 50rpx;
border-radius: 50rpx;
}
}
.upcomin-classes-div-con-left {
width: 60rpx;
margin-left: 80rpx;
text-align: right;
}
.upcomin-classes-div-con-centre {
width: 2rpx;
height: 60rpx;
background-color: #fff;
margin-left: 25rpx;
}
.upcomin-classes-div-con-right {
width: 100rpx;
height: 50rpx;
background-color: #32baa1;
text-align: center;
line-height: 50rpx;
border-radius: 50rpx;
margin-left: 80rpx;
}
.after-class {
background-color: #292929;

253
pages/student/index/physical_examination.vue

@ -1,4 +1,4 @@
<!--体测数据-详情-->
<!--体测数据-列表详情-->
<template>
<view class="overall">
@ -11,33 +11,85 @@
>
<view class="item" v-for="(v,k) in tableList" :key="k">
<view class="date">{{$util.formatToDateTime(v.create_time, 'Y-m-d')}}</view>
<view class="date">{{$util.formatToDateTime(v.created_at, 'Y-m-d')}}</view>
<view class="content">
<view class="circle-container">
<view class="card-con-txt1-left">
<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
</view>
<view class="card-con-txt1-left-txt">{{v.score}}</view>
<view class="card-con-txt1-left-txt">{{v.calculateChildHealthScore}}</view>
<view class="card-con-txt1-left-txt top1">综合评分</view>
</view>
<view style="height: 170rpx;"></view>
<view style="display: flex;justify-content: space-around;">
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">身高 (CM)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{(v.height * 100)}}</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{(v.height)}}</view>
</view>
<view style="text-align: center;">
<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">体重 (KG)</view>
<view style="font-size: 55rpx;color: #29d3b4;">{{v.weight}}</view>
</view>
</view>
<view class="coach-message">
<view>
<image :src="$util.img('/uniapp_src/static/images/index/lv.png')" class="drop-image"></image>
<!-- <view class="coach-message">-->
<!-- <view>-->
<!-- <image :src="$util.img('/uniapp_src/static/images/index/lv.png')" class="drop-image"></image>-->
<!-- </view>-->
<!-- <view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">{{v.content}}</view>-->
<!-- </view>-->
<view class="list_box" >
<view class="ul">
<view class="li">
<view class="li_title">坐位体前屈</view>
<view class="li_content">测试结果{{v.seated_forward_bend}}</view>
</view>
<view class="li">
<view class="li_title">仰卧卷腹</view>
<view class="li_content">测试结果{{v.sit_ups}}</view>
</view>
<view class="li">
<view class="li_title">九十度仰卧撑</view>
<view class="li_content">测试结果{{v.push_ups}}</view>
</view>
<view class="li">
<view class="li_title">火烈鸟平衡测试</view>
<view class="li_content">测试结果{{v.flamingo_balance}}</view>
</view>
<view class="li">
<view class="li_title">三十秒双脚连续跳</view>
<view class="li_content">测试结果{{v.thirty_sec_jump}}</view>
</view>
<view class="li">
<view class="li_title">立定跳远</view>
<view class="li_content">测试结果{{v.standing_long_jump}}</view>
</view>
<view class="li">
<view class="li_title">4乘10m灵敏折返跑</view>
<view class="li_content">测试结果{{v.agility_run}}</view>
</view>
<view class="li">
<view class="li_title">走平衡木</view>
<view class="li_content">测试结果{{v.balance_beam}}</view>
</view>
<view class="li">
<view class="li_title">网球掷远</view>
<view class="li_content">测试结果{{v.tennis_throw}}</view>
</view>
<view class="li">
<view class="li_title">十米往返跑</view>
<view class="li_content">测试结果{{v.ten_meter_shuttle_run}}</view>
</view>
</view>
<view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">{{v.content}}</view>
</view>
<view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>
</view>
</view>
@ -46,95 +98,95 @@
</template>
<script>
import memberApi from '@/api/member.js';
export default {
data() {
return {
loading:false,//
lowerThreshold: 100,//
isReachedBottom: false,//|true=|false=
//
filteredData:{
page:1,//
limit:10,//
total:10,//
students_id: '',//id
},
tableList:[],//
}
},
onLoad(options) {
this.filteredData.students_id = options.students_id//id
},
onShow(){
this.init()
},
methods: {
//
async init(){
this.getList()
},
import apiRoute from '@/api/apiRoute.js';
//()
loadMoreData() {
//
if (!this.isReachedBottom) {
this.isReachedBottom = true;//
this.getList();
}
},
//
async resetFilteredData() {
this.isReachedBottom = false; // 便
export default {
data() {
return {
loading: false,//
lowerThreshold: 100,//
isReachedBottom: false,//|true=|false=
this.filteredData.page = 1//
this.filteredData.limit = 10//
this.filteredData.total = 10//
//
filteredData: {
page: 1,//
limit: 10,//
total: 10,//
resource_id: '',//id
},
//--
async getList(){
this.loading = true
tableList: [],//
}
},
onLoad(options) {
this.filteredData.resource_id = options.resource_id//id
},
onShow() {
this.init()
},
methods: {
//
async init() {
this.getList()
},
let data = {...this.filteredData}
//()
loadMoreData() {
//
if (!this.isReachedBottom) {
this.isReachedBottom = true;//
this.getList();
}
},
//
async resetFilteredData() {
this.isReachedBottom = false; // 便
//
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',
icon: 'none'
})
return
}
this.filteredData.page = 1//
this.filteredData.limit = 10//
this.filteredData.total = 10//
},
if(data.page == 1){
this.tableList = []
}
//--
async getList() {
this.loading = true
let data = {...this.filteredData}
//-
let res = await memberApi.surveyList(data)
//
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
this.isReachedBottom = false;
if (res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
uni.showToast({
title: '暂无更多',
icon: 'none'
})
return
}
this.tableList = this.tableList.concat(res.data.list.data); // 使 concat
if (data.page == 1) {
this.tableList = []
}
// console.log('',this.tableList)
this.filteredData.total = res.data.list.total
this.filteredData.page++
},
}
}
//-
let res = await apiRoute.xy_physicalTest(data)
this.loading = false
this.isReachedBottom = false;
if (res.code != 1) {
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
this.tableList = this.tableList.concat(res.data.data); // 使 concat
// console.log('',this.tableList)
this.filteredData.total = res.data.total
this.filteredData.page++
},
}
}
</script>
<style lang="less" scoped>
@ -150,6 +202,33 @@ import memberApi from '@/api/member.js';
flex-direction: column;
.item{
margin-bottom: 40rpx;
.content{
.list_box{
font-size: 30rpx;
text-align: center;
margin-top: 120rpx;
.ul{
padding: 0 20rpx;
display: flex;
flex-wrap: wrap; /* 允许换行 */
justify-content: space-between;
align-items: center;
gap: 20rpx;
.li{
width: 48%; /* 每个列表项占宽度的48%,留出一些间距 */
display: flex;
flex-direction: column;
gap: 5rpx;
.li_title{
text-align: left;
}
.li_content{
text-align: left;
}
}
}
}
}
}
}

49
pages/student/my/personal_data.vue

@ -92,7 +92,7 @@
手机 <text class="required">*</text>
</view>
<view class="input">
<input v-model="formData.phone" placeholder="请输入手机" />
<input v-model="formData.phone_number" placeholder="请输入手机" />
</view>
</view>
</view>
@ -294,7 +294,6 @@
if (extraData.input_name == 'headimg') {
console.log('收到的图片地址:', resData.url);
this.editHeadimg = resData.url;
alert(this.formData.headimg)
}
},
@ -307,32 +306,26 @@
},
//
submit() {
console.log(this.editHeadimg, '111')
// if(this.editHeadimg == ''){
// this.editHeadimg = this.formData.headimg
// }
member.member_edit({
header: this.editHeadimg,
name: this.formData.name,
address: this.formData.address,
gender: this.sex_name,
birthday: this.formData.birthday,
email: this.formData.email,
phone: this.formData.phone,
}).then(res => {
if (res.code == 1) {
uni.showToast({
title: res.msg,
icon: 'none'
})
} else {
uni.showToast({
title: res.msg,
icon: 'none'
})
}
})
async submit() {
if (this.editHeadimg) {
this.formData.headimg = this.editHeadimg
}
let params = {
...this.formData
}
let res = await apiRoute.xy_memberEdit(params)
if(res.code != 1){
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
uni.showToast({
title: res.msg,
icon: 'success'
})
},

Loading…
Cancel
Save