diff --git a/YouerLiveVideo/YouerLiveVideo.xcodeproj/xcuserdata/jun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/YouerLiveVideo/YouerLiveVideo.xcodeproj/xcuserdata/jun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index cf7047e..b0984b7 100644
--- a/YouerLiveVideo/YouerLiveVideo.xcodeproj/xcuserdata/jun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/YouerLiveVideo/YouerLiveVideo.xcodeproj/xcuserdata/jun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -9,13 +9,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift"
-            timestampString = "516765107.692769"
+            filePath = "YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift"
+            timestampString = "516767766.610948"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "127"
-            endingLineNumber = "127"
-            landmarkName = "registerBtnClickAction(_:)"
+            startingLineNumber = "85"
+            endingLineNumber = "85"
+            landmarkName = "registerBtnAction(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift
index de07e5c..c82e586 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/LoginViewController.swift
@@ -124,9 +124,8 @@ class LoginViewController: UIViewController,UITextFieldDelegate {
     }
     //点击注册按钮
     @IBAction func registerBtnClickAction(_ sender: AnyObject) {
-        let vc = UIStoryboard(name: "User", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerVC") as! RegisterViewController
-        vc.title = "注册"
-        self.navigationController?.pushViewController(vc, animated: true)
+        let vc = UIStoryboard(name: "User", bundle: nil).instantiateViewController(withIdentifier: "RegisterViewControllerNV")
+        self.present(vc, animated: true, completion: nil)
     }
     //键盘监听
     func keyboardWIllChange(noti: NSNotification){
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
index d9d2bc9..ffeac10 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/RegisterViewController.swift
@@ -24,7 +24,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
     var name: String=""
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
+        self.configTheme()
     }
 
     @IBAction func touchAction(_ sender: AnyObject) {
@@ -85,7 +85,7 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
         if inputVerificationCode.text!.characters.count == 4{
             SVProgressHUD.show(withStatus: "注册...")
             SVProgressHUD.setDefaultMaskType(.black)
-            let parameters:Dictionary<String,AnyObject>=["f_Account":phoneNumber.text! as AnyObject,"f_UserPassword":passwordTextField.text! as AnyObject,"f_RealName": (nikeNameTextFiled.text!=="" ? phoneNumber.text! : nikeNameTextFiled.text!) as AnyObject,"f_MobilePhone":phoneNumber.text! as AnyObject,"f_VerCode":inputVerificationCode.text! as AnyObject]
+            let parameters:Dictionary<String,AnyObject>=["account":phoneNumber.text! as AnyObject,"password":passwordTextField.text! as AnyObject,"vercode":inputVerificationCode.text! as AnyObject,"nickname": (nikeNameTextFiled.text!=="" ? phoneNumber.text! : nikeNameTextFiled.text!) as AnyObject]
             AppDelegate.instance().httpServer.getCreateUser(parameters: parameters) { (str, error) in
                 SVProgressHUD.dismiss()
                 self.nikeNameTextFiled.isUserInteractionEnabled=true
@@ -116,7 +116,10 @@ class RegisterViewController: UIViewController,UIAlertViewDelegate,UIImagePicker
     
     
     @IBAction func loginBtnClickAction(_ sender: AnyObject) {
-        self.navigationController!.popViewController(animated: false)
+        self.navigationController!.dismiss(animated: true, completion: nil)
+    }
+    @IBAction func cancleAction(_ sender: UIBarButtonItem) {
+        self.navigationController!.dismiss(animated: true, completion: nil)
     }
 
     @IBAction func nickNameSetTapAction(_ sender: AnyObject) {
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/User.storyboard
index 3d3dc0d..f5d12f5 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserCenter/User.storyboard
@@ -233,9 +233,9 @@
                     </connections>
                 </tapGestureRecognizer>
             </objects>
-            <point key="canvasLocation" x="-1468" y="1534.1829085457273"/>
+            <point key="canvasLocation" x="-528.79999999999995" y="1534.1829085457273"/>
         </scene>
-        <!--Register View Controller-->
+        <!--注册-->
         <scene sceneID="81Y-IJ-Kye">
             <objects>
                 <viewController storyboardIdentifier="RegisterViewControllerVC" id="tCx-JF-YJm" customClass="RegisterViewController" customModule="YouerLiveVideo" customModuleProvider="target" sceneMemberID="viewController">
@@ -248,7 +248,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="403-Gp-RaZ" customClass="UIControl">
-                                <rect key="frame" x="0.0" y="20" width="375" height="168"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="168"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8h8-sS-iJ1">
                                         <rect key="frame" x="138" y="15" width="99" height="99"/>
@@ -337,7 +337,7 @@
                                 </variation>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xNc-I3-UL6">
-                                <rect key="frame" x="0.0" y="20" width="375" height="168"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="168"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Cp-hz-9O4">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
@@ -365,6 +365,9 @@
                                                 <rect key="frame" x="89" y="18.5" width="278" height="19"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                 <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                                                <connections>
+                                                    <outlet property="delegate" destination="tCx-JF-YJm" id="kUP-Zt-NU9"/>
+                                                </connections>
                                             </textField>
                                         </subviews>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -487,7 +490,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSF-LZ-Bnl">
-                                <rect key="frame" x="0.0" y="188" width="375" height="112"/>
+                                <rect key="frame" x="0.0" y="232" width="375" height="112"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vkP-pb-ydp">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
@@ -609,7 +612,7 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R1Y-16-Th7">
-                                <rect key="frame" x="62.5" y="400" width="250" height="40"/>
+                                <rect key="frame" x="62.5" y="444" width="250" height="40"/>
                                 <color key="backgroundColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="40" id="Kvn-w3-Juc"/>
@@ -629,7 +632,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DJH-vy-tj1">
-                                <rect key="frame" x="325" y="315" width="35" height="30"/>
+                                <rect key="frame" x="325" y="359" width="35" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <state key="normal" title="登 录">
                                     <color key="titleColor" red="1" green="0.39607843139999999" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -661,6 +664,13 @@
                             <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>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="375" height="667"/>
                     <connections>
@@ -692,7 +702,25 @@
                     </connections>
                 </tapGestureRecognizer>
             </objects>
-            <point key="canvasLocation" x="-2161" y="1534"/>
+            <point key="canvasLocation" x="-1446" y="1533"/>
+        </scene>
+        <!--注册-->
+        <scene sceneID="fjB-PO-uzD">
+            <objects>
+                <navigationController storyboardIdentifier="RegisterViewControllerNV" title="注册" automaticallyAdjustsScrollViewInsets="NO" id="smK-XQ-zjA" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="rky-2y-rJV">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="tCx-JF-YJm" kind="relationship" relationship="rootViewController" id="74u-7e-5ID"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="7iS-XR-Acb" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-2162.4000000000001" y="1533.2833583208396"/>
         </scene>
     </scenes>
     <resources>
--
libgit2 0.21.0