From fd05d3dfc61ad3482cfd577279cff72f74c68cf6 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期二, 12 三月 2024 17:13:57 +0800
Subject: [PATCH] fix bug 2.0
---
WanPai/Root/Course/VC/AddStudentVC.swift | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/WanPai/Root/Course/VC/AddStudentVC.swift b/WanPai/Root/Course/VC/AddStudentVC.swift
index b3a30c5..8ddb83e 100644
--- a/WanPai/Root/Course/VC/AddStudentVC.swift
+++ b/WanPai/Root/Course/VC/AddStudentVC.swift
@@ -70,10 +70,10 @@
img_profile.sd_setImage(with: URL(string: studentInfo!.stuHeadImg))
studentModel.headImg = studentInfo!.stuHeadImg
studentModel.stuId = studentInfo!.stuId
- tf_gender.text = studentModel.sex == .man ? "男":"女"
+ tf_gender.text = studentInfo!.sex == .man ? "男":"女"
}
}else{
- view_profile.isHidden = true
+ view_profile.isHidden = false
title = "添加人员"
tf_name.placeholder = "请输入人员姓名"
tf_height.placeholder = "请输入身高"
@@ -124,8 +124,16 @@
@IBAction func completeAction(_ sender: UIButton) {
- if studentInfo == nil && type == .course{
- guard profileImg != nil else {alertError(msg: "请上传运动营成员头像");return}
+ if studentInfo == nil{
+ guard profileImg != nil else {
+
+ if type == .course{
+ alertError(msg: "请上传运动营成员头像");
+ }else{
+ alertError(msg: "请上传人员头像");
+ }
+
+ return}
}
guard !tf_name.text!.isEmpty else {alertError(msg: tf_name.placeholder!);return}
@@ -143,10 +151,9 @@
guard tf_phone.text!.jq_isPhone else {alertError(msg: "请输入正确的手机号");return}
}
-// if !tf_idCard.isEmpty || activityDetailPartModel != nil{
-//
-// }
- guard tf_idCard.text!.jq_idCard() else {alertError(msg: "请输入正确的身份证号码");return}
+ if !tf_idCard.isEmpty || activityDetailPartModel != nil{
+ guard tf_idCard.text!.jq_idCard() else {alertError(msg: "请输入正确的身份证号码");return}
+ }
studentModel.birthday = tf_birthday.text!
studentModel.name = tf_name.text!
@@ -174,17 +181,17 @@
private func addStudent(){
if type == .course{
- if studentInfo == nil{
- Services.addStudent(studentModel).subscribe(onNext: { [weak self] data in
- self?.addStudentSuccess(text: "编辑成功")
- }).disposed(by: disposeBag)
- }else{
+ if studentInfo != nil{
Services.editStu(studentModel).subscribe(onNext: {[weak self]data in
- self?.addStudentSuccess(text: "添加成功")
+ self?.addStudentSuccess(text: "编辑成功")
NotificationCenter.default.post(name: StudentUpdate_Nofi, object: nil)
}) { error in
}.disposed(by: disposeBag)
+ }else{
+ Services.addStudent(studentModel).subscribe(onNext: { [weak self] data in
+ self?.addStudentSuccess(text: "添加成功")
+ }).disposed(by: disposeBag)
}
}else{
if activityDetailPartModel != nil{
@@ -225,14 +232,19 @@
}
if textField == tf_gender{
-
let alertVC = UIAlertController(title: "性别", message: nil, preferredStyle: .actionSheet)
alertVC.addAction(UIAlertAction(title: "男", style: .default) { _ in
self.tf_gender.text = "男"
+ self.studentModel.sex = .man
+ self.activityDetailPartModel?.gender = .man
+ self.studentInfo?.sex = .man
})
alertVC.addAction(UIAlertAction(title: "女", style: .default) { _ in
self.tf_gender.text = "女"
+ self.studentModel.sex = .woman
+ self.activityDetailPartModel?.gender = .woman
+ self.studentInfo?.sex = .woman
})
alertVC.addAction(UIAlertAction(title: "取消", style: .cancel))
--
Gitblit v1.7.1