Last login: Fri Dec 18 09:48:55 on ttys000
lidongxiaodeiMac:~ lidongxiao$ cd /Users/lidongxiao/Documents/集金/JiJinFinance lidongxiaodeiMac:JiJinFinance lidongxiao$ git status
On branch master
Your branch is ahead of 'origin/master' by 5 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/
    JiJinFinance/Classes/Others/AFN/

no changes added to commit (use "git add" and/or "git commit -a")
lidongxiaodeiMac:JiJinFinance lidongxiao$ ls
APP-icon.png            JiJinFinanceUITests
JiJinFinance            Podfile.lock
JiJinFinance.xcodeproj        Pods
JiJinFinance.xcworkspace    README.md
JiJinFinanceTests        podfile
lidongxiaodeiMac:JiJinFinance lidongxiao$ git add .
lidongxiaodeiMac:JiJinFinance lidongxiao$ git commit -m "..."
[master ef40979] ...
 26 files changed, 7671 insertions(+)
 rewrite JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate (70%)
 create mode 100644 JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/BankNO@2x.png
 create mode 100644 JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/Contents.json
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFN.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFN.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPRequestOperation.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPRequestOperation.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPRequestOperationManager.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPRequestOperationManager.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPSessionManager.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFHTTPSessionManager.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFNetWoringYu.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFNetWoringYu.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFNetworkReachabilityManager.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFNetworkReachabilityManager.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFNetworking.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFSecurityPolicy.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFSecurityPolicy.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLConnectionOperation.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLConnectionOperation.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLRequestSerialization.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLRequestSerialization.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLResponseSerialization.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLResponseSerialization.m
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLSessionManager.h
 create mode 100755 JiJinFinance/Classes/Others/AFN/AFNetworking/AFURLSessionManager.m
lidongxiaodeiMac:JiJinFinance lidongxiao$ git remote -v
origin    https://git.oschina.net/boc_web/JiJinFinance (fetch)
origin    https://git.oschina.net/boc_web/JiJinFinance (push)
lidongxiaodeiMac:JiJinFinance lidongxiao$ git push origin master
To https://git.oschina.net/boc_web/JiJinFinance
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://git.oschina.net/boc_web/JiJinFinance'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
lidongxiaodeiMac:JiJinFinance lidongxiao$ git fetch origin
remote: Counting objects: 137, done.
remote: Compressing objects: 100% (50/50), done.
remote: Total 105 (delta 68), reused 91 (delta 54)
Receiving objects: 100% (105/105), 130.75 KiB | 36.00 KiB/s, done.
Resolving deltas: 100% (68/68), completed with 14 local objects.
From https://git.oschina.net/boc_web/JiJinFinance
   5c55a12..e22dfb3  master     -> origin/master
lidongxiaodeiMac:JiJinFinance lidongxiao$ git diff origin/master
diff --git a/.DS_Store b/.DS_Store
index 38f45de..30b0cf4 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/JiJinFinance.xcodeproj/project.pbxproj b/JiJinFinance.xcodeproj/project.pbxproj
index 57f1589..838c6cd 100644
--- a/JiJinFinance.xcodeproj/project.pbxproj
+++ b/JiJinFinance.xcodeproj/project.pbxproj
@@ -99,9 +99,16 @@
                99A8A5D61C103A4600C04168 /* ChooseHBCellCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A8A5D51C103A4600C04168 /* ChooseHBCellCollectionViewCell.m */; };
                99A8A5DB1C1044C000C04168 /* PayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A8A5D91C1044C000C04168 /* PayViewController.m */; };
                99A8A5DC1C1044C000C04168 /* PayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 99A8A5DA1C1044C000C04168 /* PayViewController.xib */; };
+               99E4723D1C2252DF00402C3A /* BaseHttpTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E4723A1C2252DF00402C3A /* BaseHttpTool.m */; };
+               99E4723E1C2252DF00402C3A /* HttpTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E4723C1C2252DF00402C3A /* HttpTool.m */; };
+               99E472411C2260A100402C3A /* LogonModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E472401C2260A100402C3A /* LogonModel.m */; };
                99F3C3D41C118DB100C47E23 /* SureAgainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 99F3C3D31C118DB100C47E23 /* SureAgainViewController.m */; };
                99F3C3DF1C118FA200C47E23 /* SureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99F3C3DE1C118FA200C47E23 /* SureView.m */; };
                99F3C3E11C118FC000C47E23 /* SureView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 99F3C3E01C118FC000C47E23 /* SureView.xib */; };
+               99F84E841C1EAC5000FCCA44 /* MBProgressHUD+RY.m in Sources */ = {isa = PBXBuildFile; fileRef = 99F84E801C1EAC5000FCCA44 /* MBProgressHUD+RY.m */; };
+               99F84E851C1EAC5000FCCA44 /* MBProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 99F84E811C1EAC5000FCCA44 /* MBProgressHUD.bundle */; };
+               99F84E861C1EAC5000FCCA44 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 99F84E831C1EAC5000FCCA44 /* MBProgressHUD.m */; };
+               99F84FFD1C1EE56E00FCCA44 /* SubmitReady.xib in Resources */ = {isa = PBXBuildFile; fileRef = 99F84FFC1C1EE56E00FCCA44 /* SubmitReady.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -288,11 +295,23 @@
                99A8A5D81C1044C000C04168 /* PayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayViewController.h; sourceTree = "<group>"; };
                99A8A5D91C1044C000C04168 /* PayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayViewController.m; sourceTree = "<group>"; };
                99A8A5DA1C1044C000C04168 /* PayViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PayViewController.xib; sourceTree = "<group>"; };
+               99E472391C2252DF00402C3A /* BaseHttpTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseHttpTool.h; sourceTree = "<group>"; };
+               99E4723A1C2252DF00402C3A /* BaseHttpTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseHttpTool.m; sourceTree = "<group>"; };
+               99E4723B1C2252DF00402C3A /* HttpTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpTool.h; sourceTree = "<group>"; };
+               99E4723C1C2252DF00402C3A /* HttpTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpTool.m; sourceTree = "<group>"; };
+               99E4723F1C2260A100402C3A /* LogonModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogonModel.h; sourceTree = "<group>"; };
+               99E472401C2260A100402C3A /* LogonModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogonModel.m; sourceTree = "<group>"; };
                99F3C3D21C118DB100C47E23 /* SureAgainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SureAgainViewController.h; sourceTree = "<group>"; };
                99F3C3D31C118DB100C47E23 /* SureAgainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SureAgainViewController.m; sourceTree = "<group>"; };
                99F3C3DD1C118FA200C47E23 /* SureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SureView.h; sourceTree = "<group>"; };
                99F3C3DE1C118FA200C47E23 /* SureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SureView.m; sourceTree = "<group>"; };
                99F3C3E01C118FC000C47E23 /* SureView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SureView.xib; sourceTree = "<group>"; };
+               99F84E7F1C1EAC5000FCCA44 /* MBProgressHUD+RY.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MBProgressHUD+RY.h"; sourceTree = "<group>"; };
+               99F84E801C1EAC5000FCCA44 /* MBProgressHUD+RY.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MBProgressHUD+RY.m"; sourceTree = "<group>"; };
+               99F84E811C1EAC5000FCCA44 /* MBProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MBProgressHUD.bundle; sourceTree = "<group>"; };
+               99F84E821C1EAC5000FCCA44 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
+               99F84E831C1EAC5000FCCA44 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
+               99F84FFC1C1EE56E00FCCA44 /* SubmitReady.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SubmitReady.xib; sourceTree = "<group>"; };
                E4F327DCFFA2126B6B7551B6 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
                FC454794F0DDD8876095B7D5 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -712,6 +731,8 @@
                99A8A4FB1C0FD11900C04168 /* Model */ = {
                        isa = PBXGroup;
                        children = (
+                               99E4723F1C2260A100402C3A /* LogonModel.h */,
+                               99E472401C2260A100402C3A /* LogonModel.m */,
                        );
                        path = Model;
                        sourceTree = "<group>";
@@ -886,6 +907,8 @@
                99A8A5721C0FDA4400C04168 /* MyTools */ = {
                        isa = PBXGroup;
                        children = (
+                               99E472381C2252DF00402C3A /* Tool */,
+                               99F84E7E1C1EAC5000FCCA44 /* MBProgressHUD */,
                                99A8A5731C0FDA4400C04168 /* SDCycleScrollView */,
                        );
                        path = MyTools;
@@ -999,6 +1022,7 @@
                                99A8A5181C0FD11900C04168 /* SubmitViewController.h */,
                                99A8A5191C0FD11900C04168 /* SubmitViewController.m */,
                                99A8A5C81C1024DD00C04168 /* SubmitViewController.xib */,
+                               99F84FFC1C1EE56E00FCCA44 /* SubmitReady.xib */,
                                99A8A5CA1C10303A00C04168 /* SubmitYesViewController.h */,
                                99A8A5CB1C10303A00C04168 /* SubmitYesViewController.m */,
                                99A8A5CC1C10303A00C04168 /* SubmitYesViewController.xib */,
@@ -1043,6 +1067,17 @@
                        name = "支付成功";
                        sourceTree = "<group>";
                };
+               99E472381C2252DF00402C3A /* Tool */ = {
+                       isa = PBXGroup;
+                       children = (
+                               99E472391C2252DF00402C3A /* BaseHttpTool.h */,
+                               99E4723A1C2252DF00402C3A /* BaseHttpTool.m */,
+                               99E4723B1C2252DF00402C3A /* HttpTool.h */,
+                               99E4723C1C2252DF00402C3A /* HttpTool.m */,
+                       );
+                       path = Tool;
+                       sourceTree = "<group>";
+               };
                99F3C3C81C117CDE00C47E23 /* 确认投资信息 */ = {
                        isa = PBXGroup;
                        children = (
@@ -1053,6 +1088,18 @@
                        name = "确认投资信息";
                        sourceTree = "<group>";
                };
+               99F84E7E1C1EAC5000FCCA44 /* MBProgressHUD */ = {
+                       isa = PBXGroup;
+                       children = (
+                               99F84E7F1C1EAC5000FCCA44 /* MBProgressHUD+RY.h */,
+                               99F84E801C1EAC5000FCCA44 /* MBProgressHUD+RY.m */,
+                               99F84E811C1EAC5000FCCA44 /* MBProgressHUD.bundle */,
+                               99F84E821C1EAC5000FCCA44 /* MBProgressHUD.h */,
+                               99F84E831C1EAC5000FCCA44 /* MBProgressHUD.m */,
+                       );
+                       path = MBProgressHUD;
+                       sourceTree = "<group>";
+               };
                9EC6AAAE1DBFB0F55AFC5778 /* Pods */ = {
                        isa = PBXGroup;
                        children = (
@@ -1132,7 +1179,7 @@
                                TargetAttributes = {
                                        9937F61F1C0D6DAB00B38D83 = {
                                                CreatedOnToolsVersion = 7.1.1;
-                                               DevelopmentTeam = 6DYUEXYS7C;
+                                               DevelopmentTeam = E38MT82Y2X;
                                        };
                                        9937F6381C0D6DAB00B38D83 = {
                                                CreatedOnToolsVersion = 7.1.1;
@@ -1188,7 +1235,9 @@
                                99A8A5321C0FD11900C04168 /* FourBarViewController.xib in Resources */,
                                9922AFDC1C155FD100B988FF /* RecordViewController.xib in Resources */,
                                99A8A5C91C1024DD00C04168 /* SubmitViewController.xib in Resources */,
+                               99F84FFD1C1EE56E00FCCA44 /* SubmitReady.xib in Resources */,
                                991FD2411C1689A4002EA0CC /* CertifiedViewController.xib in Resources */,
+                               99F84E851C1EAC5000FCCA44 /* MBProgressHUD.bundle in Resources */,
                                99A8A5451C0FD11900C04168 /* SureTZViewController.xib in Resources */,
                                99A8A5CE1C10303A00C04168 /* SubmitYesViewController.xib in Resources */,
                                99F3C3E11C118FC000C47E23 /* SureView.xib in Resources */,
@@ -1269,6 +1318,7 @@
                                99A8A56E1C0FD2F900C04168 /* CustomCell.m in Sources */,
                                99A8A56A1C0FD2F900C04168 /* ImageItem.m in Sources */,
                                994B70C41C190A9000D8ED2C /* BankNOViewController.m in Sources */,
+                               99F84E841C1EAC5000FCCA44 /* MBProgressHUD+RY.m in Sources */,
                                994B71001C19691200D8ED2C /* RecordViewController.m in Sources */,
                                994B70D51C1923A100D8ED2C /* BankYESViewController.m in Sources */,
                                99A8A52F1C0FD11900C04168 /* FirstBarViewController.m in Sources */,
@@ -1282,6 +1332,7 @@
                                99A8A5CD1C10303A00C04168 /* SubmitYesViewController.m in Sources */,
                                994B70CC1C1911CB00D8ED2C /* BankNoView.m in Sources */,
                                99A8A5681C0FD2F900C04168 /* GroupModel.m in Sources */,
+                               99E4723E1C2252DF00402C3A /* HttpTool.m in Sources */,
                                992528911C1A59AE000E3DC5 /* LogonVe.m in Sources */,
                                99A8A56F1C0FD2F900C04168 /* GlobalTableCell.m in Sources */,
                                99A8A5871C0FDA4400C04168 /* TAAnimatedDotView.m in Sources */,
@@ -1295,6 +1346,7 @@
                                994B70EE1C195A4A00D8ED2C /* RechargeViewController.m in Sources */,
                                99A8A5861C0FDA4400C04168 /* TAAbstractDotView.m in Sources */,
                                99A8A53D1C0FD11900C04168 /* SecondBarViewController.m in Sources */,
+                               99F84E861C1EAC5000FCCA44 /* MBProgressHUD.m in Sources */,
                                99A8A5B01C0FDAEB00C04168 /* UIImage+ScaledSize.m in Sources */,
                                9922AFE71C1589CE00B988FF /* MessageViewController.m in Sources */,
                                991FD23F1C16890E002EA0CC /* CertifiedViewController.m in Sources */,
@@ -1315,6 +1367,7 @@
                                99A8A5881C0FDA4400C04168 /* TADotView.m in Sources */,
                                99A8A5471C0FD11900C04168 /* SecBarCollectionViewCell.m in Sources */,
                                994B70E11C194B5900D8ED2C /* PasswordViewController.m in Sources */,
+                               99E472411C2260A100402C3A /* LogonModel.m in Sources */,
                                99A8A5AD1C0FDAEB00C04168 /* UIButton+BackgroundColor.m in Sources */,
                                99A8A5481C0FD11900C04168 /* ThirdBarViewController.m in Sources */,
                                99A8A5B21C0FDAEB00C04168 /* UITextField+Placeholder.m in Sources */,
@@ -1330,6 +1383,7 @@
                                99A8A53E1C0FD11900C04168 /* SecToViewController.m in Sources */,
                                99A8A5B41C0FDAEB00C04168 /* UIView+Extension.m in Sources */,
                                994B70FA1C19673200D8ED2C /* DrawToRecordCollectionViewCell.m in Sources */,
+                               99E4723D1C2252DF00402C3A /* BaseHttpTool.m in Sources */,
                                99A8A58A1C0FDA4400C04168 /* SDCollectionViewCell.m in Sources */,
                                994B71081C1984BE00D8ED2C /* InformationTableViewCell.m in Sources */,
                                99A8A5691C0FD2F900C04168 /* ArrowItem.m in Sources */,
@@ -1468,15 +1522,43 @@
                        baseConfigurationReference = E4F327DCFFA2126B6B7551B6 /* Pods.debug.xcconfig */;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_IDENTITY = "iPhone Distribution: HangZhou BocWeb Technology Co., Ltd.";
+                               CODE_SIGN_IDENTITY = "iPhone Developer";
                                GCC_PREFIX_HEADER = "/Users/lidongxiao/Documents/集金/JiJinFinance/JiJinFinance/JJPrefixHeader.pch";
                                INFOPLIST_FILE = JiJinFinance/Info.plist;
                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "-l\"AFNetworking\"",
+                                       "-l\"DZNEmptyDataSet\"",
+                                       "-l\"IQKeyboardManager\"",
+                                       "-l\"MJExtension\"",
+                                       "-l\"MJRefresh\"",
+                                       "-l\"NJKWebViewProgress\"",
+                                       "-l\"RKNotificationHub\"",
+                                       "-l\"SDWebImage\"",
+                                       "-l\"SSKeychain\"",
+                                       "-framework",
+                                       "\"CoreGraphics\"",
+                                       "-framework",
+                                       "\"Foundation\"",
+                                       "-framework",
+                                       "\"ImageIO\"",
+                                       "-framework",
+                                       "\"MobileCoreServices\"",
+                                       "-framework",
+                                       "\"Security\"",
+                                       "-framework",
+                                       "\"SystemConfiguration\"",
+                                       "-framework",
+                                       "\"UIKit\"",
+                               );
                                PRODUCT_BUNDLE_IDENTIFIER = com.bocweb.jijin;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE = "a4cf89fe-48cf-4fd7-b01c-faeaef22f722";
                                TARGETED_DEVICE_FAMILY = 1;
+                               USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
                        };
                        name = Debug;
                };
@@ -1485,15 +1567,43 @@
                        baseConfigurationReference = 8550DF58CCC3216D28B75DBA /* Pods.release.xcconfig */;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_IDENTITY = "iPhone Distribution: HangZhou BocWeb Technology Co., Ltd.";
+                               CODE_SIGN_IDENTITY = "iPhone Developer";
                                GCC_PREFIX_HEADER = "/Users/lidongxiao/Documents/集金/JiJinFinance/JiJinFinance/JJPrefixHeader.pch";
                                INFOPLIST_FILE = JiJinFinance/Info.plist;
                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "-l\"AFNetworking\"",
+                                       "-l\"DZNEmptyDataSet\"",
+                                       "-l\"IQKeyboardManager\"",
+                                       "-l\"MJExtension\"",
+                                       "-l\"MJRefresh\"",
+                                       "-l\"NJKWebViewProgress\"",
+                                       "-l\"RKNotificationHub\"",
+                                       "-l\"SDWebImage\"",
+                                       "-l\"SSKeychain\"",
+                                       "-framework",
+                                       "\"CoreGraphics\"",
+                                       "-framework",
+                                       "\"Foundation\"",
+                                       "-framework",
+                                       "\"ImageIO\"",
+                                       "-framework",
+                                       "\"MobileCoreServices\"",
+                                       "-framework",
+                                       "\"Security\"",
+                                       "-framework",
+                                       "\"SystemConfiguration\"",
+                                       "-framework",
+                                       "\"UIKit\"",
+                               );
                                PRODUCT_BUNDLE_IDENTIFIER = com.bocweb.jijin;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE = "a4cf89fe-48cf-4fd7-b01c-faeaef22f722";
                                TARGETED_DEVICE_FAMILY = 1;
+                               USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
                        };
                        name = Release;
                };
diff --git a/JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate b/JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
index e0cf31f..2752847 100644
Binary files a/JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate and b/JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/JiJinFinance/AppDelegate.m b/JiJinFinance/AppDelegate.m
index 4acb823..e9664ea 100644
--- a/JiJinFinance/AppDelegate.m
+++ b/JiJinFinance/AppDelegate.m
@@ -14,6 +14,7 @@
 
 #import "MainTabViewController.h"
 #import "MainNavigationController.h"
+#import "LoginViewController.h"
 @interface AppDelegate ()
 
 @end
@@ -31,9 +32,22 @@
     [self.window setBackgroundColor:[UIColor whiteColor]];
    
     
-    MainTabViewController * main = [[MainTabViewController alloc]init];
+  
+    
+//    if (kUserLogin) {
+        MainTabViewController * main = [[MainTabViewController alloc]init];
+        
+        self.window.rootViewController = main;
+//    }
+//    else
+//    {
+//        LoginViewController * loginVC = [[LoginViewController alloc]init];
+//        loginVC.entranceType = LoginEntranceTypeRoot;
+//        MainNavigationController * nav = [[MainNavigationController alloc]initWithRootViewController:loginVC];
+//        self.window.rootViewController = nav;
+//    }
+    
     
-    self.window.rootViewController = main;
     
     //    MainNavigationController * nav = [[MainNavigationController alloc]init];
     //
diff --git a/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/BankNO@2x.png b/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/BankNO@2x.png
new file mode 100644
index 0000000..9947d83
Binary files /dev/null and b/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/BankNO@2x.png differ
diff --git a/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/Contents.json b/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/Contents.json
new file mode 100644
index 0000000..aeb6439
--- /dev/null
+++ b/JiJinFinance/Assets.xcassets/Fourth/BankNO.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "BankNO@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/JiJinFinance/Base.lproj/LaunchScreen.storyboard b/JiJinFinance/Base.lproj/LaunchScreen.storyboard
index 2e721e1..d29debf 100644
--- a/JiJinFinance/Base.lproj/LaunchScreen.storyboard
+++ b/JiJinFinance/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15A2301" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
diff --git a/JiJinFinance/Classes/.DS_Store b/JiJinFinance/Classes/.DS_Store
index 78f69ae..3e3b85a 100644
Binary files a/JiJinFinance/Classes/.DS_Store and b/JiJinFinance/Classes/.DS_Store differ
diff --git a/JiJinFinance/Classes/FirstBar/Controller/FirstBarViewController.m b/JiJinFinance/Classes/FirstBar/Controller/FirstBarViewController.m
index 3a5a1c6..3167838 100644
--- a/JiJinFinance/Classes/FirstBar/Controller/FirstBarViewController.m
+++ b/JiJinFinance/Classes/FirstBar/Controller/FirstBarViewController.m
@@ -106,8 +106,9 @@
 }
 - (IBAction)LJTZClcik {
     
-    LoginViewController * login = [[LoginViewController alloc]init];
-    [self.navigationController pushViewController:login animated:YES];
+    SecToViewController * secTo = [[SecToViewController alloc]init];
+    
+    [self.navigationController pushViewController:secTo animated:YES];
     
 }
 
diff --git a/JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m b/JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
index 1b6c112..c51531b 100644
--- a/JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
+++ b/JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
@@ -25,7 +25,7 @@
     // Dispose of any resources that can be recreated.
 }
 - (IBAction)ForgetCodeClick {
-    NSLog(@"忘记密码");
+    NSLog(@"获取验证码");
 }
 - (IBAction)SubmitClick {
     NSLog(@"提交");
diff --git a/JiJinFinance/Classes/Login/Controller/LoginViewController.h b/JiJinFinance/Classes/Login/Controller/LoginViewController.h
index 38906e3..ca85724 100644
--- a/JiJinFinance/Classes/Login/Controller/LoginViewController.h
+++ b/JiJinFinance/Classes/Login/Controller/LoginViewController.h
@@ -8,6 +8,13 @@
 
 #import <UIKit/UIKit.h>
 
+typedef NS_ENUM(NSInteger, LoginEntranceType) {
+    LoginEntranceTypeRoot = 0,
+    LoginEntranceTypePresent
+};
+
 @interface LoginViewController : UIViewController
 
+@property (nonatomic, assign) LoginEntranceType entranceType;
+
 @end
diff --git a/JiJinFinance/Classes/Login/Controller/LoginViewController.m b/JiJinFinance/Classes/Login/Controller/LoginViewController.m
index 2065aa0..2ecb5f0 100644
--- a/JiJinFinance/Classes/Login/Controller/LoginViewController.m
+++ b/JiJinFinance/Classes/Login/Controller/LoginViewController.m
@@ -7,9 +7,13 @@
 //
 
 #import "LoginViewController.h"
-#import "SecToViewController.h"
+#import "SureTZViewController.h"
 #import "LogonViewController.h"
 #import "ForgetCodeViewController.h"
+
+#import "MBProgressHUD.h"
+#import "MBProgressHUD+RY.h"
+#import "MainTabViewController.h"
 @interface LoginViewController ()
 @property (strong, nonatomic) IBOutlet UIButton *LoginButton;
 
@@ -26,6 +30,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
     [self setTitle:@"用户登录"];
+    self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
     
     [_LoginButton.layer setCornerRadius:3];
     
@@ -37,10 +42,15 @@
 - (IBAction)LoginClick {
     
     NSLog(@"登录");
-    SecToViewController * secTo = [[SecToViewController alloc]init];
+    SureTZViewController * secTo = [[SureTZViewController alloc]init];
     
     [self.navigationController pushViewController:secTo animated:YES];
     
+    [MBProgressHUD showMessage:@"登录中。。。。。"];
+    
+    
+    [MBProgressHUD hideHUD];
+    
 }
 #pragma 注册+取消按钮
 -(void)registerAndremove
@@ -67,8 +77,14 @@
 }
 -(void)LeftClick
 {
-    [self.navigationController popToRootViewControllerAnimated:YES];
+    //返回主页面
+    //[self.navigationController popToRootViewControllerAnimated:YES];
+    
+    //返回上一个页面
+    [self.navigationController popViewControllerAnimated:YES];
+    
 }
+
 -(void)RightClick
 {
     NSLog(@"注册");
diff --git a/JiJinFinance/Classes/Login/Controller/LogonViewController.m b/JiJinFinance/Classes/Login/Controller/LogonViewController.m
index 80c6fd2..68d7af9 100644
--- a/JiJinFinance/Classes/Login/Controller/LogonViewController.m
+++ b/JiJinFinance/Classes/Login/Controller/LogonViewController.m
@@ -8,8 +8,19 @@
 
 #import "LogonViewController.h"
 #import "LogonVe.h"
-@interface LogonViewController ()
+#import "HttpTool.h"
+#import "LogonModel.h"
+//#import "TSMessageView.h"
 
+#import <tsmessages/TSMessageView.h>
+
+@interface LogonViewController ()<MyDelegate>
+{
+    NSInteger _timerNo;
+    NSTimer * _timer;
+}
+@property (nonatomic ,strong)NSMutableArray * dataArray;
+@property (nonatomic ,strong)LogonVe * lgView;
 @end
 
 @implementation LogonViewController
@@ -18,13 +29,22 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = @"注册";
+    self.dataArray = [[NSMutableArray alloc]init];
+    
+    _timerNo = 60;
+    
     NSArray * arr = [[NSBundle mainBundle]loadNibNamed:@"LogonVe" owner:self options:nil];
-    LogonVe * lgView = arr.lastObject;
+    self.lgView = arr.lastObject;
+    
+    self.lgView.delegate = self;
+    
     
 //    lgView.RedYes.adjustsFontSizeToFitWidth = YES;
 //    lgView.Member.titleLabel.adjustsFontSizeToFitWidth =  YES;
     
-    [lgView setFrame:CGRectMake(0, 0, kUIScreenWidth, lgView.frame.size.height)];
+    [self.lgView.ButAuthCode setTitle:@"(60)重新验证" forState:UIControlStateDisabled];
+    
+    [self.lgView setFrame:CGRectMake(0, 0, kUIScreenWidth, self.lgView.frame.size.height)];
     
     UIScrollView * scr = [[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, kUIScreenWidth, kUIScreenHeight)];
     
@@ -32,10 +52,95 @@
     
     self.view = scr;
     
-    [scr addSubview:lgView];
+    [scr addSubview:self.lgView];
+    
+}
+
+
+#pragma mark-注册按钮的点击方法
+-(void)registerDelegateClick
+{
+    NSLog(@"注册");
+}
+#pragma mark-判断点击注册时各项数据是否一致
+-(void)registerJudgement
+{
+    if (self.lgView.FiledCode != self.lgView.FiledCode) {
+        [TSMessage showNotificationInViewController:self title:@"温馨提示" subtitle:@"请确认您再次输入的密码" type:TSMessageNotificationTypeWarning duration:2];
+    }
+    
     
+}
+#pragma mark-验证码的点击方法
+-(void)gainCodeDelegateClick
+{
+    //验证码测试
+    [self testAuthCode];
+    NSLog(@"验证码");
+}
+
+
+#pragma mark-验证码测试
+-(void)testAuthCode
+{
+    //如果textfiled里没有内容将无法请求数据会有添加textfiled的提示
+    if ([self.lgView.FiledResigter.text isEqualToString:@""]) {
+        [TSMessage showNotificationInViewController:self title:@"温馨提示" subtitle:@"请输入您的手机号" type:TSMessageNotificationTypeError duration:2.0];
+    }
+    //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+    else
+    {
+    NSString *netPath = @"/regist/regPhoneCode";
+//    NSDictionary *params = [NSDictionary dictionaryWithObject: self.lgView.FiledResigter forKey:@"phone"];
+    NSDictionary *params = [NSDictionary dictionaryWithObject: self.lgView.FiledResigter.text forKey:@"phone"];
+    NSLog(@"<><><><><><>%@",self.lgView.FiledResigter.text);
+
+    [HttpTool postWithPath:netPath params:params success:^(id responseObj) {
+        //验证已发送
+        //        NSString * returnInfo = [responseObj objectForKey:@"returnInfo"];
+        NSDictionary * content = [responseObj objectForKey:@"content"];
+   
+        //第一次点击验证码的时候返回的内容
+        NSString * returnNo = [responseObj objectForKey:@"returnNo"];
+       
+        NSString * returnInfo = [responseObj objectForKey:@"returnInfo"];
+        NSLog(@"%@",returnInfo);
+        NSLog(@"%@",returnNo);
+        if ([returnNo isEqualToString:@"0000"]) {
+            NSString * auth_code = [content objectForKey:@"auth_code"];
+            NSLog(@"验证码%@",auth_code);
+            _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(timerAction:) userInfo:_timer repeats:YES];
+        }else
lidongxiaodeiMac:JiJinFinance lidongxiao$ git merge -h
usage: git merge [<options>] [<commit>...]
   or: git merge [<options>] <msg> HEAD <commit>
   or: git merge --abort

    -n                    do not show a diffstat at the end of the merge
    --stat                show a diffstat at the end of the merge
    --summary             (synonym to --stat)
    --log[=<n>]           add (at most <n>) entries from shortlog to merge commit message
    --squash              create a single commit instead of doing a merge
    --commit              perform a commit if the merge succeeds (default)
    -e, --edit            edit message before committing
    --ff                  allow fast-forward (default)
    --ff-only             abort if fast-forward is not possible
    --rerere-autoupdate   update the index with reused conflict resolution if possible
    --verify-signatures   Verify that the named commit has a valid GPG signature
    -s, --strategy <strategy>
                          merge strategy to use
    -X, --strategy-option <option=value>
                          option for selected merge strategy
    -m, --message <message>
                          merge commit message (for a non-fast-forward merge)
    -v, --verbose         be more verbose
    -q, --quiet           be more quiet
    --abort               abort the current in-progress merge
    --progress            force progress reporting
    -S, --gpg-sign[=<key-id>]
                          GPG sign commit
    --overwrite-ignore    update ignored files (default)

lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout -b dev
Switched to a new branch 'dev'
lidongxiaodeiMac:JiJinFinance lidongxiao$ git merge --no-ff origin/master
warning: Cannot merge binary files: JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. origin/master)
warning: Cannot merge binary files: .DS_Store (HEAD vs. origin/master)
Auto-merging JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib
CONFLICT (content): Merge conflict in JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib
Auto-merging JiJinFinance/Classes/Login/View/LogonVe.xib
CONFLICT (add/add): Merge conflict in JiJinFinance/Classes/Login/View/LogonVe.xib
Auto-merging JiJinFinance/Classes/Login/View/LogonVe.m
CONFLICT (add/add): Merge conflict in JiJinFinance/Classes/Login/View/LogonVe.m
Auto-merging JiJinFinance/Classes/Login/View/LogonVe.h
CONFLICT (add/add): Merge conflict in JiJinFinance/Classes/Login/View/LogonVe.h
Auto-merging JiJinFinance/Classes/Login/Controller/LogonViewController.m
CONFLICT (add/add): Merge conflict in JiJinFinance/Classes/Login/Controller/LogonViewController.m
Auto-merging JiJinFinance/Classes/Login/Controller/LoginViewController.m
CONFLICT (content): Merge conflict in JiJinFinance/Classes/Login/Controller/LoginViewController.m
Auto-merging JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
CONFLICT (add/add): Merge conflict in JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
Auto-merging JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
Auto-merging JiJinFinance.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in JiJinFinance.xcodeproj/project.pbxproj
Auto-merging .DS_Store
CONFLICT (content): Merge conflict in .DS_Store
Automatic merge failed; fix conflicts and then commit the result.
lidongxiaodeiMac:JiJinFinance lidongxiao$ git status
On branch dev
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   .DS_Store
    both modified:   JiJinFinance.xcodeproj/project.pbxproj
    both modified:   JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
    both added:      JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
    both modified:   JiJinFinance/Classes/Login/Controller/LoginViewController.m
    both added:      JiJinFinance/Classes/Login/Controller/LogonViewController.m
    both added:      JiJinFinance/Classes/Login/View/LogonVe.h
    both added:      JiJinFinance/Classes/Login/View/LogonVe.m
    both added:      JiJinFinance/Classes/Login/View/LogonVe.xib
    both modified:   JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib

no changes added to commit (use "git add" and/or "git commit -a")
lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout master
.DS_Store: needs merge
JiJinFinance.xcodeproj/project.pbxproj: needs merge
JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate: needs merge
JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m: needs merge
JiJinFinance/Classes/Login/Controller/LoginViewController.m: needs merge
JiJinFinance/Classes/Login/Controller/LogonViewController.m: needs merge
JiJinFinance/Classes/Login/View/LogonVe.h: needs merge
JiJinFinance/Classes/Login/View/LogonVe.m: needs merge
JiJinFinance/Classes/Login/View/LogonVe.xib: needs merge
JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib: needs merge
error: you need to resolve your current index first
lidongxiaodeiMac:JiJinFinance lidongxiao$ git status
On branch dev
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   .DS_Store
    both modified:   JiJinFinance.xcodeproj/project.pbxproj
    both modified:   JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
    both added:      JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m
    both modified:   JiJinFinance/Classes/Login/Controller/LoginViewController.m
    both added:      JiJinFinance/Classes/Login/Controller/LogonViewController.m
    both added:      JiJinFinance/Classes/Login/View/LogonVe.h
    both added:      JiJinFinance/Classes/Login/View/LogonVe.m
    both added:      JiJinFinance/Classes/Login/View/LogonVe.xib
    both modified:   JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib

no changes added to commit (use "git add" and/or "git commit -a")
lidongxiaodeiMac:JiJinFinance lidongxiao$ git branch
* dev
  master
lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout master
.DS_Store: needs merge
JiJinFinance.xcodeproj/project.pbxproj: needs merge
JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate: needs merge
JiJinFinance/Classes/Login/Controller/ForgetCodeViewController.m: needs merge
JiJinFinance/Classes/Login/Controller/LoginViewController.m: needs merge
JiJinFinance/Classes/Login/Controller/LogonViewController.m: needs merge
JiJinFinance/Classes/Login/View/LogonVe.h: needs merge
JiJinFinance/Classes/Login/View/LogonVe.m: needs merge
JiJinFinance/Classes/Login/View/LogonVe.xib: needs merge
JiJinFinance/Classes/SecondBar/Controller/SureTZ/SubmitViewController.xib: needs merge
error: you need to resolve your current index first
lidongxiaodeiMac:JiJinFinance lidongxiao$ git reflog
ef40979 HEAD@{0}: checkout: moving from master to dev
ef40979 HEAD@{1}: commit: ...
4518489 HEAD@{2}: commit: 注册接口已对接
bcc6795 HEAD@{3}: commit: 完成注册
dc5c1c6 HEAD@{4}: commit: 完成注册接口
bf3aed3 HEAD@{5}: commit: 完成注册接口
e993361 HEAD@{6}: commit: 完成了注册接口。
5c55a12 HEAD@{7}: pull -u origin master: Merge made by the 'recursive' strategy.
263851a HEAD@{8}: commit: ++++
1c7ce40 HEAD@{9}: commit (initial): 我要理财TabBar页面搭建完成。
lidongxiaodeiMac:JiJinFinance lidongxiao$ git reset --hard ef40979
HEAD is now at ef40979 ...
lidongxiaodeiMac:JiJinFinance lidongxiao$ git push --mirror origin master
error: --mirror can't be combined with refspecs
usage: git push [<options>] [<repository> [<refspec>...]]

    -v, --verbose         be more verbose
    -q, --quiet           be more quiet
    --repo <repository>   repository
    --all                 push all refs
    --mirror              mirror all refs
    --delete              delete refs
    --tags                push tags (can't be used with --all or --mirror)
    -n, --dry-run         dry run
    --porcelain           machine-readable output
    -f, --force           force updates
    --force-with-lease[=<refname>:<expect>]
                          require old value of ref to be at this value
    --recurse-submodules[=<check|on-demand>]
                          control recursive pushing of submodules
    --thin                use thin pack
    --receive-pack <receive-pack>
                          receive pack program
    --exec <receive-pack>
                          receive pack program
    -u, --set-upstream    set upstream for git pull/status
    --progress            force progress reporting
    --prune               prune locally removed refs
    --no-verify           bypass pre-push hook
    --follow-tags         push missing but relevant tags
    --signed              GPG sign the push
    --atomic              request atomic transaction on remote side

lidongxiaodeiMac:JiJinFinance lidongxiao$ git push --mirror origin
Counting objects: 239, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (181/181), done.
Writing objects: 100% (239/239), 652.42 KiB | 0 bytes/s, done.
Total 239 (delta 125), reused 67 (delta 50)
To https://git.oschina.net/boc_web/JiJinFinance
 + e22dfb3...ef40979 master -> master (forced update)
 * [new branch]      dev -> dev
 * [new branch]      origin/master -> origin/master
lidongxiaodeiMac:JiJinFinance lidongxiao$ git branch -d dev
error: Cannot delete the branch 'dev' which you are currently on.
lidongxiaodeiMac:JiJinFinance lidongxiao$ git branch
* dev
  master
lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout master
M    .DS_Store
M    JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
lidongxiaodeiMac:JiJinFinance lidongxiao$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   .DS_Store
    modified:   JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate

no changes added to commit (use "git add" and/or "git commit -a")
lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout dev
M    .DS_Store
M    JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
Switched to branch 'dev'
lidongxiaodeiMac:JiJinFinance lidongxiao$ git status
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   .DS_Store
    modified:   JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate

no changes added to commit (use "git add" and/or "git commit -a")
lidongxiaodeiMac:JiJinFinance lidongxiao$ git checkout master
M    .DS_Store
M    JiJinFinance.xcworkspace/xcuserdata/lidongxiao.xcuserdatad/UserInterfaceState.xcuserstate
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
lidongxiaodeiMac:JiJinFinance lidongxiao$ git branch -d dev
Deleted branch dev (was ef40979).
lidongxiaodeiMac:JiJinFinance lidongxiao$ git push origin :dev
To https://git.oschina.net/boc_web/JiJinFinance
 - [deleted]         dev
lidongxiaodeiMac:JiJinFinance lidongxiao$