|
@@ -69,7 +69,7 @@ Page({
|
|
if (options.type == 1){
|
|
if (options.type == 1){
|
|
//班级列表
|
|
//班级列表
|
|
wx.request({
|
|
wx.request({
|
|
- url: host + '/api/wx/class/list?subject_item0=' + options.s_name,
|
|
|
|
|
|
+ url: host + '/api/wx/class/list?signup=1&subject_item0=' + options.s_name,
|
|
method: 'GET',
|
|
method: 'GET',
|
|
success: res => {
|
|
success: res => {
|
|
// 过滤分类
|
|
// 过滤分类
|
|
@@ -274,14 +274,16 @@ Page({
|
|
})
|
|
})
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
- // if (this.data.class_ == -1) {
|
|
|
|
- // wx.showToast({
|
|
|
|
- // title: '请选择班级',
|
|
|
|
- // icon: 'none',
|
|
|
|
- // duration: 2000
|
|
|
|
- // })
|
|
|
|
- // return false
|
|
|
|
- // }
|
|
|
|
|
|
+ console.log(this.data.class_)
|
|
|
|
+ console.log(this.data.z_type)
|
|
|
|
+ if (this.data.class_ == -1&&this.data.z_type != '特种作业人员') {
|
|
|
|
+ wx.showToast({
|
|
|
|
+ title: '请选择班级',
|
|
|
|
+ icon: 'none',
|
|
|
|
+ duration: 2000
|
|
|
|
+ })
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
formData.subject_item = data.z_type + "|" + data.categoryArray[data.category].name + "|" + data.subjectArray[data.subject].name
|
|
formData.subject_item = data.z_type + "|" + data.categoryArray[data.category].name + "|" + data.subjectArray[data.subject].name
|
|
formData.subject_id = data.subjectArray[data.subject].id
|
|
formData.subject_id = data.subjectArray[data.subject].id
|
|
if (formData.subject_item.indexOf("特种作业人员")==-1){
|
|
if (formData.subject_item.indexOf("特种作业人员")==-1){
|