From 2b133a75c3199d0e737ad2263f670c834d769ab1 Mon Sep 17 00:00:00 2001
From: r <r@gmail.com>
Date: 星期二, 09 九月 2025 11:36:24 +0800
Subject: [PATCH] 修改代码

---
 WanPai/Root/Other/View/CommonYearsPickerView.swift |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WanPai/Root/Other/View/CommonYearsPickerView.swift b/WanPai/Root/Other/View/CommonYearsPickerView.swift
index d28c924..75e1817 100644
--- a/WanPai/Root/Other/View/CommonYearsPickerView.swift
+++ b/WanPai/Root/Other/View/CommonYearsPickerView.swift
@@ -18,7 +18,7 @@
 				@IBOutlet weak var pickerView: UIPickerView!
 				
                 @IBOutlet weak var pickviewTwo: UIPickerView!
-    private var clickClouse:(((Int,String))->Void)!
+    private var clickClouse:(((Int,String,String))->Void)!
 				private var disposeBag = DisposeBag()
 				private var years = [Int]()
     var dataSoure : [String :[Any]] = [:]
@@ -69,7 +69,7 @@
                     print(dataSoure);
 				}
 
-				static func show(clickClouse:@escaping ((Int,String))->Void){
+				static func show(clickClouse:@escaping ((Int,String,String))->Void){
 								let studentChooseView = CommonYearsPickerView.jq_loadNibView()
 								studentChooseView.frame = sceneDelegate?.window?.frame ?? .zero
 								studentChooseView.clickClouse = clickClouse
@@ -110,16 +110,19 @@
 				@IBAction func completeAction(_ sender: UIButton) {
                     let index = pickerView.selectedRow(inComponent: 1)
                     var str = ""
+                    var name = ""
                     if selectIndex == 1 {
                         if let dict  = dataSoure[titleArr[selectIndex]]?[index] as? Dictionary<String, String>   {
                             str = "\(dict.values.first ?? "")"
+                            name = "\(dict.keys.first ?? "")"
                         }
                        
                     }else{
                         str =   "\(dataSoure[titleArr[selectIndex]]?[index] ?? "")"
+                        name = str;
                     }
                    
-                    clickClouse((selectIndex,str))
+                    clickClouse((selectIndex,str,name))
                     closeAction()
 				}
 }

--
Gitblit v1.7.1