             return
         }
         
-        let setPassword = {
+        let setPassword = {(sucessMsg: String, complete: CompleteBlock?) in
             //设置密码接口
             SVProgressHUD.showProgressMessage(ProgressMessage: "")
             let type = CurrentUserHelper.shared.userInfo.has_passwd_ == -1 ? 0 : 1
             let param = DrawCashPasswordModel()
             param.uid = CurrentUserHelper.shared.userInfo.uid
             param.new_passwd = password
-            param.old_passwd = password
+            param.old_passwd = self.oldPassword
             param.passwd_type = 1
             param.change_type = type
             
             AppAPIHelper.userAPI().drawcashPassword(param, complete: {[weak self] (result) in
                 CurrentUserHelper.shared.userInfo.has_passwd_ = 1
-                SVProgressHUD.showSuccessMessage(SuccessMessage: "密码设置成功", ForDuration: 1, completion: {
+                SVProgressHUD.showSuccessMessage(SuccessMessage: sucessMsg, ForDuration: 1, completion: nil)
+                if let completeBlock: CompleteBlock = complete{
+                    completeBlock("")
+                }else{
                     self?.navigationController?.popViewControllerAnimated(true)
-                })
+                }
             }, error: self.errorBlockFunc())
         }
         
         if CurrentUserHelper.shared.userInfo.has_passwd_ == -1 {
             //第一步->确认密码
             if oldPassword == nil {
-                titleLabel.text = "再次输入，确认支付密码"
+                titleLabel.text = "再次输入，确认提现密码"
                 oldPassword = password
                 clear = true
                 updatePasswordView("")

    func initUI() {
        title = CurrentUserHelper.shared.userInfo.has_passwd_ == -1 ? "设置提现密码" : "修改提现密码"
        //titleLabel
        titleLabel.text = CurrentUserHelper.shared.userInfo.has_passwd_ == -1 ? "设置提现密码" : "输入新的支付密码"
        //passwordView
        passwordView.layer.cornerRadius = 6
        passwordView.layer.masksToBounds = true

                titleLabel.text = "设置提现密码"
                return
            }
            setPassword("密码设置成功", nil)
            return
        }else{
            //第一步->验证旧密码
            if oldPassword == nil {
                AppAPIHelper.userAPI().checkDrawCashPassword(CurrentUserHelper.shared.uid, password: password, type: 1, complete: {[weak self] (result) in
                    SVProgressHUD.showSuccessMessage(SuccessMessage: "验证成功", ForDuration: 1, completion: nil)
                    self?.titleLabel.text = "重新设置提现密码"
                    self?.oldPassword = password
                    self?.clear = true
                    self?.updatePasswordView("")
                    return
                }, error: errorBlockFunc())
                return
            }
           
            //第二步->重置密码
            setPassword("重设密码成功", nil)
        }
        
    }
    

    //MARK: --Textfield
    func textFieldShouldReturn(textField: UITextField) -> Bool {
