From eb795a6523edbc0fe3a3b1a3d3bea1063041efd5 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期四, 19 十月 2023 18:09:23 +0800
Subject: [PATCH] 修复BUG
---
WanPai/Root/Course/VC/AddStudentVC.swift | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/WanPai/Root/Course/VC/AddStudentVC.swift b/WanPai/Root/Course/VC/AddStudentVC.swift
index bf74633..66104ee 100644
--- a/WanPai/Root/Course/VC/AddStudentVC.swift
+++ b/WanPai/Root/Course/VC/AddStudentVC.swift
@@ -12,11 +12,15 @@
class AddStudentVC: BaseVC {
@IBOutlet weak var img_profile: UIImageView!
+ @IBOutlet weak var view_profile: UIView!
@IBOutlet weak var tf_name: QMUITextField!
@IBOutlet weak var tf_gender: UITextField!
@IBOutlet weak var tf_idCard: UITextField!
@IBOutlet weak var tf_height: QMUITextField!
- @IBOutlet weak var tf_weight: QMUITextField!
+ @IBOutlet weak var view_height: UIView!
+ @IBOutlet weak var view_weight: UIView!
+ @IBOutlet weak var view_phone: UIView!
+ @IBOutlet weak var tf_weight: QMUITextField!
@IBOutlet weak var tf_phone: QMUITextField!
@IBOutlet weak var tf_birthday: UITextField!
@@ -24,6 +28,7 @@
var studentModel = StudentProfileModel()
var studentInfo:StudentProfile1Model?
+ var activityDetailPartModel:ActivityDetailPartModel?
var type:ItemType!
var verifyIdCard:Bool = false
@@ -34,6 +39,12 @@
self.studentInfo = studentInfo
}
+ init(activityDetailPartModel:ActivityDetailPartModel? = nil) {
+ super.init(nibName: nil, bundle: nil)
+ self.type = .activity
+ self.activityDetailPartModel = activityDetailPartModel
+ }
+
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@@ -42,6 +53,7 @@
super.viewDidLoad()
if type == .course{
title = "添加运动营成员"
+ view_profile.isHidden = false
if studentInfo != nil{
title = "编辑运动营成员"
tf_name.placeholder = "请输入运动营成员姓名"
@@ -60,14 +72,32 @@
studentModel.stuId = studentInfo!.stuId
}
}else{
+ view_profile.isHidden = true
title = "添加人员"
tf_name.placeholder = "请输入人员姓名"
tf_height.placeholder = "请输入人员身高"
tf_weight.placeholder = "请输入人员体重"
tf_phone.placeholder = "请输入人员联系方式"
tf_idCard.placeholder = "请输入人员身份证号"
+ if let m = activityDetailPartModel{
+ title = "编辑人员"
+ tf_name.text = m.name
+ tf_idCard.text = m.idcard
+ tf_height.text = String(format: "%.0lf", m.height)
+ tf_weight.text = String(format: "%.0lf", m.weight)
+ tf_phone.text = m.phone
+ tf_birthday.text = m.birthday
+ tf_gender.text = m.gender == .man ? "男":"女"
+ view_height.isHidden = true
+ view_weight.isHidden = true
+ view_phone.isHidden = true
+
+ tf_name.isEnabled = false
+ tf_birthday.isEnabled = false
+ tf_gender.isEnabled = false
+ }
}
-
+
let idCardView = IDCardView()
idCardView.box.bind { [weak self] text in
self?.tf_idCard.text = text
@@ -93,23 +123,26 @@
@IBAction func completeAction(_ sender: UIButton) {
- if studentInfo == nil{
+ if studentInfo == nil && type == .course{
guard profileImg != nil else {alertError(msg: "请上传运动营成员头像");return}
}
- guard !tf_name.text!.isEmpty else {alertError(msg: tf_name.placeholder!);return}
- guard !tf_birthday.text!.isEmpty else {alertError(msg: "请选择生日");return}
+ guard !tf_name.text!.isEmpty else {alertError(msg: tf_name.placeholder!);return}
+ guard !tf_birthday.text!.isEmpty else {alertError(msg: "请选择生日");return}
guard !tf_gender.text!.isEmpty else {alertError(msg: "请选择性别");return}
- guard !tf_height.text!.isEmpty else {alertError(msg: tf_height.placeholder!);return}
- guard !tf_weight.text!.isEmpty else {alertError(msg: tf_weight.placeholder!);return}
- guard tf_height.text != "0" else {alertError(msg: "请输入正确的身高");return}
- guard tf_weight.text != "0" else {alertError(msg: "请输入正确的体重");return}
+
+ if type == .course{
+ guard !tf_height.text!.isEmpty else {alertError(msg: tf_height.placeholder!);return}
+ guard !tf_weight.text!.isEmpty else {alertError(msg: tf_weight.placeholder!);return}
+ guard tf_height.text != "0" else {alertError(msg: "请输入正确的身高");return}
+ guard tf_weight.text != "0" else {alertError(msg: "请输入正确的体重");return}
+ }
if !tf_phone.isEmpty{
guard tf_phone.text!.jq_isPhone else {alertError(msg: "请输入正确的手机号");return}
}
- if !tf_idCard.isEmpty{
+ if !tf_idCard.isEmpty || activityDetailPartModel != nil{
guard tf_idCard.text!.jq_idCard() else {alertError(msg: "请输入正确的身份证号码");return}
}
@@ -150,11 +183,18 @@
}.disposed(by: disposeBag)
}
-
}else{
- Services.addParticipant(studentModel).subscribe(onNext: {[weak self] data in
- self?.addStudentSuccess(text: "添加成功")
- }).disposed(by: disposeBag)
+ if activityDetailPartModel != nil{
+ activityDetailPartModel!.idcard = tf_idCard.text!
+ Services.editParticipant(activityDetailPartModel!).subscribe(onNext: {[weak self] data in
+ self?.addStudentSuccess(text: "编辑成功")
+ }).disposed(by: disposeBag)
+
+ }else{
+ Services.addParticipant(studentModel).subscribe(onNext: {[weak self] data in
+ self?.addStudentSuccess(text: "添加成功")
+ }).disposed(by: disposeBag)
+ }
}
}
--
Gitblit v1.7.1