登录页面调试完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -152,6 +152,7 @@
 		A7CC74DE22703B4A003C4F38 /* MineModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7CC74DD22703B4A003C4F38 /* MineModule.xcassets */; };
 		A7CC74E0227042A4003C4F38 /* MineServiceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC74DF227042A4003C4F38 /* MineServiceTableViewCell.swift */; };
 		A7CC74E222704429003C4F38 /* MineServiceCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC74E122704429003C4F38 /* MineServiceCollectionViewCell.swift */; };
+		A7CC74E62270628B003C4F38 /* DeliveryMethodTypeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC74E52270628B003C4F38 /* DeliveryMethodTypeModel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -332,6 +333,7 @@
 		A7CC74DD22703B4A003C4F38 /* MineModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MineModule.xcassets; sourceTree = "<group>"; };
 		A7CC74DF227042A4003C4F38 /* MineServiceTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineServiceTableViewCell.swift; sourceTree = "<group>"; };
 		A7CC74E122704429003C4F38 /* MineServiceCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineServiceCollectionViewCell.swift; sourceTree = "<group>"; };
+		A7CC74E52270628B003C4F38 /* DeliveryMethodTypeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeliveryMethodTypeModel.swift; sourceTree = "<group>"; };
 		A7E03A30F40582782EC5DA89 /* Pods_RainbowPlanetTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RainbowPlanetTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BD9052C044FD3AE4E62D3929 /* Pods-RainbowPlanet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RainbowPlanet.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RainbowPlanet/Pods-RainbowPlanet.debug.xcconfig"; sourceTree = "<group>"; };
 		D469F6C3768252BCB7001EDD /* Pods_RainbowPlanet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RainbowPlanet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -491,6 +493,7 @@
 			isa = PBXGroup;
 			children = (
 				A7284403224DBFBD00F82F30 /* LoginModel.swift */,
+				A7CC74E52270628B003C4F38 /* DeliveryMethodTypeModel.swift */,
 			);
 			path = UserModel;
 			sourceTree = "<group>";
@@ -1337,9 +1340,9 @@
 		A7CC74D2226FF190003C4F38 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				A7CC74D5226FF421003C4F38 /* MineNavigationBarView.swift */,
 				A7CC74D3226FF1AA003C4F38 /* MineView.swift */,
 				A7CC74D722700359003C4F38 /* MineTableViewHeaderView.swift */,
-				A7CC74D5226FF421003C4F38 /* MineNavigationBarView.swift */,
 				A7CC74D922702E41003C4F38 /* MineOrderTableViewCell.swift */,
 				A7CC74DB2270352F003C4F38 /* MineOrderCollectionViewCell.swift */,
 				A7CC74DF227042A4003C4F38 /* MineServiceTableViewCell.swift */,
@@ -1669,6 +1672,7 @@
 				A729B5B022671310004AE098 /* MobileLoginView.swift in Sources */,
 				A72A726822321DBD00B21995 /* UMManager.swift in Sources */,
 				A729B5AD2266FF45004AE098 /* BindPhoneNumberView.swift in Sources */,
+				A7CC74E62270628B003C4F38 /* DeliveryMethodTypeModel.swift in Sources */,
 				A7CC74DA22702E41003C4F38 /* MineOrderTableViewCell.swift in Sources */,
 				A77F2CB92232010F001BD3F6 /* ShoppingCartViewController.swift in Sources */,
 				A72A72B822321DE000B21995 /* Extension+UserDefaults.swift in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -16,8 +16,7 @@ extension AppDelegate {
         window?.backgroundColor = UIColor.white
         window?.makeKeyAndVisible()
 
-
-        if (LoginModel.shared().getLoginModel()?.token) != nil  {
+        if (LoginModel.shared().getLoginModel()?.token) != nil && (DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType) != nil {
             /// 设置Tabbar
            setTabbarController()
         } else {
@@ -34,7 +33,7 @@ extension AppDelegate {
         /// 引导页
         setGuidePageView()
 
-        if (LoginModel.shared().getLoginModel()?.token) != nil  {
+        if (LoginModel.shared().getLoginModel()?.token) != nil && (DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType) != nil  {
             /// 刷新token
             SwiftMoyaNetWorkServiceUser.shared().userRefreshApi {_ in }
         }

RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/Location/ViewController/LocationViewController.swift

@@ -44,8 +44,9 @@ class LocationViewController: BaseViewController {
         let locationView = LocationView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight))
         locationView.isHidden = true
         locationView.expressViewBlock = { [weak self] in//快递
-            UserDefaults.standard.set(0, forKey: "DeliveryMethodType")
-
+            let model = DeliveryMethodTypeModel.shared().getModel()
+            model!.deliveryMethodType = "1"
+            DeliveryMethodTypeModel.shared().setModel(model: model!)
                 if self?.presentingViewController != nil {
                     self?.dismiss(animated: false, completion: {
                         kAppDelegate.setTabbarController()

RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/ViewController/SelfRecommendationViewController.swift

@@ -42,13 +42,16 @@ class SelfRecommendationViewController: BaseViewController {
         let selfRecommendationView = SelfRecommendationView()
         selfRecommendationView.goShoppingBlock = {
             [weak self] in
-            UserDefaults.standard.set(0, forKey: "DeliveryMethodType")
-
+            let model = DeliveryMethodTypeModel.shared().getModel()
+            model?.deliveryMethodType = "1"
+            DeliveryMethodTypeModel.shared().setModel(model: model!)
             self?.tabbarController()
         }
         selfRecommendationView.didSelectGoShoppingBlock = {
             [weak self] in
-            UserDefaults.standard.set(1, forKey: "DeliveryMethodType")
+            let model = DeliveryMethodTypeModel.shared().getModel()
+            model?.deliveryMethodType = "2"
+            DeliveryMethodTypeModel.shared().setModel(model: model!)
             self?.tabbarController()
         }
         selfRecommendationView.changeLocationBlock = {

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/BindPhoneNumber/ViewController/BindPhoneNumberViewController.swift

@@ -42,7 +42,7 @@ class BindPhoneNumberViewController: BaseViewController {
         let bindPhoneNumberView = BindPhoneNumberView()
         bindPhoneNumberView.sendSmSBlock = {
             (sendSmsButton,phoneNumber) in
-            SwiftMoyaNetWorkServiceSMS.shared().smsSendSMSApi(mobile: phoneNumber, appNameType: AppNameType.app, sendType: SendType.ali, smsType: SMSType.account_login, completion: {_ in
+            SwiftMoyaNetWorkServiceSMS.shared().smsSendSMSApi(mobile: phoneNumber, appNameType: AppNameType.app, sendType: SendType.ali, smsType: SMSType.account_bind, completion: {_ in
                 sendSmsButton.countdown = true
             })
         }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -38,13 +38,7 @@ class RegisterLoginViewController: BaseViewController {
                 SwiftMoyaNetWorkServiceUser.shared().userWeiXinRegisterApi(open_id: wxLoginModel.open_id, union_id: wxLoginModel.union_id, avatar: wxLoginModel.avatar, username: wxLoginModel.username, gender: wxLoginModel.gender, completion: { (loginModel) -> (Void) in
                     let loginModel =  loginModel as! LoginModel
                     if (loginModel.mobile != nil && loginModel.mobile != "" ) {
-//                        if self?.presentingViewController != nil {
-//                            self?.dismiss(animated: true, completion: {
-//                                kAppDelegate.setTabbarController()
-//                            })
-//                        } else {
-//                            kAppDelegate.setTabbarController()
-//                        }
+                        self?.navigationController?.pushViewController(LocationViewController(), animated: true)
 
                     }else {
                         let vc = BindPhoneNumberViewController()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallNavigationBarView.swift

@@ -14,10 +14,8 @@ class ShoppingMallNavigationBarView: BaseView {
     
     typealias SearchBlock = () -> Void
     var searchBlock : SearchBlock?
-    var deliveryMethodType : Int!
     
     override func setupViews() {
-        deliveryMethodType = UserDefaults.standard.integer(forKey: "DeliveryMethodType")
         addSubview(addressImageView)
         addSubview(addressLabel)
         addSubview(searchButton)
@@ -39,26 +37,27 @@ class ShoppingMallNavigationBarView: BaseView {
             make.left.equalTo(addressImageView.snp.right).offset(kScaleValue(value: 6))
         }
         
+        categoryButton.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-14)
+            make.size.equalTo(22)
+        }
+        
         searchButton.snp.remakeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.height.equalTo(30)
-            if deliveryMethodType == 0 { //快递
-                 make.left.equalTo(addressLabel.snp.right).offset(9)
+            make.right.equalTo(categoryButton.snp.left).offset(-9)
+            let model = DeliveryMethodTypeModel.shared().getModel()
+            if model?.deliveryMethodType == "1" { //快递
                 addressLabel.isHidden = false
-            }else  if deliveryMethodType == 1 { //自提
-                make.left.equalTo(addressImageView.snp.right).offset(9)
+                 make.left.equalTo(addressLabel.snp.right).offset(9)
+            }else  if model?.deliveryMethodType == "2" { //自提
                 addressLabel.isHidden = true
+                make.left.equalTo(addressImageView.snp.right).offset(9)
             }
-            make.right.equalTo(categoryButton.snp.left).offset(-9)
-        }
-        
-        categoryButton.snp.makeConstraints { (make) in
-            make.centerY.equalToSuperview()
-            make.right.equalToSuperview().offset(-14)
-            make.size.equalTo(22)
         }
-        
-        searchIconImageView.snp.makeConstraints { (make) in
+    
+        searchIconImageView.snp.remakeConstraints { (make) in
             make.centerY.equalTo(searchButton.snp.centerY)
             make.left.equalToSuperview().offset(15)
             make.size.equalTo(17)
@@ -67,7 +66,7 @@ class ShoppingMallNavigationBarView: BaseView {
         searchTextField.snp.remakeConstraints { (make) in
             make.centerY.equalTo(searchButton.snp.centerY)
             make.left.equalTo(searchIconImageView.snp.right).offset(6)
-            make.right.equalToSuperview().offset(-9)
+//            make.right.equalTo(searchButton.snp.right).offset(-9)
             make.height.equalTo(30)
         }
         

RainbowPlanet/RainbowPlanet/Service/Model/UserModel/DeliveryMethodTypeModel.swift

@@ -0,0 +1,91 @@
+//
+//  DeliveryMethodTypeModel.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/4/24.
+//  Copyright © 2019 南鑫林. All rights reserved.
+//
+
+import UIKit
+import ObjectMapper
+
+/// 存储是否为快递/字体
+class DeliveryMethodTypeModel : NSObject, NSCoding, Mappable{
+    
+    private static let _sharedInstance = DeliveryMethodTypeModel()
+    
+    private override init() {} // 私有化init方法
+    
+    class func shared() -> DeliveryMethodTypeModel {
+        return _sharedInstance
+    }
+    
+    var deliveryMethodType:String? //1快递,2自提
+    
+    
+    class func newInstance(map: Map) -> Mappable?{
+        return DeliveryMethodTypeModel()
+    }
+    required init?(map: Map){}
+    
+    func mapping(map: Map)
+    {
+        deliveryMethodType <- map["deliveryMethodType"]
+        
+    }
+    
+    /**
+     * NSCoding required initializer.
+     * Fills the data from the passed decoder
+     */
+    @objc required init(coder aDecoder: NSCoder)
+    {
+        
+        deliveryMethodType = aDecoder.decodeObject(forKey: "deliveryMethodType") as? String
+        
+    }
+    
+    /**
+     * NSCoding required method.
+     * Encodes mode properties into the decoder
+     */
+    @objc func encode(with aCoder: NSCoder)
+    {
+        if deliveryMethodType != nil{
+            aCoder.encode(deliveryMethodType, forKey: "deliveryMethodType")
+        }
+        
+    }
+    
+    /// 存储个人信息
+    ///
+    /// - Parameter locationModel: 定位模型
+    func setModel(model:DeliveryMethodTypeModel) -> Void {
+        //实例对象转换成Data
+        let modelData = NSKeyedArchiver.archivedData(withRootObject: model)
+        //存储Data对象
+        UserDefaults.standard.set(modelData, forKey: "DeliveryMethodTypeModel")
+        NXLLog("存储成功")
+    }
+    
+    
+    /// 获取个人信息
+    ///
+    /// - Returns: 定位模型
+    func getModel() -> DeliveryMethodTypeModel? {
+        //自定义对象读取
+        let modelData = UserDefaults.standard.data(forKey: "DeliveryMethodTypeModel")
+        var model = DeliveryMethodTypeModel()
+        if modelData != nil {
+            model = NSKeyedUnarchiver.unarchiveObject(with: modelData!) as! DeliveryMethodTypeModel
+            NXLLog("读取成功")
+        }
+        return model
+    }
+    
+    /// 移除个人信息
+    func removeLoginModel() {
+        UserDefaults.standard.removeObject(forKey: "DeliveryMethodTypeModel")
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Service/Model/UserModel/LoginModel.swift

@@ -27,7 +27,6 @@ class LoginModel : NSObject, NSCoding, Mappable{
     var unionId : String?
     var username : String?
 
-
 	class func newInstance(map: Map) -> Mappable?{
 		return LoginModel()
 	}
@@ -45,7 +44,6 @@ class LoginModel : NSObject, NSCoding, Mappable{
         uid <- map["uid"]
         unionId <- map["union_id"]
         username <- map["username"]
-
 		
 	}
 
@@ -66,7 +64,6 @@ class LoginModel : NSObject, NSCoding, Mappable{
         unionId = aDecoder.decodeObject(forKey: "union_id") as? String
         username = aDecoder.decodeObject(forKey: "username") as? String
 
-
 	}
 
     /**
@@ -105,7 +102,6 @@ class LoginModel : NSObject, NSCoding, Mappable{
         if username != nil{
             aCoder.encode(username, forKey: "username")
         }
-
 	}
 
     /// 存储个人信息

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftSign/SwiftSign.swift

@@ -97,7 +97,6 @@ public class SwiftSign: NSObject {
             break
         }
 
-
         let returnString = namedPaird.joined(separator:"&")
         let jsonStr = JSON(returnString).description.description
         NXLLog(jsonStr)