diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
index 66368cb..402eb11 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
@@ -22,29 +22,22 @@ class ChangePassWordViewController: UIViewController {
     @IBOutlet weak var agrenPasswordTextFiled: UITextField!
     @IBOutlet weak var userCodeTextFiled: UITextField!
     
-    @IBOutlet var cancleItem: UIBarButtonItem!
     var timer:Timer!
     var scrollViewH:CGFloat = 200
     var user = AppDelegate.instance().accountManager
     @IBAction func editKeyboard(_ sender: Any) {
         self.view.endEditing(true)
     }
-    
-    @IBAction func cancleAction(_ sender: UIBarButtonItem) {
-        self.dismiss(animated: true, completion: nil)
-    }
     override func viewDidLoad() {
         super.viewDidLoad()
         if user.isOnline() {
             self.title="密码修改"
-            self.navigationItem.rightBarButtonItem=nil
             phonrView.isHidden=true
             phoneViewHeight.constant=0
             scrollViewH=150
         }else{
             self.configTheme()
             self.title="忘记密码"
-            self.navigationItem.rightBarButtonItem=cancleItem
             phonrView.isHidden=false
             phoneViewHeight.constant=50
             scrollViewH=200
@@ -94,10 +87,8 @@ class ChangePassWordViewController: UIViewController {
                     httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
                         if !self.user.isOnline() {
                             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshLoginUser"), object: phone)
-                            self.dismiss(animated: true, completion: nil)
-                        }else{
-                            self.navigationController!.popViewController(animated: true)
                         }
+                        self.navigationController!.popViewController(animated: true)
                         AppDelegate.instance().window?.makeToast("修改成功")
                     }, failHandler: { (error) in
                         self.view.makeToast("修改失败")
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
index b1972d0..6d9b25c 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -523,16 +523,9 @@
                             <action selector="editKeyboard:" destination="HIn-e8-Pzh" eventType="touchUpInside" id="Gqe-4a-Nym"/>
                         </connections>
                     </view>
-                    <navigationItem key="navigationItem" title="忘记密码" id="kn3-BP-XrH">
-                        <barButtonItem key="rightBarButtonItem" title="取消" id="Qjp-nS-fi2">
-                            <connections>
-                                <action selector="cancleAction:" destination="HIn-e8-Pzh" id="TkS-G8-Iyw"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" title="忘记密码" id="kn3-BP-XrH"/>
                     <connections>
                         <outlet property="agrenPasswordTextFiled" destination="Qzh-5W-Fdl" id="NIs-ap-xHZ"/>
-                        <outlet property="cancleItem" destination="Qjp-nS-fi2" id="gIx-W1-0Kq"/>
                         <outlet property="contentSizeHeight" destination="lat-Tj-mho" id="3Ro-l4-uWu"/>
                         <outlet property="passwordTextFiled" destination="KOX-8X-bEC" id="Rd7-u2-mLM"/>
                         <outlet property="phoneViewHeight" destination="xsq-cP-2jd" id="yza-R9-2EJ"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
index 530716a..05bd796 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/Login.storyboard
@@ -730,13 +730,7 @@
                             <outletCollection property="gestureRecognizers" destination="ZEf-mm-u9e" appends="YES" id="Gmm-Kb-eQb"/>
                         </connections>
                     </view>
-                    <navigationItem key="navigationItem" title="注册" id="VWP-v7-Qoc">
-                        <barButtonItem key="rightBarButtonItem" title="取消" id="Okk-g0-Rwk">
-                            <connections>
-                                <action selector="cancleAction:" destination="tCx-JF-YJm" id="ypG-ks-rG6"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" title="注册" id="VWP-v7-Qoc"/>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="375" height="667"/>
                     <connections>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
index e9f5c0c..1480f50 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
@@ -95,7 +95,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
                 if error==nil {
                     if JSON.fromString(jsonString: str)!["status"].intValue == 1{
                         httpJsonResule(jsonString: str, error: error, successHandler: { (json) in
-                            self.navigationController!.dismiss(animated: true, completion: nil)
+                            self.navigationController!.popViewController(animated: true)
                             AppDelegate.instance().window?.makeToast("注册成功")
                             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "refreshLoginUser"), object: self.phoneNumber.text!)
                             //是否登录
@@ -116,10 +116,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
     
     
     @IBAction func loginBtnClickAction(_ sender: AnyObject) {
-        self.navigationController!.dismiss(animated: true, completion: nil)
-    }
-    @IBAction func cancleAction(_ sender: UIBarButtonItem) {
-        self.navigationController!.dismiss(animated: true, completion: nil)
+        self.navigationController!.popViewController(animated: true)
     }
 
     @IBAction func nickNameSetTapAction(_ sender: AnyObject) {
--
libgit2 0.21.0