Skip to content

W
wandouchengzhang_coach
Commit 4da8ec29 authored by 石盼盼's avatar 石盼盼
Browse files
Options

教学科目保存接口对接，选择区域列表接口对接，教学区域保存接口对接

parent 5849d048
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 143 deletions
pages/index/classDetail/classDetail.wxml
View file @ 4da8ec29
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
</view> </view>
<view class="status"> <view class="status">
<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 class="evaluation" data-id="{{item.child_id}}" data-class_single_id="{{item.class_single_id}}" catchtap="goperformance" wx:if="{{item.is_leave == 0}}">运动评价</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/my/teachingArea/teachingArea.js
View file @ 4da8ec29
...@@ -7,8 +7,14 @@ Page({ ...@@ -7,8 +7,14 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
city: '',
cityShow: false, cityShow: false,
cityList: [] cityList: [],
city_name: '',
cityChecked: '',
show: false,
forIndex: 3,
areaNameList: [],
}, },
/** /**
...@@ -17,16 +23,38 @@ Page({ ...@@ -17,16 +23,38 @@ Page({
onLoad: function (options) { onLoad: function (options) {
this.getCitylist() this.getCitylist()
}, },
getCitylist : function () { showCitypop(e) {
this.setData({
show: true,
showIndex: e.currentTarget.dataset.index
})
},
onClose() {
this.setData({
show: false
})
},
getCitylist: function () {
let params = { let params = {
url : 'coach/city', url: 'coach/city',
callback : (data) => { callback: (data) => {
console.log(data) console.log(data)
this.setData({ this.setData({
cityList : data cityList: data
})
for (let i = 0; i < data.length; i++) {
if (data[i].is_default == 1) {
this.setData({
cityChecked: data[i].city_name,
city: data[i].city_name,
region_id: data[i].region_id,
city_id: data[i].id
}) })
} }
} }
this.getArealist(this.data.region_id)
}
}
base.newRequest(params) base.newRequest(params)
}, },
changeCity: function (e) { changeCity: function (e) {
...@@ -39,87 +67,107 @@ Page({ ...@@ -39,87 +67,107 @@ Page({
cityShow: false cityShow: false
}) })
}, },
chooseCity(e) { chooseCity(e) {
let index = e.currentTarget.dataset.index console.log(e.currentTarget.dataset.item)
let list = this.data.cityList let city_name = e.currentTarget.dataset.item.city_name;
if (list[index].isChecked) { let city_id = e.currentTarget.dataset.item.id;
list[index].isChecked = false let region_id = e.currentTarget.dataset.item.region_id;
} else { if (e.currentTarget.dataset.item.city_name != this.data.cityChecked) {
list[index].isChecked = true
}
this.setData({ this.setData({
cityList: list cityChecked: city_name,
cityChecked_id: city_id,
region_id: region_id
}) })
// console.log(e.currentTarget.dataset.item) this.getArealist(region_id)
// if (e.currentTarget.dataset.item.city_name != this.data.cityChecked) {
// this.setData({
// cityList: list
// })
// }
},
cityChangeComfirm() {
for (var i = 0; i < this.data.cityList.length; i++) {
if (this.data.cityChecked == this.data.cityList[i].city_name) {
app.globalData.city_id = this.data.cityList[i].id
app.globalData.city_name = this.data.cityList[i].city_name
} }
},
cityChangeComfirm: function (e) {
const { cityChecked, cityChecked_id, region_id } = this.data;
this.setData({ this.setData({
city: cityChecked,
city_id: cityChecked_id,
cityShow: false cityShow: false
}) })
} this.getArealist(region_id)
// if (arr.length == 0) {
// base.toast('至少选择一个城市')
// }else {
// console.log(arr)
// }
}, },
getArealist: function (region_id) {
/** let params = {
* 生命周期函数--监听页面初次渲染完成 url: 'coach/area',
*/ data: {
onReady: function () { region_id: region_id
}, },
callback: (data) => {
/** console.log(data)
* 生命周期函数--监听页面显示 var areaNameList = []
*/ for (let i in data) {
onShow: function () { areaNameList.push(data[i].name); //属性
}
console.log(areaNameList)
this.setData({
areaNameList: areaNameList,
areaList: data
})
}
}
base.newRequest(params)
}, },
onConfirm(event) {
/** const { picker, value, index } = event.detail;
* 生命周期函数--监听页面隐藏 const {showIndex, areaList } = this.data;
*/ let area_id;
onHide: function () { for(let i = 0; i<areaList.length;i++){
if(areaList[i].name == value){
area_id = areaList[i].id;
}
}
if(showIndex == 1){
this.setData({
first_area_name: value,
first_area: area_id
})
}else if(showIndex == 2){
this.setData({
second_area_name: value,
second_area: area_id
})
}else if(showIndex == 3){
this.setData({
third_area_name: value,
third_area: area_id
})
}
console.log(area_id)
this.setData({
show: !this.data.show
})
}, },
onCancel() {
/** this.setData({
* 生命周期函数--监听页面卸载 show : !this.data.show
*/ })
onUnload: function () {
}, },
save : function () {
/** const {city_id, first_area, second_area, third_area} = this.data;
* 页面相关事件处理函数--监听用户下拉动作 if(first_area || second_area || third_area){
*/ let params = {
onPullDownRefresh: function () { url : 'coach/save_area',
data : {
coach_id: 5,
city_id,
first_area,
second_area,
third_area
}, },
type:'POST',
/** callback : (data) => {
* 页面上拉触底事件的处理函数 base.toast('保存区域成功')
*/ }
onReachBottom: function () { }
base.newRequest(params)
}else{
base.toast('请至少选择一个意向区域')
}
}, },
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
}) })
\ No newline at end of file
pages/my/teachingArea/teachingArea.json
View file @ 4da8ec29
{ {
"usingComponents": {}, "usingComponents": {
"van-picker": "/components/vant/picker/index"
},
"navigationBarTitleText": "教学区域" "navigationBarTitleText": "教学区域"
} }
\ No newline at end of file
pages/my/teachingArea/teachingArea.wxml
View file @ 4da8ec29
<view class="place flex-h flex-vc" catchtap="changeCity"> <view class="place flex-h flex-vc" catchtap="changeCity">
<image src="../../../images/location.png"></image> <image src="../../../images/location.png"></image>
<view>已选城市：石家庄</view> <view>已选城市：{{city}}</view>
</view> </view>
<view class="select">选择意向区域</view> <view class="select">选择意向区域</view>
<view class="every flex-h flex-vc flex-hb"> <view class="item" wx:for="{{forIndex}}" wx:key="index">
<view>意向区域1</view> <view class="every flex-h flex-vc flex-hb">
<view> <view>意向区域{{index+1}}</view>
<text>长安区</text> <view bindtap="showCitypop" data-index="{{index+1}}">
<text wx:if="{{index == 0}}">{{first_area_name}}</text>
<text wx:if="{{index == 1}}">{{second_area_name}}</text>
<text wx:if="{{index == 2}}">{{third_area_name}}</text>
<text class="iconfont icongengduo"></text> <text class="iconfont icongengduo"></text>
</view> </view>
</view>
<view class="line"></view>
<view class="every flex-h flex-vc flex-hb">
<view>意向区域2</view>
<view>
<text>高新区</text>
<text class="iconfont icongengduo"></text>
</view>
</view>
<view class="line"></view>
<view class="every flex-h flex-vc flex-hb">
<view>意向区域3</view>
<view>
<text>裕华区</text>
<text class="iconfont icongengduo"></text>
</view> </view>
<view class="line"></view>
</view> </view>
<view class="line"></view> <van-popup show="{{ show }}" position="bottom" custom-style="height: 50%;" bind:close="onClose">
<van-picker show-toolbar columns="{{ areaNameList }}" bind:confirm="onConfirm" bind:cancel="onCancel" />
</van-popup>
<view class="cityBox" wx:if="{{cityShow}}" catchtap="closeCityShow"> <view class="cityBox" wx:if="{{cityShow}}" catchtap="closeCityShow">
<view class="cityContent"> <view class="cityContent">
<view class="cityTitle"> <view class="cityTitle">
...@@ -37,13 +25,15 @@ ...@@ -37,13 +25,15 @@
<text class="iconfont iconguanbi1" catchtap="closeCityShow"></text> <text class="iconfont iconguanbi1" catchtap="closeCityShow"></text>
</view> </view>
<view class="cityCenter"> <view class="cityCenter">
<!-- <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.city_name}}</text> <text class="{{cityChecked == item.city_name ? 'city_active': ''}}" catchtap="chooseCity" data-index='{{index}}' data-item='{{item}}'>{{item.city_name}}</text>
</block> </block>
</view> </view>
</view> </view>
<view class="cityConfirm" catchtap="cityChangeComfirm">确定</view> <view class="cityConfirm" catchtap="cityChangeComfirm">确定</view>
</view> </view>
</view> </view>
<view class="button">
<view class="save" bindtap="save">保存</view>
</view>
\ No newline at end of file
pages/my/teachingArea/teachingArea.wxss
View file @ 4da8ec29
...@@ -106,3 +106,25 @@ margin: 29rpx auto 0 auto; ...@@ -106,3 +106,25 @@ margin: 29rpx auto 0 auto;
font-size: 28rpx; font-size: 28rpx;
color: #1A1A1A; color: #1A1A1A;
} }
/* 按钮样式 */
.button{
width: 750rpx;
height: 118rpx;
padding: 18rpx 68rpx 20rpx;
position: fixed;
bottom: 0;
background: #FFFFFF;
}
.button .save{
width: 620rpx;
height: 80rpx;
border:none;
background: linear-gradient(-70deg, #FFC600 0%, #FFD400 100%);
border-radius: 40rpx;
color: #000000;
font-size: 30rpx;
text-align: center;
line-height: 80rpx;
}
\ No newline at end of file
pages/tabbar/personal/personal.js
View file @ 4da8ec29
...@@ -9,31 +9,9 @@ Page({ ...@@ -9,31 +9,9 @@ Page({
data: { data: {
showUserInfo: true, //用户信息是否显示 showUserInfo: true, //用户信息是否显示
noticeCount: 9, // 家长回复小红点 noticeCount: 9, // 家长回复小红点
show:false, show: false,
subjectShow: false, subjectShow: false,
subjectList:[], subjectList: [],
// subjectList:[
// {
// name: '跳绳'
// },
// {
// name: '篮球'
// },
// {
// name: '足球'
// },
// {
// name: '轮滑'
// },
// {
// name: '平衡车'
// },
// {
// name: '跆拳道'
// },
// ]
}, },
...@@ -66,23 +44,23 @@ Page({ ...@@ -66,23 +44,23 @@ Page({
url: '/pages/sign/info/info', url: '/pages/sign/info/info',
}) })
}, },
goparents:function(){ goparents: function () {
wx.navigateTo({ wx.navigateTo({
url: '../../my/parents/parents', url: '../../my/parents/parents',
}) })
}, },
goteachingArea:function(){ goteachingArea: function () {
wx.navigateTo({ wx.navigateTo({
url: '../../my/teachingArea/teachingArea', url: '../../my/teachingArea/teachingArea',
}) })
}, },
getSubjectlist : function (){ getSubjectlist: function () {
let params = { let params = {
url:'coach/course', url: 'coach/course',
callback : (data) => { callback: (data) => {
console.log(data) console.log(data)
this.setData({ this.setData({
subjectList : data subjectList: data
}) })
} }
...@@ -98,7 +76,7 @@ Page({ ...@@ -98,7 +76,7 @@ Page({
chooseOne(e) { chooseOne(e) {
let index = e.currentTarget.dataset.index let index = e.currentTarget.dataset.index
let list = this.data.subjectList let list = this.data.subjectList
if (list[index].isChecked){ if (list[index].isChecked) {
list[index].isChecked = false list[index].isChecked = false
} else { } else {
list[index].isChecked = true list[index].isChecked = true
...@@ -107,20 +85,38 @@ Page({ ...@@ -107,20 +85,38 @@ Page({
subjectList: list subjectList: list
}) })
}, },
confirm(){ confirm() {
var arr = [] var arr = []
for (var i=0; i<this.data.subjectList.length;i++) { var newArr = []
for (var i = 0; i < this.data.subjectList.length; i++) {
if (this.data.subjectList[i].isChecked == true) { if (this.data.subjectList[i].isChecked == true) {
arr.push(this.data.subjectList[i]) arr.push(this.data.subjectList[i])
newArr.push(this.data.subjectList[i].id)
} }
} }
console.log(arr)
console.log(newArr)
if (arr.length == 0) { if (arr.length == 0) {
base.toast('教学科目至少选择一项') base.toast('教学科目至少选择一项')
} else { } else {
console.log(arr) let params = {
url: 'coach/save_course',
data: {
coach_id: 4,
course_ids: JSON.stringify(newArr)
},
type : 'POST',
callback: (data) => {
base.toast('保存科目成功')
this.setData({
subjectShow : false
})
}
}
base.newRequest(params)
} }
}, },
goCall: function(e){ goCall: function (e) {
wx.showModal({ wx.showModal({
content: '确定要拨打电话吗？', content: '确定要拨打电话吗？',
success(res) { success(res) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment