南鑫林 5 år sedan
förälder
incheckning
1b7ee54252

+ 4 - 4
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -169,7 +169,6 @@
 		A72E685422F2D7580063D967 /* ATAuthSDKManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A72E685322F2D7580063D967 /* ATAuthSDKManager.swift */; };
 		A72E685622F2D80F0063D967 /* ATAuthSDKModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A72E685522F2D80F0063D967 /* ATAuthSDKModel.swift */; };
 		A72E685922F2DB110063D967 /* RegisterLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A72E685822F2DB110063D967 /* RegisterLoginManager.swift */; };
-		A72E685B22F2E2090063D967 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A72E685A22F2E2090063D967 /* ATAuthSDK.framework */; };
 		A738D202225AD6AD00EEE860 /* Extension+UICollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A738D201225AD6AD00EEE860 /* Extension+UICollectionView.swift */; };
 		A738D205225AF90D00EEE860 /* WeChatpayOrderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A738D204225AF90D00EEE860 /* WeChatpayOrderModel.swift */; };
 		A738D66F225D9BD900EEE860 /* UMLoginModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A738D66E225D9BD900EEE860 /* UMLoginModel.swift */; };
@@ -458,6 +457,7 @@
 		A7F3069422E16A5B00DC7917 /* MineRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */; };
 		A7F3069722E1AE9600DC7917 /* MessageModuleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F3069622E1AE9600DC7917 /* MessageModuleManager.swift */; };
 		A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */ = {isa = PBXBuildFile; fileRef = A7F3069822E1C72D00DC7917 /* json_Image_1.png */; };
+		A7F577BA22FD491D00E2D757 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */; };
 		A7FF1555228AC27600A85748 /* ProductAllCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */; };
 		A7FF1557228AC3E800A85748 /* ProductAllCommentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */; };
 		A7FF1560228C693D00A85748 /* OrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF155F228C693D00A85748 /* OrderViewController.swift */; };
@@ -883,7 +883,6 @@
 		A72E685322F2D7580063D967 /* ATAuthSDKManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ATAuthSDKManager.swift; sourceTree = "<group>"; };
 		A72E685522F2D80F0063D967 /* ATAuthSDKModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ATAuthSDKModel.swift; sourceTree = "<group>"; };
 		A72E685822F2DB110063D967 /* RegisterLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterLoginManager.swift; sourceTree = "<group>"; };
-		A72E685A22F2E2090063D967 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK.framework; sourceTree = "<group>"; };
 		A738D201225AD6AD00EEE860 /* Extension+UICollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Extension+UICollectionView.swift"; sourceTree = "<group>"; };
 		A738D204225AF90D00EEE860 /* WeChatpayOrderModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeChatpayOrderModel.swift; sourceTree = "<group>"; };
 		A738D66E225D9BD900EEE860 /* UMLoginModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UMLoginModel.swift; sourceTree = "<group>"; };
@@ -1186,6 +1185,7 @@
 		A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineRouterModuleType.swift; sourceTree = "<group>"; };
 		A7F3069622E1AE9600DC7917 /* MessageModuleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageModuleManager.swift; sourceTree = "<group>"; };
 		A7F3069822E1C72D00DC7917 /* json_Image_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = json_Image_1.png; sourceTree = "<group>"; };
+		A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK.framework; sourceTree = "<group>"; };
 		A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentView.swift; sourceTree = "<group>"; };
 		A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentViewController.swift; sourceTree = "<group>"; };
 		A7FF155F228C693D00A85748 /* OrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderViewController.swift; sourceTree = "<group>"; };
@@ -1494,7 +1494,7 @@
 				A72A72FE22321EE200B21995 /* QuartzCore.framework in Frameworks */,
 				A72A72FC22321ECE00B21995 /* CoreTelephony.framework in Frameworks */,
 				A72A72FA22321EBF00B21995 /* CoreText.framework in Frameworks */,
-				A72E685B22F2E2090063D967 /* ATAuthSDK.framework in Frameworks */,
+				A7F577BA22FD491D00E2D757 /* ATAuthSDK.framework in Frameworks */,
 				A72A72F822321EB600B21995 /* CoreGraphics.framework in Frameworks */,
 				A72A72F622321EA000B21995 /* UIKit.framework in Frameworks */,
 				A72A72F422321E9A00B21995 /* Foundation.framework in Frameworks */,
@@ -2845,7 +2845,7 @@
 		A763BE6F22F1B3D3000CE594 /* ATAuthSDK */ = {
 			isa = PBXGroup;
 			children = (
-				A72E685A22F2E2090063D967 /* ATAuthSDK.framework */,
+				A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */,
 				A763BE7822F1B6EB000CE594 /* ATAuthSDK.bundle */,
 				A763BE7622F1B6C7000CE594 /* TYRZResource.bundle */,
 			);

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift

@@ -201,6 +201,7 @@ class MobileLoginView: BaseView {
         bgImageView.image = kImage(name: "login_pic_bg")
         bgImageView.isUserInteractionEnabled = true
         bgImageView.contentMode = .scaleAspectFill
+        bgImageView.clipsToBounds = true
         return bgImageView
     }()
 

+ 2 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/View/PasswordLoginView.swift

@@ -171,6 +171,8 @@ class PasswordLoginView: BaseView {
         bgImageView.image = kImage(name: "login_pic_bg")
         bgImageView.isUserInteractionEnabled = true
         bgImageView.contentMode = .scaleAspectFill
+        bgImageView.clipsToBounds = true
+
         return bgImageView
     }()
 

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/ViewController/PasswordLoginViewController.swift

@@ -37,7 +37,7 @@ class PasswordLoginViewController: BaseViewController {
         
         // 登录
         passwordLoginView.loginBlock = {
-            (phoneNumber,password) in
+            [weak self] (phoneNumber,password) in
             SwiftMoyaNetWorkServiceUser.shared().userMobileLoginApi(mobile: phoneNumber, password: password, completion: {[weak self] (data) -> (Void) in
                 // 设置友盟别名
                 UMManager.shared.addAlias()