购物车商品跳转详情

消息列表订单跳转订单全部列表
手机号1开头的验证
修改完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2023,8 +2023,8 @@
 		A77F2CA22232010F001BD3F6 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
-				A7FF155A228C689C00A85748 /* OrderModule */,
 				A77F2CAE2232010F001BD3F6 /* RegisterLoginModule */,
+				A7FF155A228C689C00A85748 /* OrderModule */,
 				A77F2CA32232010F001BD3F6 /* ShoppingMallModule */,
 				A77F2CAF2232010F001BD3F6 /* ShoppingCartModule */,
 				A77F2CA92232010F001BD3F6 /* MineModule */,

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -155,3 +155,18 @@ private func viewForController(view:UIView)->UIViewController?{
 func showSwiftProgressHUDInfo() {
     SwiftProgressHUD.shared().showText("该功能暂未开通,敬请期待!!!")
 }
+
+func isMobileVerification(mobile:String) -> Bool {
+    if String(mobile.prefix(1)) as String != "1" {
+        SwiftProgressHUD.shared().showText("手机号码格式错误，\n请重新输入！",textAlignment: .left)
+
+        return false
+    }
+    if mobile.count != 11 {
+        SwiftProgressHUD.shared().showText("手机号码格式错误，\n请重新输入！",textAlignment: .left)
+        return false
+    }
+    
+    return true
+    
+}

RainbowPlanet/RainbowPlanet/Modules/MineModule/Message/ViewController/MessageViewController.swift

@@ -45,6 +45,11 @@ class MessageViewController: BaseViewController {
                     }
                     self?.navigationController?.pushViewController(vc, animated: true)
                     break
+                case 2:
+                    let vc = OrderViewController()
+                    vc.orderVCType = .all
+                    self?.navigationController?.pushViewController(vc, animated: true)
+                    break
                 default:
                     break
                 }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift

@@ -145,10 +145,11 @@ class MobileLoginView: BaseView {
         phoneNumberTextField.keyboardType = .numberPad
         phoneNumberTextField.tintColor = kFFA42FColor
 
-        phoneNumberTextField.rx.text.changed.subscribe(onNext: { [weak self] (text) in
-            self?.phoneNumberTextField.text = String(text?.prefix(11) ?? "") as String
+        phoneNumberTextField.rx.text.orEmpty.changed.subscribe(onNext: { [weak self] (text) in
+            self?.phoneNumberTextField.text = String(text.prefix(11))
             self?.phoneNumber = self?.phoneNumberTextField.text ?? ""
             self?.observableString()
+
         }).disposed(by: disposeBag)
         return phoneNumberTextField
     }()

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -57,15 +57,19 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - sms_code: 短信验证码
     ///   - completion: 回调
     func userMobileRegisterApi(mobile:String,sms_code:String,completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(mobile, forKey: "mobile")
-        parameters.updateValue(sms_code, forKey: "sms_code")
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileRegister(parameters: parameters))) { (userModel) in
-            UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
-            completion("")
+        
+        if isMobileVerification(mobile: mobile) {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(mobile, forKey: "mobile")
+            parameters.updateValue(sms_code, forKey: "sms_code")
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileRegister(parameters: parameters))) { (userModel) in
+                UserModel.shared().setModel(model: userModel as! UserModel)
+                SwiftProgressHUD.shared().hide()
+                completion("")
+            }
         }
+        
     }
 
     // MARK: - 手机密码登录
@@ -76,14 +80,17 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - password: 密码
     ///   - completion: 回调
     func userMobileLoginApi(mobile:String,password:String,completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(mobile, forKey: "mobile")
-        parameters.updateValue(password, forKey: "password")
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileLogin(parameters: parameters))) { (userModel) in
-            UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
-            completion("")
+        
+        if isMobileVerification(mobile: mobile) {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(mobile, forKey: "mobile")
+            parameters.updateValue(password, forKey: "password")
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileLogin(parameters: parameters))) { (userModel) in
+                UserModel.shared().setModel(model: userModel as! UserModel)
+                SwiftProgressHUD.shared().hide()
+                completion("")
+            }
         }
     }
     
@@ -126,17 +133,20 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - openId: 微信openId
     ///   - completion: 回调
     func userBindMobileApi(mobile:String,smsCode:String,unionId:String,openId:String,completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(mobile, forKey: "mobile")
-        parameters.updateValue(smsCode, forKey: "sms_code")
-        parameters.updateValue(unionId, forKey: "union_id")
-        parameters.updateValue(openId, forKey: "open_id")
-
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
-            UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
-            completion("")
+        
+        if isMobileVerification(mobile: mobile) {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(mobile, forKey: "mobile")
+            parameters.updateValue(smsCode, forKey: "sms_code")
+            parameters.updateValue(unionId, forKey: "union_id")
+            parameters.updateValue(openId, forKey: "open_id")
+            
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
+                UserModel.shared().setModel(model: userModel as! UserModel)
+                SwiftProgressHUD.shared().hide()
+                completion("")
+            }
         }
     }
     
@@ -201,28 +211,32 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         }
     }
     
-    // MARK: - 绑定微信
-    /// 绑定微信
+    // MARK: - 绑定手号
+    /// 绑定手机号
     ///
     /// - Parameters:
     ///   - mobile: 手机号
     ///   - umLoginModel: 微信模型
     ///   - completion: 回调
     func userBindWeixinApi(mobile:String,umLoginModel:UMLoginModel,completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(mobile, forKey: "mobile")
-        parameters.updateValue(umLoginModel.open_id, forKey: "open_id")
-        parameters.updateValue(umLoginModel.union_id, forKey: "union_id")
-        parameters.updateValue(umLoginModel.avatar, forKey: "avatar")
-        parameters.updateValue(umLoginModel.username, forKey: "username")
-        parameters.updateValue(umLoginModel.gender, forKey: "gender")
         
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
-            UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
-            completion("")
+        if isMobileVerification(mobile: mobile) {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(mobile, forKey: "mobile")
+            parameters.updateValue(umLoginModel.open_id, forKey: "open_id")
+            parameters.updateValue(umLoginModel.union_id, forKey: "union_id")
+            parameters.updateValue(umLoginModel.avatar, forKey: "avatar")
+            parameters.updateValue(umLoginModel.username, forKey: "username")
+            parameters.updateValue(umLoginModel.gender, forKey: "gender")
+            
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
+                UserModel.shared().setModel(model: userModel as! UserModel)
+                SwiftProgressHUD.shared().hide()
+                completion("")
+            }
         }
+       
     }
     
     // MARK: - 解绑微信
@@ -255,21 +269,24 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - password_confirmation: 确认密码
     ///   - completion: 回调
     func userSetPasswordApi(mobile:String,password:String,password_confirmation:String,completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(mobile, forKey: "mobile")
-        parameters.updateValue(password, forKey: "password")
-        parameters.updateValue(password_confirmation, forKey: "password_confirmation")
-
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
-            let rootModel = rootModel as! RootModel
-            SwiftProgressHUD.shared().showText(rootModel.msg!)
-            if rootModel.code == 0 {
-                let userModel = UserModel.shared().getModel()
-                let setPasswordModel = SetPasswordModel(JSONString: rootModel.data ?? "")
-                userModel?.isPassword = setPasswordModel?.isPassword
-                UserModel.shared().setModel(model: userModel!)
-                completion("")
+        
+        if isMobileVerification(mobile: mobile) {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(mobile, forKey: "mobile")
+            parameters.updateValue(password, forKey: "password")
+            parameters.updateValue(password_confirmation, forKey: "password_confirmation")
+            
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
+                let rootModel = rootModel as! RootModel
+                SwiftProgressHUD.shared().showText(rootModel.msg!)
+                if rootModel.code == 0 {
+                    let userModel = UserModel.shared().getModel()
+                    let setPasswordModel = SetPasswordModel(JSONString: rootModel.data ?? "")
+                    userModel?.isPassword = setPasswordModel?.isPassword
+                    UserModel.shared().setModel(model: userModel!)
+                    completion("")
+                }
             }
         }
     }
@@ -311,24 +328,29 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - zipcode: 邮政编码 710110
     ///   - completion: 回调
     func userAddExpressAddressApi(expressAddresModel:ExpressAddresModel, completion: @escaping apiCallBack) {
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(expressAddresModel.id ?? "", forKey: "id")
-        parameters.updateValue(expressAddresModel.contactName ?? "", forKey: "contact_name")
-        parameters.updateValue(expressAddresModel.contactMobile ?? "", forKey: "contact_mobile")
-        parameters.updateValue(expressAddresModel.provinceId ?? "", forKey: "province_id")
-        parameters.updateValue(expressAddresModel.provinceName ?? "", forKey: "province_name")
-        parameters.updateValue(expressAddresModel.cityId ?? "", forKey: "city_id")
-        parameters.updateValue(expressAddresModel.cityName ?? "", forKey: "city_name")
-        parameters.updateValue(expressAddresModel.areaId ?? "", forKey: "area_id")
-        parameters.updateValue(expressAddresModel.areaName ?? "", forKey: "area_name")
-        parameters.updateValue(expressAddresModel.address ?? "", forKey: "address")
-
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
-            let rootModel = rootModel as! RootModel
-            SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+        
+        if isMobileVerification(mobile: expressAddresModel.contactMobile ?? "") {
+            var parameters = Dictionary<String,Any>()
+            parameters.updateValue(expressAddresModel.id ?? "", forKey: "id")
+            parameters.updateValue(expressAddresModel.contactName ?? "", forKey: "contact_name")
+            parameters.updateValue(expressAddresModel.contactMobile ?? "", forKey: "contact_mobile")
+            parameters.updateValue(expressAddresModel.provinceId ?? "", forKey: "province_id")
+            parameters.updateValue(expressAddresModel.provinceName ?? "", forKey: "province_name")
+            parameters.updateValue(expressAddresModel.cityId ?? "", forKey: "city_id")
+            parameters.updateValue(expressAddresModel.cityName ?? "", forKey: "city_name")
+            parameters.updateValue(expressAddresModel.areaId ?? "", forKey: "area_id")
+            parameters.updateValue(expressAddresModel.areaName ?? "", forKey: "area_name")
+            parameters.updateValue(expressAddresModel.address ?? "", forKey: "address")
+            
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
+                let rootModel = rootModel as! RootModel
+                SwiftProgressHUD.shared().showText(rootModel.msg!)
+                completion("")
+            }
         }
+        
+        
     }
     
     // MARK: - 设置（自提/快递）默认地址
@@ -424,25 +446,25 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - completion: 完成
     func userSaveExpreesContactsApi(id:Int = 0,mobile:String = "",name:String = "",completion: @escaping apiCallBack) {
         
-        if mobile.count != 11  {
-            SwiftProgressHUD.shared().showText("手机格式有误,请重新输入")
-        } else if name.count <= 0 {
-            SwiftProgressHUD.shared().showText("收货人信息不能为空")
-        }else {
-            var parameters = Dictionary<String,Any>()
-            if id != 0 {
-                parameters.updateValue(id, forKey: "id")
+        if isMobileVerification(mobile: mobile) {
+            if name.count <= 0 {
+                SwiftProgressHUD.shared().showText("收货人信息不能为空")
+            }else {
+                var parameters = Dictionary<String,Any>()
+                if id != 0 {
+                    parameters.updateValue(id, forKey: "id")
+                }
+                parameters.updateValue(mobile, forKey: "mobile")
+                parameters.updateValue(name, forKey: "name")
+                SwiftProgressHUD.shared().showWait()
+                SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
+                    (rootModel) in
+                    let rootModel = rootModel as! RootModel
+                    SwiftProgressHUD.shared().showText(rootModel.msg!)
+                    completion("")
+                }
             }
-            parameters.updateValue(mobile, forKey: "mobile")
-            parameters.updateValue(name, forKey: "name")
-            SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
-                (rootModel) in
-                let rootModel = rootModel as! RootModel
-                SwiftProgressHUD.shared().showText(rootModel.msg!)
-                completion("")
-            }
-        }
+        }        
     }
     
     // MARK: - 删除自提点收货人信息