Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
wandouchengzhang_coach
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
石盼盼
wandouchengzhang_coach
Commits
0638fde5
Commit
0638fde5
authored
Nov 18, 2020
by
石盼盼
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'shipanpan' into 'master'
保存教练评语及各项分数接口对接,家长回复,城市列表,科目列表接口对接 See merge request
!23
parents
bea76c16
cb491479
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
260 additions
and
243 deletions
+260
-243
badgelist.js
pages/index/badgelist/badgelist.js
+8
-3
classDetail.js
pages/index/classDetail/classDetail.js
+7
-2
classDetail.wxml
pages/index/classDetail/classDetail.wxml
+1
-2
classManagement.js
pages/index/classManagement/classManagement.js
+10
-3
classManagement.wxml
pages/index/classManagement/classManagement.wxml
+1
-1
evaluation.js
pages/index/evaluation/evaluation.js
+95
-99
evaluation.wxml
pages/index/evaluation/evaluation.wxml
+3
-3
performance.js
pages/index/performance/performance.js
+19
-9
parents.js
pages/my/parents/parents.js
+25
-28
parents.wxml
pages/my/parents/parents.wxml
+31
-43
parents.wxss
pages/my/parents/parents.wxss
+5
-1
teachingArea.js
pages/my/teachingArea/teachingArea.js
+14
-21
teachingArea.wxml
pages/my/teachingArea/teachingArea.wxml
+1
-1
class.js
pages/tabbar/class/class.js
+0
-2
personal.js
pages/tabbar/personal/personal.js
+36
-21
personal.wxml
pages/tabbar/personal/personal.wxml
+1
-1
personal.wxss
pages/tabbar/personal/personal.wxss
+1
-1
teamDetail.js
pages/team/teamDetail/teamDetail.js
+2
-2
No files found.
pages/index/badgelist/badgelist.js
View file @
0638fde5
...
@@ -6,7 +6,8 @@ Page({
...
@@ -6,7 +6,8 @@ Page({
list
:
[],
list
:
[],
status
:
false
,
status
:
false
,
num
:
0
,
num
:
0
,
arr
:[]
arr
:[],
badge_ids
:[]
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
var
arr1
=
JSON
.
parse
(
options
.
listData
)
var
arr1
=
JSON
.
parse
(
options
.
listData
)
...
@@ -53,14 +54,17 @@ Page({
...
@@ -53,14 +54,17 @@ Page({
}
}
//点击图片把status==true的组成新的数组
//点击图片把status==true的组成新的数组
var
arr
=
[];
var
arr
=
[];
var
badge_ids
=
[];
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
if
(
list
[
i
].
status
==
true
){
if
(
list
[
i
].
status
==
true
){
arr
.
push
(
list
[
i
])
arr
.
push
(
list
[
i
])
badge_ids
.
push
(
list
[
i
].
id
)
}
}
}
}
this
.
setData
({
this
.
setData
({
list
:
list
,
list
:
list
,
arr
:
arr
arr
:
arr
,
badge_ids
:
badge_ids
})
})
},
},
...
@@ -73,7 +77,8 @@ Page({
...
@@ -73,7 +77,8 @@ Page({
base
.
toast
(
'
最多选择三个徽章
'
)
base
.
toast
(
'
最多选择三个徽章
'
)
}
else
{
}
else
{
prevPage
.
setData
({
prevPage
.
setData
({
arr
:
this
.
data
.
arr
arr
:
this
.
data
.
arr
,
badge_ids
:
this
.
data
.
badge_ids
})
})
wx
.
navigateBack
({
wx
.
navigateBack
({
delta
:
1
delta
:
1
...
...
pages/index/classDetail/classDetail.js
View file @
0638fde5
...
@@ -9,15 +9,18 @@ Page({
...
@@ -9,15 +9,18 @@ Page({
coach_id
:
''
,
coach_id
:
''
,
class_id
:
''
,
class_id
:
''
,
lesson_id
:
''
,
lesson_id
:
''
,
class_single_id
:
''
,
stuList
:
[],
stuList
:
[],
courseData
:
''
,
courseData
:
''
,
noticeCount
:
9
,
noticeCount
:
9
,
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
setData
({
this
.
setData
({
class_id
:
options
.
class_id
,
class_id
:
options
.
class_id
,
lesson_id
:
options
.
lesson_id
lesson_id
:
options
.
lesson_id
,
})
})
console
.
log
(
options
.
lesson_id
)
console
.
log
(
options
.
lesson_id
)
console
.
log
(
options
.
class_id
)
console
.
log
(
options
.
class_id
)
...
@@ -46,9 +49,11 @@ Page({
...
@@ -46,9 +49,11 @@ Page({
goperformance
:
function
(
e
)
{
goperformance
:
function
(
e
)
{
var
child_id
=
e
.
currentTarget
.
dataset
.
id
var
child_id
=
e
.
currentTarget
.
dataset
.
id
var
class_single_id
=
e
.
currentTarget
.
dataset
.
class_single_id
console
.
log
(
child_id
)
console
.
log
(
child_id
)
console
.
log
(
class_single_id
)
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'
../../index/performance/performance?child_id=
'
+
child_id
+
'
&lesson_id=
'
+
this
.
data
.
lesson_id
+
'
&class_id=
'
+
this
.
data
.
class_id
,
url
:
'
../../index/performance/performance?child_id=
'
+
child_id
+
'
&lesson_id=
'
+
this
.
data
.
lesson_id
+
'
&class_id=
'
+
this
.
data
.
class_id
+
'
&class_single_id=
'
+
class_single_id
,
})
})
},
},
gocourseinstant
:
function
()
{
gocourseinstant
:
function
()
{
...
...
pages/index/classDetail/classDetail.wxml
View file @
0638fde5
...
@@ -24,8 +24,7 @@
...
@@ -24,8 +24,7 @@
</view>
</view>
</view>
</view>
<view class="status">
<view class="status">
<view class="evaluation" data-id="{{item.id}}" catchtap="goperformance" wx:if="{{item.is_leave == 0}}">运动评价
<view class="evaluation" data-id="{{item.id}}" data-class_single_id="{{item.class_single_id}}" catchtap="goperformance" wx:if="{{item.is_leave == 0}}">运动评价</view>
</view>
<view class="leave" wx:else>已请假</view>
<view class="leave" wx:else>已请假</view>
<view class="unread" wx:if="{{ !item.class_moment }}"></view>
<view class="unread" wx:if="{{ !item.class_moment }}"></view>
</view>
</view>
...
...
pages/index/classManagement/classManagement.js
View file @
0638fde5
...
@@ -107,9 +107,14 @@ Page({
...
@@ -107,9 +107,14 @@ Page({
base
.
toast
(
'
请开课后上传课程瞬间
'
)
base
.
toast
(
'
请开课后上传课程瞬间
'
)
}
}
},
},
goevaluation
:
function
()
{
goSport
:
function
(
e
)
{
let
child_id
=
e
.
currentTarget
.
dataset
.
child_id
let
class_id
=
e
.
currentTarget
.
dataset
.
class_id
let
class_single_id
=
e
.
currentTarget
.
dataset
.
class_single_id
let
course_id
=
e
.
currentTarget
.
dataset
.
course_id
console
.
log
(
course_id
)
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'
/pages/index/evaluation/evaluation
'
,
url
:
'
/pages/index/evaluation/evaluation
?child_id=
'
+
child_id
+
'
&class_id=
'
+
class_id
+
'
&class_single_id=
'
+
class_single_id
+
'
&course_id=
'
+
course_id
,
})
})
},
},
onPullDownRefresh
()
{
onPullDownRefresh
()
{
...
@@ -124,5 +129,7 @@ Page({
...
@@ -124,5 +129,7 @@ Page({
this
.
getDetail
()
this
.
getDetail
()
}
}
wx
.
stopPullDownRefresh
()
wx
.
stopPullDownRefresh
()
}
},
})
})
\ No newline at end of file
pages/index/classManagement/classManagement.wxml
View file @
0638fde5
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<view wx:if="{{item.sign_status == 1}}">
<view wx:if="{{item.sign_status == 1}}">
<view class="sign">已签到</view>
<view class="sign">已签到</view>
<view class="evaluation1" wx:if='{{item.class_comment!=""}}'>已评价</view>
<view class="evaluation1" wx:if='{{item.class_comment!=""}}'>已评价</view>
<view
wx:if='{{item.class_comment==""}}' catchtap="goSport
">运动评价</view>
<view
class="evaluation" wx:if='{{item.class_comment==""}}' catchtap="goSport" data-child_id="{{item.child.id}}" data-class_id="{{item.class_id}}" data-class_single_id="{{item.class_single_id}}" data-course_id="{{item.course_id}}
">运动评价</view>
</view>
</view>
<view wx:if="{{item.sign_status == 0}}">
<view wx:if="{{item.sign_status == 0}}">
<view class="sign1" bindtap="showButton" data-id='{{item.child.id}}'>签到</view>
<view class="sign1" bindtap="showButton" data-id='{{item.child.id}}'>签到</view>
...
...
pages/index/evaluation/evaluation.js
View file @
0638fde5
...
@@ -10,57 +10,70 @@ Page({
...
@@ -10,57 +10,70 @@ Page({
texts
:
"
已输入
"
,
texts
:
"
已输入
"
,
min
:
0
,
//最少字数
min
:
0
,
//最少字数
max
:
300
,
//最多字数
max
:
300
,
//最多字数
currentWordNumber
:
0
,
currentWordNumber
:
0
,
chooseBadge
:
true
,
chooseBadge
:
true
,
imgBox
:[],
imgBox
:
[],
scoreArr
:
[],
scoreArr
:
[],
idlist
:[],
idlist
:
[],
scorelist
:[]
scorelist
:
[]
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
setData
({
child_id
:
options
.
child_id
,
class_id
:
options
.
class_id
,
class_single_id
:
options
.
class_single_id
,
course_id
:
options
.
course_id
})
this
.
getComment
()
this
.
getComment
()
},
},
onShow
:
function
()
{
onShow
:
function
()
{
this
.
setData
({
this
.
setData
({
imgBox
:
this
.
data
.
arr
?
this
.
data
.
arr
:
[]
imgBox
:
this
.
data
.
arr
?
this
.
data
.
arr
:
[],
badge_ids
:
this
.
data
.
badge_ids
?
this
.
data
.
badge_ids
:
[]
})
})
},
},
inputs
:
function
(
e
)
{
// inputs: function (e) {
var
value
=
e
.
detail
.
value
;
// var value = e.detail.value;
console
.
log
(
value
)
// console.log(value)
var
len
=
parseInt
(
value
.
length
);
// var len = parseInt(value.length);
// console.log(len)
// // console.log(len)
if
(
len
<=
this
.
data
.
min
)
// if (len <= this.data.min)
this
.
setData
({
// this.setData({
texts
:
"
已输入
"
,
// texts: "已输入",
num
:
this
.
data
.
min
-
len
// num: this.data.min - len
})
// })
else
if
(
len
>
this
.
data
.
min
)
// else if (len > this.data.min)
this
.
setData
({
// this.setData({
texts
:
"
"
,
// texts: " ",
textss
:
"
"
,
// textss: " ",
num
:
''
// num: ''
})
// })
// this.setData({
// currentWordNumber: len //当前字数
// });
// if (len > this.data.max) return;
// console.log(this.data)
// },
inputs
:
function
(
e
)
{
this
.
setData
({
this
.
setData
({
currentWordNumber
:
len
//当前字数
value
:
e
.
detail
.
value
});
})
if
(
len
>
this
.
data
.
max
)
return
;
console
.
log
(
this
.
data
.
value
)
console
.
log
(
this
.
data
)
},
},
onDrag
(
event
)
{
onDrag
(
event
)
{
console
.
log
(
event
)
//
console.log(event)
let
index
=
event
.
currentTarget
.
dataset
.
index
let
index
=
event
.
currentTarget
.
dataset
.
index
this
.
data
.
scoreArr
[
index
].
score
=
event
.
detail
.
value
this
.
data
.
scoreArr
[
index
].
score
=
event
.
detail
.
value
this
.
setData
({
this
.
setData
({
scoreArr
:
this
.
data
.
scoreArr
scoreArr
:
this
.
data
.
scoreArr
});
});
console
.
log
(
this
.
data
.
scoreArr
)
//
console.log(this.data.scoreArr)
},
},
gobadgelist
:
function
(
e
)
{
gobadgelist
:
function
(
e
)
{
var
model
=
JSON
.
stringify
(
this
.
data
.
imgBox
)
var
model
=
JSON
.
stringify
(
this
.
data
.
imgBox
)
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'
../../index/badgelist/badgelist?listData=
'
+
model
,
url
:
'
../../index/badgelist/badgelist?listData=
'
+
model
,
...
@@ -68,94 +81,77 @@ Page({
...
@@ -68,94 +81,77 @@ Page({
},
},
//删除徽章
//删除徽章
deleteBadge
:
function
(
e
)
{
deleteBadge
:
function
(
e
)
{
var
imgs
=
this
.
data
.
imgBox
var
imgs
=
this
.
data
.
imgBox
var
index
=
e
.
currentTarget
.
dataset
.
index
var
index
=
e
.
currentTarget
.
dataset
.
index
// console.log(index)
// console.log(index)
imgs
.
splice
(
index
,
1
)
imgs
.
splice
(
index
,
1
)
this
.
setData
({
this
.
setData
({
imgBox
:
imgs
imgBox
:
imgs
})
})
},
},
// 教练对孩子运动评价,获取课程评价维度
// 教练对孩子运动评价,获取课程评价维度
getComment
:
function
()
{
getComment
:
function
()
{
let
params
=
{
let
params
=
{
url
:
'
coach/comment_norm
'
,
url
:
'
coach/comment_norm
'
,
data
:
{
data
:
{
course_id
:
1001
,
course_id
:
this
.
data
.
course_id
,
},
},
callback
:
(
data
)
=>
{
callback
:
(
data
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
var
arr
=
[]
var
arr
=
[]
for
(
var
i
=
0
;
i
<
data
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
data
.
length
;
i
++
)
{
let
options
=
{
let
options
=
{
id
:
data
[
i
].
id
,
id
:
data
[
i
].
id
,
name
:
data
[
i
].
name
,
name
:
data
[
i
].
name
,
score
:
0
score
:
0
}
}
arr
.
push
(
options
)
arr
.
push
(
options
)
}
}
console
.
log
(
arr
)
console
.
log
(
arr
)
this
.
setData
({
this
.
setData
({
scoreArr
:
arr
,
scoreArr
:
arr
,
})
})
//把scoreArr数组中的id跟score拿出来组成新的数组{id:1,score:0}------{"1":90,"2":80}
// let newarr = []
// this.data.scoreArr.forEach(item => {
// let newdata = {}
// newdata.id = item.id;
// newdata.score = item.score;
// newarr.push(newdata)
// })
// this.setData({
// newarr :this.data.scoreArr
// })
// console.log(newarr)
}
}
}
}
base
.
newRequest
(
params
)
base
.
newRequest
(
params
)
},
},
// 保存
// 保存
save
:
function
()
{
save
:
function
()
{
let
obj
=
{};
// let params = {
this
.
data
.
scoreArr
.
map
((
e
)
=>
{
// url:'badges/add',
console
.
log
(
e
)
// data:{
obj
[
e
.
id
]
=
e
.
score
;
// },
});
// type:'POST',
//如果其中存在某一条评分未评则不能保存成功 必须全部评分完毕
// callback: (data) => {
let
params
=
{
url
:
'
badges/add
'
,
// }
data
:
{
// }
user_child_id
:
this
.
data
.
child_id
,
// base.newRequest(params)
badge_id
:
1
,
//this.data.badge_ids,
class_id
:
this
.
data
.
class_id
,
let
params
=
{
class_single_id
:
this
.
data
.
class_single_id
,
url
:
'
coach/comment_save
'
,
coach_id
:
5
,
data
:{
},
coach_id
:
5
,
type
:
'
POST
'
,
lesson_id
:
73
,
callback
:
(
data
)
=>
{
child_id
:
303
,
let
params
=
{
comment_score
:
this
.
data
.
newarr
url
:
'
coach/comment_save
'
,
},
data
:
{
type
:
'
POST
'
,
coach_id
:
5
,
callback
:
(
data
)
=>
{
lesson_id
:
this
.
data
.
class_single_id
,
console
.
log
(
data
)
child_id
:
this
.
data
.
child_id
,
//把scoreArr数组中的id跟score拿出来组成新的数组{id:1,score:0}------{"1":90,"2":80}
comment_score
:
JSON
.
stringify
(
obj
),
// let newarr = []
commnet
:
this
.
data
.
value
// this.data.scoreArr.forEach(item => {
},
// let newdata = {}
type
:
'
POST
'
,
// newdata.id = item.id;
callback
:
(
data
)
=>
{
// newdata.score = item.score;
// base.toast('保存成功')
// newarr.push(newdata)
}
// })
}
// this.setData({
base
.
newRequest
(
params
)
// newarr :this.data.scoreArr
}
// })
// console.log(newarr)
// this.getComment()
}
}
}
base
.
newRequest
(
params
)
base
.
newRequest
(
params
)
}
}
})
})
\ No newline at end of file
pages/index/evaluation/evaluation.wxml
View file @
0638fde5
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
<view class="coach">
<view class="coach">
<view class="title">教练评语</view>
<view class="title">教练评语</view>
<view class="text">
<view class="text">
<textarea placeholder="请输入对学生的评价" minlength="{{min}}" maxlength="{{max}}" bindinput="inputs">
<textarea placeholder="请输入对学生的评价" minlength="{{min}}" maxlength="{{max}}" bindinput="inputs"
value="{{value}}"
>
<text class="currentWordNumber">{{currentWordNumber}}/{{max}}</text>
<
!-- <
text class="currentWordNumber">{{currentWordNumber}}/{{max}}</text>
<text class="hint">{{texts}}{{num}}</text>
<text class="hint">{{texts}}{{num}}</text>
-->
</textarea>
</textarea>
</view>
</view>
</view>
</view>
...
...
pages/index/performance/performance.js
View file @
0638fde5
...
@@ -12,10 +12,21 @@ Page({
...
@@ -12,10 +12,21 @@ Page({
coachcomment
:
''
,
coachcomment
:
''
,
awardList
:
[],
awardList
:
[],
arr1
:
[],
arr1
:
[],
arr2
:[]
arr2
:[],
class_id
:
''
,
lesson_id
:
''
,
child_id
:
''
,
class_single_id
:
''
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
console
.
log
(
options
.
child_id
)
console
.
log
(
options
)
this
.
setData
({
class_id
:
options
.
class_id
,
lesson_id
:
options
.
lesson_id
,
child_id
:
options
.
child_id
,
class_single_id
:
options
.
class_single_id
})
console
.
log
(
options
.
class_single_id
)
this
.
getRpx
()
this
.
getRpx
()
this
.
getcomment
()
this
.
getcomment
()
this
.
getbadges
()
this
.
getbadges
()
...
@@ -46,14 +57,13 @@ Page({
...
@@ -46,14 +57,13 @@ Page({
});
});
},
},
getcomment
:
function
()
{
getcomment
:
function
()
{
const
{
coach_id
,
class_id
,
lesson_id
,
child_id
,
}
=
this
.
data
let
params
=
{
let
params
=
{
url
:
'
coach/comment
'
,
url
:
'
coach/comment
'
,
data
:{
data
:{
coach_id
:
5
,
coach_id
:
5
,
class_id
:
16
,
class_id
:
this
.
data
.
class_id
,
lesson_id
:
69
,
lesson_id
:
this
.
data
.
lesson_id
,
child_id
:
14
,
child_id
:
this
.
data
.
child_id
,
},
},
callback
:
(
data
)
=>
{
callback
:
(
data
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
...
@@ -86,9 +96,9 @@ Page({
...
@@ -86,9 +96,9 @@ Page({
let
params
=
{
let
params
=
{
url
:
'
badges
'
,
url
:
'
badges
'
,
data
:
{
data
:
{
user_child_id
:
303
,
user_child_id
:
this
.
data
.
child_id
,
class_id
:
16
,
class_id
:
this
.
data
.
class_id
,
class_single_id
:
69
,
class_single_id
:
this
.
data
.
class_single_id
,
},
},
callback
:
(
data
)
=>
{
callback
:
(
data
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
...
...
pages/my/parents/parents.js
View file @
0638fde5
// pages/my/parents/parents.js
const
app
=
getApp
()
import
{
Base
}
from
'
../../../utils/base.js
'
;
const
base
=
new
Base
()
Page
({
Page
({
/**
/**
* 页面的初始数据
* 页面的初始数据
*/
*/
data
:
{
data
:
{
list
:
[],
},
},
...
@@ -12,36 +15,35 @@ Page({
...
@@ -12,36 +15,35 @@ Page({
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
getreply
()
},
},
getreply
:
function
()
{
/**
wx
.
showLoading
({
* 生命周期函数--监听页面初次渲染完成
title
:
'
加载中...
'
,
*/
})
onReady
:
function
()
{
let
params
=
{
url
:
'
coach/reply
'
,
data
:
{
coach_id
:
4
},
callback
:
(
data
)
=>
{
wx
.
hideLoading
()
console
.
log
(
data
)
this
.
setData
({
list
:
data
})
}
}
base
.
newRequest
(
params
)
},
},
/**
/**
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
/**
* 页面相关事件处理函数--监听用户下拉动作
* 页面相关事件处理函数--监听用户下拉动作
...
@@ -57,10 +59,5 @@ Page({
...
@@ -57,10 +59,5 @@ Page({
},
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
})
\ No newline at end of file
pages/my/parents/parents.wxml
View file @
0638fde5
<view class="item">
<view>
<view class="top flex-h flex-vc flex-hb">
<block wx:if="{{list.length>0}}">
<view class="row">
<view class="item" wx:for="{{list}}" wx:key="index">
<image src="../../../images/course_login.png"></image>
<view class="top flex-h flex-vc flex-hb">
<view class="name">家长名字</view>
<view class="row">
<image src="{{item.child.wx_user.avatarurl}}"></image>
<view class="name">{{item.child.wx_user.nickname}}</view>
</view>
<view class="date">
<text>{{item.updated_at}}</text>
<!-- <text>10:00</text> -->
</view>
</view>
<view class="comments">{{item.comment_reply}}</view>
<view class="class">
<view class="evaluation">{{item.course.sub_title}}</view>
<view class="row">
<view class="img">
<image src="{{item.course.share_img}}"></image>
</view>
<view class="column">
<text class="subject">{{item.course.name}}</text>
<text class="date">{{item.date_int}} {{item.start_time}}~{{item.end_time}}</text>
</view>
</view>
</view>
</view>
</view>
<view class="date">
</block>
<text>2020-10-28</text>
<block wx:else>
<text>10:00</text>
<view class="empty">
<van-empty class="custom-image" image="/images/without.png" description="暂无课程" />
</view>
</view>
</view>
</block>
<view class="comments">谢谢教练~孩子非常喜欢上体育课!</view>
<view class="class">
<view class="evaluation">西西的运动评价</view>
<view class="row">
<image src="../../../images/course_login.png"></image>
<view class="column">
<text class="subject">篮球课</text>
<text class="date">2020-10-26 10:00~11:00</text>
</view>
</view>
</view>
</view>
<view class="item">
<view class="top flex-h flex-vc flex-hb">
<view class="row">
<image src="../../../images/course_login.png"></image>
<view class="name">家长名字</view>
</view>
<view class="date">
<text>2020-10-28</text>
<text>10:00</text>
</view>
</view>
<view class="comments">谢谢教练~孩子非常喜欢上体育课!</view>
<view class="class">
<view class="evaluation">西西的运动评价</view>
<view class="row">
<image src="../../../images/course_login.png"></image>
<view class="column">
<text class="subject">篮球课</text>
<text class="date">2020-10-26 10:00~11:00</text>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/my/parents/parents.wxss
View file @
0638fde5
...
@@ -48,11 +48,15 @@ page{
...
@@ -48,11 +48,15 @@ page{
font-size: 24rpx;
font-size: 24rpx;
margin-bottom: 20rpx;
margin-bottom: 20rpx;
}
}
.item .class
image
{
.item .class
.img
{
width: 200rpx;
width: 200rpx;
height: 131rpx;
height: 131rpx;
margin-right: 28rpx;
margin-right: 28rpx;
}
}
.item .class .img image{
width: 100%;
height: 100%;
}
.item .class .subject{
.item .class .subject{
color: #1A1A1A;
color: #1A1A1A;
font-size: 26rpx;
font-size: 26rpx;
...
...
pages/my/teachingArea/teachingArea.js
View file @
0638fde5
...
@@ -8,33 +8,26 @@ Page({
...
@@ -8,33 +8,26 @@ Page({
*/
*/
data
:
{
data
:
{
cityShow
:
false
,
cityShow
:
false
,
cityList
:
[
cityList
:
[]
{
name
:
'
石家庄市
'
},
{
name
:
'
保定市
'
},
{
name
:
'
邯郸市
'
},
{
name
:
'
秦皇岛市
'
},
{
name
:
'
邢台市
'
},
{
name
:
'
承德市
'
},
]
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
getCitylist
()
},
getCitylist
:
function
()
{
let
params
=
{
url
:
'
coach/city
'
,
callback
:
(
data
)
=>
{
console
.
log
(
data
)
this
.
setData
({
cityList
:
data
})
}
}
base
.
newRequest
(
params
)
},
},
changeCity
:
function
(
e
)
{
changeCity
:
function
(
e
)
{
this
.
setData
({
this
.
setData
({
...
...
pages/my/teachingArea/teachingArea.wxml
View file @
0638fde5
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<!-- <view class="cityCenter_title">已开通服务城市</view> -->
<!-- <view class="cityCenter_title">已开通服务城市</view> -->
<view class="cityCenter_con flex-h flex-hw">
<view class="cityCenter_con flex-h flex-hw">
<block wx:for='{{cityList}}' wx:key='index'>
<block wx:for='{{cityList}}' wx:key='index'>
<text class="{{item.isChecked ? 'city_active' : ''}}" catchtap="chooseCity" data-index='{{index}}'>{{item.name}}</text>
<text class="{{item.isChecked ? 'city_active' : ''}}" catchtap="chooseCity" data-index='{{index}}'>{{item.
city_
name}}</text>
</block>
</block>
</view>
</view>
</view>
</view>
...
...
pages/tabbar/class/class.js
View file @
0638fde5
...
@@ -25,7 +25,6 @@ Page({
...
@@ -25,7 +25,6 @@ Page({
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'
加载中
'
,
title
:
'
加载中
'
,
})
})
const
{
coach_id
}
=
this
.
data
;
let
params
=
{
let
params
=
{
url
:
'
coach/roblist
'
,
url
:
'
coach/roblist
'
,
data
:
{
data
:
{
...
@@ -47,7 +46,6 @@ Page({
...
@@ -47,7 +46,6 @@ Page({
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'
加载中...
'
,
title
:
'
加载中...
'
,
})
})
const
{
coach_id
}
=
this
.
data
;
let
params
=
{
let
params
=
{
url
:
'
coach/myclasses
'
,
url
:
'
coach/myclasses
'
,
data
:
{
data
:
{
...
...
pages/tabbar/personal/personal.js
View file @
0638fde5
...
@@ -11,33 +11,35 @@ Page({
...
@@ -11,33 +11,35 @@ Page({
noticeCount
:
9
,
// 家长回复小红点
noticeCount
:
9
,
// 家长回复小红点
show
:
false
,
show
:
false
,
subjectShow
:
false
,
subjectShow
:
false
,
subjectList
:[
subjectList
:[],
{
// subjectList:[
name
:
'
跳绳
'
// {
},
// name: '跳绳'
{
// },
name
:
'
篮球
'
// {
},
// name: '篮球'
{
// },
name
:
'
足球
'
// {
},
// name: '足球'
{
// },
name
:
'
轮滑
'
// {
},
// name: '轮滑'
{
// },
name
:
'
平衡车
'
// {
},
// name: '平衡车'
{
// },
name
:
'
跆拳道
'
// {
},
// name: '跆拳道'
]
// },
// ]
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
getSubjectlist
()
},
},
onShow
()
{
onShow
()
{
let
userInfo
=
wx
.
getStorageSync
(
'
userInfo
'
);
let
userInfo
=
wx
.
getStorageSync
(
'
userInfo
'
);
...
@@ -74,6 +76,19 @@ Page({
...
@@ -74,6 +76,19 @@ Page({
url
:
'
../../my/teachingArea/teachingArea
'
,
url
:
'
../../my/teachingArea/teachingArea
'
,
})
})
},
},
getSubjectlist
:
function
(){
let
params
=
{
url
:
'
coach/course
'
,
callback
:
(
data
)
=>
{
console
.
log
(
data
)
this
.
setData
({
subjectList
:
data
})
}
}
base
.
newRequest
(
params
)
},
//教学科目弹窗
//教学科目弹窗
tcHold
:
function
(
e
)
{
tcHold
:
function
(
e
)
{
this
.
setData
({
this
.
setData
({
...
...
pages/tabbar/personal/personal.wxml
View file @
0638fde5
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
</view>
</view>
<view class="subject flex-h flex-hw flex-ha">
<view class="subject flex-h flex-hw flex-ha">
<block wx:for='{{subjectList}}' wx:key='index'>
<block wx:for='{{subjectList}}' wx:key='index'>
<view class="{{item.isChecked ? 'active' : ''}}" catchtap="chooseOne" data-index='{{index}}'>{{item.name}}</view>
<view class="{{item.isChecked ? 'active' : ''}}" catchtap="chooseOne" data-index='{{index}}'
data-item='{{item}}'
>{{item.name}}</view>
</block>
</block>
</view>
</view>
<view class="confirm" catchtap="confirm">确定</view>
<view class="confirm" catchtap="confirm">确定</view>
...
...
pages/tabbar/personal/personal.wxss
View file @
0638fde5
...
@@ -111,7 +111,7 @@ page {
...
@@ -111,7 +111,7 @@ page {
width: 580rpx;
width: 580rpx;
background-color: #FFFFFF;
background-color: #FFFFFF;
border-radius: 10rpx;
border-radius: 10rpx;
padding: 51rpx
0
;
padding: 51rpx
20rpx
;
}
}
.top .til{
.top .til{
text-align: center;
text-align: center;
...
...
pages/team/teamDetail/teamDetail.js
View file @
0638fde5
...
@@ -6,6 +6,7 @@ Page({
...
@@ -6,6 +6,7 @@ Page({
courseData
:
''
,
courseData
:
''
,
studentList
:
[],
studentList
:
[],
lessonList
:
[],
lessonList
:
[],
class_id
:
''
,
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
...
@@ -16,12 +17,11 @@ Page({
...
@@ -16,12 +17,11 @@ Page({
this
.
getclassdetail
();
this
.
getclassdetail
();
},
},
getclassdetail
:
function
()
{
getclassdetail
:
function
()
{
const
{
coach_id
,
class_id
}
=
this
.
data
let
params
=
{
let
params
=
{
url
:
'
coach/classdetail
'
,
url
:
'
coach/classdetail
'
,
data
:
{
data
:
{
coach_id
:
5
,
coach_id
:
5
,
class_id
:
16
class_id
:
this
.
data
.
class_id
},
},
callback
:
(
data
)
=>
{
callback
:
(
data
)
=>
{
console
.
log
(
data
)
console
.
log
(
data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment