分销逻辑补充1

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -4324,7 +4324,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.8;
+				CURRENT_PROJECT_VERSION = 3.7;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4374,7 +4374,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4455,7 +4455,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.8;
+				CURRENT_PROJECT_VERSION = 3.7;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4505,7 +4505,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.10;
+				MARKETING_VERSION = 1.6.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/View/AlertView/GLTimeSelectView.swift

@@ -200,7 +200,7 @@ class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
     var daySelect = -1
     
     func getYearNum(year:NSString)->Int{
-        var strTime = 2003
+        var strTime = 2017
         var i = 0
         while strTime <= year.integerValue {
             strTime += 1
@@ -257,7 +257,7 @@ class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
 //        time_picker.showsSelectionIndicator = true
         
         let arr = getDate()
-        var strTime = 2003
+        var strTime = 2017
         while strTime <= arr.first! {
             years.append(StringByInt(number: strTime) )
             strTime += 1

GeliBusinessPlatform/View/TimeSelectView/DIYCalendarCell.swift

@@ -50,7 +50,7 @@ class DIYCalendarCell: FSCalendarCell {
         
         //下面代码为添加选中日期背景色
         
-        添加日期别景色1()
+//        添加日期别景色1()
     }
     
     
@@ -63,20 +63,20 @@ class DIYCalendarCell: FSCalendarCell {
         let color = UIColor.white
         self.selectionLayer.fillColor = color.cgColor
         //下面代码为添加选中日期背景色
-        self.selectionLayer2.fillColor = color.cgColor
-        self.selectionLayer2.frame = self.contentView.bounds
+//        self.selectionLayer2.fillColor = color.cgColor
+//        self.selectionLayer2.frame = self.contentView.bounds
         
         if selectionType == .middle {
             print("middle--middle")
             self.titleLabel.textColor = UIColor.init(named: "蓝色字体颜色")
-//            let color = UIColor.white
-//            self.selectionLayer.fillColor = color.cgColor
-//            self.selectionLayer.path = UIBezierPath(rect: self.selectionLayer.bounds).cgPath
+            let color = UIColor.white
+            self.selectionLayer.fillColor = color.cgColor
+            self.selectionLayer.path = UIBezierPath(rect: self.selectionLayer.bounds).cgPath
             
             //下面代码为添加选中日期背景色
             
-            let bounds = CGRect(x: 0, y: 2, width: self.selectionLayer.bounds.size.width, height: self.selectionLayer.bounds.height - 8)
-            添加日期背景色2(shaper: self.selectionLayer, rect: bounds, color: UIColor(named: "#E0EEFF")!)
+//            let bounds = CGRect(x: 0, y: 2, width: self.selectionLayer.bounds.size.width, height: self.selectionLayer.bounds.height - 8)
+//            添加日期背景色2(shaper: self.selectionLayer, rect: bounds, color: UIColor(named: "#E0EEFF")!)
         }
         else if selectionType == .leftBorder {
             self.titleLabel.textColor = UIColor.white
@@ -85,10 +85,8 @@ class DIYCalendarCell: FSCalendarCell {
             self.selectionLayer.path = UIBezierPath(ovalIn: CGRect(x: self.bounds.width / 2 - diameter / 2 + 2, y: self.bounds.height / 2 - diameter / 2 - 1, width: diameter - 4, height: diameter - 4)).cgPath
             
             //下面代码为添加选中日期背景色
-            let bounds = CGRect(x: self.selectionLayer2.bounds.size.width*0.5, y: 2, width: self.selectionLayer2.bounds.size.width, height: self.selectionLayer2.bounds.height - 8)
-//            self.selectionLayer2.fillColor = UIColor(named: "#E0EEFF")?.cgColor
-//            self.selectionLayer2.path = UIBezierPath(rect: bounds).cgPath
-            添加日期背景色2(shaper: self.selectionLayer2, rect: bounds, color: UIColor(named: "#E0EEFF")!)
+//            let bounds = CGRect(x: self.selectionLayer2.bounds.size.width*0.5, y: 2, width: self.selectionLayer2.bounds.size.width, height: self.selectionLayer2.bounds.height - 8)
+//            添加日期背景色2(shaper: self.selectionLayer2, rect: bounds, color: UIColor(named: "#E0EEFF")!)
             print("leftBorder--leftBorder")
         }
         else if selectionType == .rightBorder {
@@ -98,8 +96,8 @@ class DIYCalendarCell: FSCalendarCell {
             self.selectionLayer.path = UIBezierPath(ovalIn: CGRect(x: self.bounds.width / 2 - diameter / 2 + 2, y: self.bounds.height / 2 - diameter / 2 - 1, width: diameter - 4, height: diameter - 4)).cgPath
             
             //下面代码为添加选中日期背景色
-            let bounds = CGRect(x: 0, y: 2, width: self.selectionLayer2.bounds.size.width*0.5, height: self.selectionLayer2.bounds.height - 8)
-            添加日期背景色2(shaper: self.selectionLayer2, rect: bounds, color: UIColor(named: "#E0EEFF")!)
+//            let bounds = CGRect(x: 0, y: 2, width: self.selectionLayer2.bounds.size.width*0.5, height: self.selectionLayer2.bounds.height - 8)
+//            添加日期背景色2(shaper: self.selectionLayer2, rect: bounds, color: UIColor(named: "#E0EEFF")!)
             
         }else if selectionType == .single {
             self.selectionLayer.fillColor = UIColor.init(named: "蓝色字体颜色")?.cgColor
@@ -108,8 +106,8 @@ class DIYCalendarCell: FSCalendarCell {
             print("single--single")
             self.titleLabel.textColor = UIColor.white
             //下面代码为添加选中日期背景色
-            self.selectionLayer2.fillColor = UIColor.white.cgColor
-            self.selectionLayer2.path = UIBezierPath(rect: bounds).cgPath
+//            self.selectionLayer2.fillColor = UIColor.white.cgColor
+//            self.selectionLayer2.path = UIBezierPath(rect: bounds).cgPath
         }
     }
     

GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift

@@ -293,13 +293,19 @@ class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableVi
         dbtIncomeInfo(dic) { (data) in
             let dateModel = data as! dbtIncomeInfoModel
             self.model = dateModel.data
-            
+
             if self.model?.inc != nil {
-                self.income_lbl.text = "收入:¥"+String(format: "%.02f", self.model?.inc as! CVarArg)
+                self.income_lbl.text = "收入:¥"+String(format: "%.02f", self.model?.inc! as! CVarArg)
+                self.income_lbl.isHidden = false
+            }else{
+                self.income_lbl.isHidden = true
             }
-            
+
             if self.model?.exp != nil {
-                self.refuse_lbl.text = "支出:¥"+String(format: "%.02f", self.model?.exp as! CVarArg)
+                self.refuse_lbl.text = "支出:¥"+String(format: "%.02f", self.model?.exp! as! CVarArg)
+                self.refuse_lbl.isHidden = false
+            }else{
+                self.refuse_lbl.isHidden = true
             }
             
             self.dataArr.removeAll()