Skip to content

G
GeliBusinessPlatform
Commit 492c9bbf authored by lujunye's avatar lujunye
Browse files
Options

分销页完成

parent 114c91e3
Hide whitespace changes
Inline Side-by-side
Showing with 1497 additions and 12 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 492c9bbf
......@@ -90,6 +90,10 @@
E02DDD962450106C00ABB707 /* PuTongJieTiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02DDD942450106C00ABB707 /* PuTongJieTiCell.xib */; };
E02DDD9924501A5B00ABB707 /* DelGuiGeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02DDD9724501A5B00ABB707 /* DelGuiGeCell.swift */; };
E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02DDD9824501A5B00ABB707 /* DelGuiGeCell.xib */; };
E02EE11B259ACC0500733764 /* FXSY_ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02EE119259ACC0500733764 /* FXSY_ViewController.swift */; };
E02EE11C259ACC0500733764 /* FXSY_ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02EE11A259ACC0500733764 /* FXSY_ViewController.xib */; };
E02EE125259AD6FB00733764 /* FXSY_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02EE123259AD6FB00733764 /* FXSY_Cell.swift */; };
E02EE126259AD6FB00733764 /* FXSY_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02EE124259AD6FB00733764 /* FXSY_Cell.xib */; };
E02FD9EC2455627300E10E27 /* ChuKuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9EA2455627300E10E27 /* ChuKuViewController.swift */; };
E02FD9ED2455627300E10E27 /* ChuKuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02FD9EB2455627300E10E27 /* ChuKuViewController.xib */; };
E02FD9F62455790800E10E27 /* DiZhiGuanLiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02FD9F42455790800E10E27 /* DiZhiGuanLiCell.swift */; };
......@@ -293,6 +297,8 @@
E0B530882472917F00FFCC15 /* ShopWarehouseDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
E0B903B8259AD96F0041EF62 /* dbtIncomeInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B903B7259AD96F0041EF62 /* dbtIncomeInfoModel.swift */; };
E0B903BD259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */; };
E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */; };
E0B9461F24566B3100FBEC9A /* TitleAndTFAndBtnCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B9461D24566B3100FBEC9A /* TitleAndTFAndBtnCell.xib */; };
E0B94623245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B94621245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.swift */; };
......@@ -377,6 +383,8 @@
E0EFB9CA24930DD5005FB0CD /* CGDListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EFB9C824930DD5005FB0CD /* CGDListVC.swift */; };
E0EFB9CB24930DD5005FB0CD /* CGDListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0EFB9C924930DD5005FB0CD /* CGDListVC.xib */; };
E0EFB9CE2493189D005FB0CD /* PurchaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EFB9CD2493189D005FB0CD /* PurchaseModel.swift */; };
E0F038FC2599C5F500721011 /* GLTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */; };
E0F039012599C60200721011 /* GLTimeSelectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F039002599C60200721011 /* GLTimeSelectView.xib */; };
E0F1BE4824692379003015B2 /* ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F1BE4624692379003015B2 /* ItemCell.swift */; };
E0F1BE4924692379003015B2 /* ItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F1BE4724692379003015B2 /* ItemCell.xib */; };
E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */; };
......@@ -754,6 +762,10 @@
E02DDD942450106C00ABB707 /* PuTongJieTiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PuTongJieTiCell.xib; sourceTree = "<group>"; };
E02DDD9724501A5B00ABB707 /* DelGuiGeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DelGuiGeCell.swift; sourceTree = "<group>"; };
E02DDD9824501A5B00ABB707 /* DelGuiGeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DelGuiGeCell.xib; sourceTree = "<group>"; };
E02EE119259ACC0500733764 /* FXSY_ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FXSY_ViewController.swift; sourceTree = "<group>"; };
E02EE11A259ACC0500733764 /* FXSY_ViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FXSY_ViewController.xib; sourceTree = "<group>"; };
E02EE123259AD6FB00733764 /* FXSY_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FXSY_Cell.swift; sourceTree = "<group>"; };
E02EE124259AD6FB00733764 /* FXSY_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FXSY_Cell.xib; sourceTree = "<group>"; };
E02F43C1246A91C1000ECFB1 /* GeliBusinessPlatform.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = GeliBusinessPlatform.entitlements; sourceTree = "<group>"; };
E02FD9EA2455627300E10E27 /* ChuKuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChuKuViewController.swift; sourceTree = "<group>"; };
E02FD9EB2455627300E10E27 /* ChuKuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChuKuViewController.xib; sourceTree = "<group>"; };
......@@ -963,6 +975,8 @@
E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopWarehouseDetailModel.swift; sourceTree = "<group>"; };
E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
E0B903B7259AD96F0041EF62 /* dbtIncomeInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dbtIncomeInfoModel.swift; sourceTree = "<group>"; };
E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dbtIncomeInfoInterface.swift; sourceTree = "<group>"; };
E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndTFAndBtnCell.swift; sourceTree = "<group>"; };
E0B9461D24566B3100FBEC9A /* TitleAndTFAndBtnCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndTFAndBtnCell.xib; sourceTree = "<group>"; };
E0B94621245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DaiKeXiaDanGouWuViewController.swift; sourceTree = "<group>"; };
......@@ -1056,6 +1070,8 @@
E0EFB9C824930DD5005FB0CD /* CGDListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDListVC.swift; sourceTree = "<group>"; };
E0EFB9C924930DD5005FB0CD /* CGDListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDListVC.xib; sourceTree = "<group>"; };
E0EFB9CD2493189D005FB0CD /* PurchaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseModel.swift; sourceTree = "<group>"; };
E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLTimeSelectView.swift; sourceTree = "<group>"; };
E0F039002599C60200721011 /* GLTimeSelectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLTimeSelectView.xib; sourceTree = "<group>"; };
E0F1BE4624692379003015B2 /* ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemCell.swift; sourceTree = "<group>"; };
E0F1BE4724692379003015B2 /* ItemCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ItemCell.xib; sourceTree = "<group>"; };
E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinZengAndBianJiKeHuViewController.swift; sourceTree = "<group>"; };
......@@ -1667,6 +1683,17 @@
path = "仅新增规格header";
sourceTree = "<group>";
};
E02EE118259ACBD600733764 /* 分销收益页 */ = {
isa = PBXGroup;
children = (
E02EE119259ACC0500733764 /* FXSY_ViewController.swift */,
E02EE11A259ACC0500733764 /* FXSY_ViewController.xib */,
E02EE123259AD6FB00733764 /* FXSY_Cell.swift */,
E02EE124259AD6FB00733764 /* FXSY_Cell.xib */,
);
path = "分销收益页";
sourceTree = "<group>";
};
E02FD9EE2455704600E10E27 /* 出入库记录 */ = {
isa = PBXGroup;
children = (
......@@ -1935,13 +1962,6 @@
path = "换绑支付账号（绑定，换绑）";
sourceTree = "<group>";
};
E09662CB2599807600893CAE /* 分销员收益 */ = {
isa = PBXGroup;
children = (
);
path = "分销员收益";
sourceTree = "<group>";
};
E09B039E2445AEF800211A51 /* Appdelegate */ = {
isa = PBXGroup;
children = (
......@@ -1976,6 +1996,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0B903B6259AD9490041EF62 /* dbtIncomeInfo_model */,
E0A0A66B255A2C0300B0D1A5 /* get_dbt_rule_model */,
E040399424D14D1F008CF965 /* LalamoveInterface */,
E0E4456724B00F6400EF788E /* Logistics */,
......@@ -1993,6 +2014,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */,
E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */,
E040399724D14E0E008CF965 /* LalamoveInterface.swift */,
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */,
......@@ -2036,7 +2058,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E09662CB2599807600893CAE /* 分销员收益 */,
E02EE118259ACBD600733764 /* 分销收益页 */,
E077DC6725512E73000B0DA5 /* 分销商品管理 */,
E077DC5C25512489000B0DA5 /* 供应商合作管理 */,
E0AD92E62550E4DD00D82C17 /* 供应商分销商品管理 */,
......@@ -2360,6 +2382,14 @@
path = WarehouseManageModel;
sourceTree = "<group>";
};
E0B903B6259AD9490041EF62 /* dbtIncomeInfo_model */ = {
isa = PBXGroup;
children = (
E0B903B7259AD96F0041EF62 /* dbtIncomeInfoModel.swift */,
);
path = dbtIncomeInfo_model;
sourceTree = "<group>";
};
E0B94620245671AD00FBEC9A /* 代客下单（购物） */ = {
isa = PBXGroup;
children = (
......@@ -2998,6 +3028,8 @@
F90D37F825529984001F3AED /* GLAlertTbAddViewCell.xib */,
F976255B2552B392001EC5B0 /* DistributorSettingAlertView.swift */,
F97E73312552A22000A11F98 /* DistributorSettingAlertView.xib */,
E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */,
E0F039002599C60200721011 /* GLTimeSelectView.xib */,
);
path = AlertView;
sourceTree = "<group>";
......@@ -3390,8 +3422,10 @@
E0DDCB10244AD8C500DF54C7 /* DaiQueRenCell.xib in Resources */,
E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */,
F94A31652462B21700FEC38E /* EditWorkCViewController.xib in Resources */,
E0F039012599C60200721011 /* GLTimeSelectView.xib in Resources */,
E0BE8A9D245A9E5900E80134 /* YingFuZhangKuanXQCell.xib in Resources */,
F96A5856247BBFFF0070A057 /* AddGuiGeCell.xib in Resources */,
E02EE126259AD6FB00733764 /* FXSY_Cell.xib in Resources */,
E02870C2258C547400271055 /* AMap.bundle in Resources */,
E0A2E82824555B4400D6DB34 /* KuCunShangPinCell.xib in Resources */,
E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */,
......@@ -3445,6 +3479,7 @@
E09B3AD124B2FCAF00E3B238 /* ShareSDK.bundle in Resources */,
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
F956D5A5246A2D9C003FF510 /* Feature in Resources */,
E02EE11C259ACC0500733764 /* FXSY_ViewController.xib in Resources */,
E0516F782448003D00E373CE /* PayViewController.xib in Resources */,
E02FD9ED2455627300E10E27 /* ChuKuViewController.xib in Resources */,
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
......@@ -3695,6 +3730,7 @@
E07337F82579E8660039767A /* GYS_FX_Product_ListVc.swift in Sources */,
E0BE8A7F245A740600E80134 /* ChengGongCell.swift in Sources */,
E02DDD90244FE54C00ABB707 /* NewCreateHeader.swift in Sources */,
E0B903BD259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift in Sources */,
E0228BB0246FDA9A005812FA /* TitleAndLblCell.swift in Sources */,
F9D44E8C24CBDC2600FBD8DB /* TestViewController.swift in Sources */,
F950FDA92451613500C40530 /* GetMobileModel.swift in Sources */,
......@@ -3727,6 +3763,7 @@
E0CC848B24824291009B1FE9 /* CRKListVC.swift in Sources */,
E03549AD24582828008BD021 /* KeHuGuanLiCell.swift in Sources */,
F93615DD2480B693004187F9 /* WorkcenterIndexModel.swift in Sources */,
E0B903B8259AD96F0041EF62 /* dbtIncomeInfoModel.swift in Sources */,
F95567A72453DA86009674AB /* WarehoseMangementListVC.swift in Sources */,
F9D44E8F24CBDDD000FBD8DB /* ToFormChangeTableViewCell.swift in Sources */,
F933F6CF2452C68B00189561 /* PKHUDErrorView.swift in Sources */,
......@@ -3775,6 +3812,7 @@
E0D197C02448431C002B080C /* BabyCentralManager.m in Sources */,
F956D5A9246A2D9C003FF510 /* LMNLineChain.m in Sources */,
E030DF362485DD3E002764D3 /* NewRKCell.swift in Sources */,
E02EE125259AD6FB00733764 /* FXSY_Cell.swift in Sources */,
E020632F246CE2F9007A40C4 /* OrderDViewSumFooter.swift in Sources */,
E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */,
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
......@@ -3796,6 +3834,7 @@
F956D5B9246A33E2003FF510 /* OrderInterface.swift in Sources */,
F933F6CA2452C68B00189561 /* PKHUDRotatingImageView.swift in Sources */,
F950FDE324518B9500C40530 /* FSCalendarHeaderView.m in Sources */,
E02EE11B259ACC0500733764 /* FXSY_ViewController.swift in Sources */,
E0707DCE2462479300E039A8 /* SJMapViewController.swift in Sources */,
F950FDA32451438A00C40530 /* AdminInfoModel.swift in Sources */,
E0D197D5244860B1002B080C /* BlueToothCell.swift in Sources */,
......@@ -3880,6 +3919,7 @@
F933F6CB2452C68B00189561 /* Window.swift in Sources */,
E013D7882484B1B90092DE46 /* CRKXiangQVC.swift in Sources */,
E0DDCB0F244AD8C500DF54C7 /* DaiQueRenCell.swift in Sources */,
E0F038FC2599C5F500721011 /* GLTimeSelectView.swift in Sources */,
E042F74024528CD500CDFA12 /* TitleAndOnlyBtnCell.swift in Sources */,
E0571C6E248DD4DE00E85711 /* AdressInterface.swift in Sources */,
E0706EF824B4796400D8251C /* CGDListCell2.swift in Sources */,
......
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 492c9bbf
......@@ -3,4 +3,27 @@
uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "C83E3376-0312-4D15-99E3-5CBF74F24A36"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
breakpointStackSelectionBehavior = "1"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "7F243655-7F7D-4E57-927F-4125D0651B3C"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 492c9bbf
......@@ -300,5 +300,9 @@
<string>Distribution/supGoodsList</string>
<key>分销商品管理</key>
<string>Distribution/supSetCommodity</string>
<key>分销收益界面查询</key>
<string>Distribution/dbtIncomeInfo</string>
<key>收益详情界面信息</key>
<string>Distribution/incomeDetails</string>
</dict>
</plist>
GeliBusinessPlatform/Model/dbtIncomeInfoInterface.swift 0 → 100644
View file @ 492c9bbf
//
// dbtIncomeInfoInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/12/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--分销收益界面查询
/*
user_token 用户token
role_type 身份类型：1为供应商2为分销商
inc_exp_type 收支类型0为全部、1为支出、2为收入(默认为0)
keyword 模糊查询（订单编号）
year 年
month 月
day 日
*/
func dbtIncomeInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("分销收益界面查询", params, { (rep:DataResponse<dbtIncomeInfoModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--收益详情界面信息
/*
user_token 用户token
record_sn 流水号
*/
func incomeDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("收益详情界面信息", params, { (rep:DataResponse<incomeDetailsModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/dbtIncomeInfo_model/dbtIncomeInfoModel.swift 0 → 100644
View file @ 492c9bbf
//
// dbtIncomeInfoModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/12/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 分销收益详情
class dbtIncomeInfoModel: Mappable {
var code:Int?
var message : String?
var data :dbtIncomeInfoDataModel?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class dbtIncomeInfoDataModel: Mappable {
var is_sup:Int?///是否是供应商（1是0否）
var is_dbt : Int? ///是否是分销商（1是0否）
var inc :Float?///收入
var exp:Float?///支出
var res : Array<dbtIncomeInfoDatasModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
is_sup <- map["is_sup"]
is_dbt <- map["is_dbt"]
inc <- map["inc"]
exp <- map["exp"]
res <- map["res"]
}
}
class dbtIncomeInfoDatasModel: Mappable {
var add_time:String?///时间
var record_sn : String? ///流水号
var remark :String?///分账类型
var order_sn:String?///订单编号
var in_amount :String?///收益金额
required init?( map: Map) {
}
func mapping(map: Map) {
add_time <- map["add_time"]
record_sn <- map["record_sn"]
remark <- map["remark"]
order_sn <- map["order_sn"]
in_amount <- map["in_amount"]
}
}
class incomeDetailsModel: Mappable {
var code:Int?
var message : String?
var data :incomeDetailsDataModel?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class incomeDetailsDataModel: Mappable {
var in_amount:String?//收益金额
var remark : String?//出入账类型
var collection_account :String?//转账账户
var collection_name:String?//转账店铺名称
var collection_time : Int?//转账时间
var supplier_account :String? //收款账户
var supplier_name:String? //收款店铺名称
var supplier_time : Int?//到账时间
var order_sn :String? //订单编号
var add_time:String?//退款时间（先用这个）
var refund_cycle : String?//退款周期(写死)
required init?( map: Map) {
}
func mapping(map: Map) {
in_amount <- map["in_amount"]
remark <- map["remark"]
collection_account <- map["collection_account"]
collection_name <- map["collection_name"]
collection_time <- map["collection_time"]
supplier_account <- map["supplier_account"]
supplier_name <- map["supplier_name"]
supplier_time <- map["supplier_time"]
order_sn <- map["order_sn"]
add_time <- map["add_time"]
refund_cycle <- map["refund_cycle"]
}
}
GeliBusinessPlatform/View/AlertView/GLMessageAlertView.swift
View file @ 492c9bbf
......@@ -27,7 +27,7 @@ class GLMessageAlertView: UIView,UITableViewDelegate,UITableViewDataSource {
return cell
}
var contentView:UIView!
@IBOutlet weak var topLbl: UILabel!
@IBOutlet weak var tbvH: NSLayoutConstraint!
......@@ -57,7 +57,7 @@ class GLMessageAlertView: UIView,UITableViewDelegate,UITableViewDataSource {
}
}
var contentView:UIView!
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
......
GeliBusinessPlatform/View/AlertView/GLTimeSelectView.swift 0 → 100644
View file @ 492c9bbf
//
// GLTimeSelectView.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/12/28.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import SwiftDate
import LGButton
protocol GLTimeSelectViewDelegate {
func GLTimeSelectViewSelectFinish(date:String)
}
class GLTimeSelectView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
@IBOutlet weak var year_btn: UIButton!
@IBOutlet weak var day_btn: UIButton!
@IBOutlet weak var month_btn: UIButton!
var delegate:GLTimeSelectViewDelegate?
func numberOfComponents(in pickerView: UIPickerView) -> Int {
return nums
}
var nums = 3
@IBAction func date_type_select(_ sender: UIButton) {
sender.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
switch sender.tag {
case 0:
day_btn.isSelected = true
month_btn.isSelected = false
year_btn.isSelected = false
month_btn.backgroundColor = UIColor.clear
year_btn.backgroundColor = UIColor.clear
nums = 3
break
case 1:
month_btn.isSelected = true
day_btn.isSelected = false
year_btn.isSelected = false
day_btn.backgroundColor = UIColor.clear
year_btn.backgroundColor = UIColor.clear
nums = 2
break
default:
year_btn.isSelected = true
month_btn.isSelected = false
day_btn.isSelected = false
month_btn.backgroundColor = UIColor.clear
day_btn.backgroundColor = UIColor.clear
nums = 1
break
}
time_picker.reloadAllComponents()
switch nums {
case 1:
time_picker.selectRow(yearSelect, inComponent: 0, animated: false)
break
case 2:
time_picker.selectRow(yearSelect, inComponent: 0, animated: false)
time_picker.selectRow(monthSelect, inComponent: 1, animated: false)
break
default:
time_picker.selectRow(yearSelect, inComponent: 0, animated: false)
time_picker.selectRow(monthSelect, inComponent: 1, animated: false)
time_picker.selectRow(daySelect, inComponent: 2, animated: false)
break
}
}
@IBAction func submit_action(_ sender: LGButton) {
switch nums {
case 1:
dateStr = years[yearSelect]
break
case 2:
dateStr = years[yearSelect] + "-" + months[monthSelect]
break
default:
dateStr = years[yearSelect] + "-" + months[monthSelect] + "-" + days[daySelect]
break
}
delegate?.GLTimeSelectViewSelectFinish(date:dateStr)
self.removeFromSuperview()
}
@IBAction func close_action(_ sender: Any) {
self.removeFromSuperview()
}
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
if component == 0 {
return years.count
}else if component == 1 {
return months.count
}
return days.count
}
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
if component == 0 {
return years[row]
}else if component == 1 {
return months[row]+"月"
}
return days[row]+"日"
}
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
let arr = getDate()
switch component {
case 0:
yearSelect = row
if yearSelect == years.count-1{
if arr[1] < 12 {
months.removeAll()
var m = 1
while m <= arr[1] {
months.append(StringByInt(number: m))
m += 1
}
}
if arr[1] == 12 {
if arr.last! < 31{
days.removeAll()
var d = 1
while d <= arr.last! {
days.append(StringByInt(number: d))
d += 1
}
if nums > 2 {
pickerView.reloadComponent(2)
}
}
}
}else{
if months.count < 12 {
months.removeAll()
var m = 1
while m <= 12 {
months.append(StringByInt(number: m))
m += 1
}
}
if days.count < 31 {
days.removeAll()
var d = 1
while d <= 31 {
days.append(StringByInt(number: d))
d += 1
}
if nums > 2 {
pickerView.reloadComponent(2)
}
}
}
if nums > 1 {
pickerView.reloadComponent(1)
}
break
case 1:
monthSelect = row
if yearSelect == years.count-1 && monthSelect == months.count-1{
if days.count != arr.last! {
days.removeAll()
var d = 1
while d <= arr.last! {
days.append(StringByInt(number: d))
d += 1
}
}
}else{
let dayNum = "\(years[yearSelect])-\(months[monthSelect])-1".toDate()?.dateAtEndOf(.month).day
var d = 1
days.removeAll()
while d <= dayNum! {
days.append(StringByInt(number: d))
d += 1
}
}
if nums > 2 {
pickerView.reloadComponent(2)
}
break
default:
daySelect = row
break
}
}
var yearSelect = -1
var monthSelect = -1
var daySelect = -1
func getYearNum(year:NSString)->Int{
var strTime = 2003
var i = 0
while strTime <= year.integerValue {
strTime += 1
if strTime != year.integerValue {
i += 1
}
}
return i
}
var dateStr = ""{
didSet{
if dateStr.count == 4 {
yearSelect = getYearNum(year: dateStr as NSString)
date_type_select(year_btn)
}else if dateStr.count > 4 && dateStr.count <= 7{
let arr = dateStr.components(separatedBy: "-")
yearSelect = getYearNum(year: arr.first! as NSString)
monthSelect = (arr[1] as NSString).integerValue - 1
date_type_select(month_btn)
}else{
let arr = dateStr.components(separatedBy: "-")
yearSelect = getYearNum(year: arr.first! as NSString)
monthSelect = (arr[1] as NSString).integerValue - 1
daySelect = (arr[2] as NSString).integerValue - 1
date_type_select(day_btn)
}
}
}
var years:Array<String> = []
var months:Array<String> = []
var days:Array<String> = []
@IBOutlet weak var time_picker: UIPickerView!
var contentView:UIView!
func getDate()->Array<Int>{
let date = Date()
let timeFormatter = DateFormatter()
//日期显示格式，可按自己需求显示
timeFormatter.dateFormat = "yyyy-MM-dd"
let strNowTime = timeFormatter.string(from: date) as String
let dateArr = strNowTime.components(separatedBy: "-")
let year = Int(dateArr.first!)!
let month = Int(dateArr[1])!
let day = Int(dateArr[2])!
return [year,month,day]
}
func setUI(){
time_picker.delegate = self
time_picker.dataSource = self
let arr = getDate()
var strTime = 2003
while strTime <= arr.first! {
years.append(StringByInt(number: strTime) )
strTime += 1
}
if yearSelect == -1 {
var m = 1
while m <= arr[1] {
months.append(StringByInt(number: m))
m += 1
}
}else{
var m = 1
while m <= 12 {
months.append(StringByInt(number: m))
m += 1
}
}
if yearSelect == -1 && monthSelect == -1 {
var d = 1
while d <= arr.last! {
days.append(StringByInt(number: d))
d += 1
}
}else{
let dayNum = "\(years[years.count-1])-\(arr[1])-1".toDate()?.dateAtEndOf(.month).day
var d = 1
while d <= dayNum! {
days.append(StringByInt(number: d))
d += 1
}
}
if yearSelect == -1 {
yearSelect = years.count-1
}
if monthSelect == -1 {
monthSelect = months.count - 1
}
if daySelect == -1 {
daySelect = days.count - 1
}
}
override func layoutSubviews() {
super.layoutSubviews()
if dateStr.count == 4 {
time_picker.selectRow(yearSelect, inComponent: 0, animated: false)
}else if dateStr.count > 4 && dateStr.count <= 7 {
time_picker.selectRow(monthSelect, inComponent: 1, animated: false)
}else{
time_picker.selectRow(daySelect, inComponent: 2, animated: false)
}
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.top.left.right.bottom.equalToSuperview()
}
setUI()
}
// /初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
setUI()
}
//加载xib
func loadViewFromNib() -> UIView {
let className = type(of: self)
let bundle = Bundle(for: className)
let name = NSStringFromClass(className).components(separatedBy: ".").last
let nib = UINib(nibName: name!, bundle: bundle)
let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
return view
}
}
GeliBusinessPlatform/View/AlertView/GLTimeSelectView.xib 0 → 100644
View file @ 492c9bbf
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GLTimeSelectView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="day_btn" destination="ceY-oa-13U" id="uSo-OJ-hg1"/>
<outlet property="month_btn" destination="oSG-cV-kWh" id="zNz-d2-IKR"/>
<outlet property="time_picker" destination="Jpg-4u-rve" id="qbp-1Z-eqA"/>
<outlet property="year_btn" destination="hkT-4d-9sn" id="axP-ug-5eJ"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FiE-Mt-vfX">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<color key="backgroundColor" name="标题字颜色"/>
<connections>
<action selector="close_action:" destination="-1" eventType="touchUpInside" id="Adk-lc-17c"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZjG-tj-YGW" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="818" width="414" height="78"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submit_action:" destination="-1" eventType="touchUpInside" id="LQN-Gd-dOp"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确定" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hjd-Mr-bl2">
<rect key="frame" x="0.0" y="818" width="414" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="uck-hW-7VD"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<color key="highlightedColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Cc-2f-GdE">
<rect key="frame" x="0.0" y="465" width="414" height="353"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择时间" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6YF-eE-7fE">
<rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
<constraints>
<constraint firstAttribute="height" constant="51" id="wMS-ZP-GaO"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="01X-1K-s71">
<rect key="frame" x="0.0" y="51" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="WmY-Ar-0vV"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="le1-mF-XJ6">
<rect key="frame" x="35.5" y="67" width="343" height="32.5"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ceY-oa-13U">
<rect key="frame" x="0.0" y="0.0" width="114.5" height="32.5"/>
<color key="backgroundColor" name="按钮渐变色下,字体颜色"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="按日">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<state key="selected">
<color key="titleColor" name="白色背景色"/>
</state>
<connections>
<action selector="date_type_select:" destination="-1" eventType="touchUpInside" id="H1t-Bo-jFK"/>
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oSG-cV-kWh">
<rect key="frame" x="114.5" y="0.0" width="114" height="32.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="按月">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<state key="selected">
<color key="titleColor" name="白色背景色"/>
</state>
<connections>
<action selector="date_type_select:" destination="-1" eventType="touchUpInside" id="Ru2-cG-l9T"/>
</connections>
</button>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hkT-4d-9sn">
<rect key="frame" x="228.5" y="0.0" width="114.5" height="32.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="按年">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<state key="selected">
<color key="titleColor" name="白色背景色"/>
</state>
<connections>
<action selector="date_type_select:" destination="-1" eventType="touchUpInside" id="LgN-hw-bIz"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w6U-6A-yPX">
<rect key="frame" x="114.5" y="0.0" width="1" height="32.5"/>
<color key="backgroundColor" name="未登录提示背景色"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="b0y-WL-ees"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1kH-N9-obM">
<rect key="frame" x="228.5" y="0.0" width="1" height="32.5"/>
<color key="backgroundColor" name="未登录提示背景色"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="9Wj-af-WH8"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="oSG-cV-kWh" firstAttribute="width" secondItem="ceY-oa-13U" secondAttribute="width" id="1V1-5W-AZz"/>
<constraint firstItem="w6U-6A-yPX" firstAttribute="leading" secondItem="ceY-oa-13U" secondAttribute="trailing" id="1i0-5x-YOp"/>
<constraint firstAttribute="bottom" secondItem="w6U-6A-yPX" secondAttribute="bottom" id="7YC-BI-2KO"/>
<constraint firstAttribute="trailing" secondItem="hkT-4d-9sn" secondAttribute="trailing" id="BzE-Ay-boF"/>
<constraint firstItem="hkT-4d-9sn" firstAttribute="width" secondItem="ceY-oa-13U" secondAttribute="width" id="Eap-wF-Vlg"/>
<constraint firstAttribute="bottom" secondItem="ceY-oa-13U" secondAttribute="bottom" id="FiF-qm-QEg"/>
<constraint firstItem="oSG-cV-kWh" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="top" id="Ity-7j-UUl"/>
<constraint firstItem="1kH-N9-obM" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="top" id="M8V-6J-epn"/>
<constraint firstItem="ceY-oa-13U" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="top" id="MGP-Or-rD1"/>
<constraint firstAttribute="bottom" secondItem="1kH-N9-obM" secondAttribute="bottom" id="OEQ-Tf-CSh"/>
<constraint firstItem="ceY-oa-13U" firstAttribute="leading" secondItem="le1-mF-XJ6" secondAttribute="leading" id="Ppy-1c-4P3"/>
<constraint firstItem="hkT-4d-9sn" firstAttribute="leading" secondItem="oSG-cV-kWh" secondAttribute="trailing" id="R8K-Pq-Azr"/>
<constraint firstAttribute="bottom" secondItem="oSG-cV-kWh" secondAttribute="bottom" id="XYd-Va-Emx"/>
<constraint firstItem="oSG-cV-kWh" firstAttribute="leading" secondItem="ceY-oa-13U" secondAttribute="trailing" id="jn1-yp-QIM"/>
<constraint firstAttribute="bottom" secondItem="hkT-4d-9sn" secondAttribute="bottom" id="kxp-dl-dvs"/>
<constraint firstItem="1kH-N9-obM" firstAttribute="leading" secondItem="oSG-cV-kWh" secondAttribute="trailing" id="prG-PC-xfc"/>
<constraint firstAttribute="height" constant="32.5" id="tjb-c8-xPf"/>
<constraint firstItem="hkT-4d-9sn" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="top" id="ugx-nJ-4n8"/>
<constraint firstItem="w6U-6A-yPX" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="top" id="zpL-uq-SX2"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" name="未登录提示背景色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
<real key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jpg-4u-rve">
<rect key="frame" x="0.0" y="99.5" width="414" height="253.5"/>
</pickerView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="01X-1K-s71" firstAttribute="top" secondItem="6YF-eE-7fE" secondAttribute="bottom" id="4TH-c2-9b0"/>
<constraint firstAttribute="trailing" secondItem="Jpg-4u-rve" secondAttribute="trailing" id="6Rt-I5-pbt"/>
<constraint firstAttribute="bottom" secondItem="Jpg-4u-rve" secondAttribute="bottom" id="BrV-ju-jxX"/>
<constraint firstItem="6YF-eE-7fE" firstAttribute="leading" secondItem="0Cc-2f-GdE" secondAttribute="leading" id="GnY-yW-jaK"/>
<constraint firstItem="le1-mF-XJ6" firstAttribute="top" secondItem="01X-1K-s71" secondAttribute="bottom" constant="15" id="KMW-cc-Phu"/>
<constraint firstAttribute="trailing" secondItem="01X-1K-s71" secondAttribute="trailing" id="KPR-Za-zEA"/>
<constraint firstItem="Jpg-4u-rve" firstAttribute="leading" secondItem="0Cc-2f-GdE" secondAttribute="leading" id="NFC-BF-HKl"/>
<constraint firstItem="le1-mF-XJ6" firstAttribute="leading" secondItem="0Cc-2f-GdE" secondAttribute="leading" constant="35.5" id="NcX-l0-Lhn"/>
<constraint firstItem="Jpg-4u-rve" firstAttribute="top" secondItem="le1-mF-XJ6" secondAttribute="bottom" id="OGw-nj-j4m"/>
<constraint firstItem="01X-1K-s71" firstAttribute="leading" secondItem="0Cc-2f-GdE" secondAttribute="leading" id="cXc-Yv-OqC"/>
<constraint firstAttribute="trailing" secondItem="6YF-eE-7fE" secondAttribute="trailing" id="fOw-wE-Olg"/>
<constraint firstAttribute="trailing" secondItem="le1-mF-XJ6" secondAttribute="trailing" constant="35.5" id="gSn-fO-yiG"/>
<constraint firstItem="6YF-eE-7fE" firstAttribute="top" secondItem="0Cc-2f-GdE" secondAttribute="top" id="go1-Fc-r3z"/>
<constraint firstAttribute="height" constant="353" id="rAH-Nf-3jn"/>
</constraints>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="FiE-Mt-vfX" secondAttribute="trailing" id="4aO-Ng-PGL"/>
<constraint firstItem="FiE-Mt-vfX" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="F8f-Tg-we3"/>
<constraint firstItem="ZjG-tj-YGW" firstAttribute="top" secondItem="Hjd-Mr-bl2" secondAttribute="top" id="Jzm-s9-ZVU"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="Hjd-Mr-bl2" secondAttribute="trailing" id="LIx-bR-hhj"/>
<constraint firstAttribute="trailing" secondItem="ZjG-tj-YGW" secondAttribute="trailing" id="Luy-kf-h89"/>
<constraint firstItem="FiE-Mt-vfX" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="TDD-sb-Jm5"/>
<constraint firstItem="ZjG-tj-YGW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="XEZ-HT-zs9"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="Hjd-Mr-bl2" secondAttribute="bottom" id="fpK-lT-vxf"/>
<constraint firstItem="ZjG-tj-YGW" firstAttribute="top" secondItem="0Cc-2f-GdE" secondAttribute="bottom" id="i36-6b-13S"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="0Cc-2f-GdE" secondAttribute="trailing" id="i5H-cB-Vlf"/>
<constraint firstAttribute="bottom" secondItem="ZjG-tj-YGW" secondAttribute="bottom" id="jRb-Gb-YGt"/>
<constraint firstItem="Hjd-Mr-bl2" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="omW-ZQ-Soo"/>
<constraint firstItem="0Cc-2f-GdE" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="rHd-z9-auN"/>
<constraint firstAttribute="bottom" secondItem="FiE-Mt-vfX" secondAttribute="bottom" id="rcY-hQ-faV"/>
</constraints>
<point key="canvasLocation" x="140.57971014492756" y="99.776785714285708"/>
</view>
</objects>
<designables>
<designable name="ZjG-tj-YGW">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<namedColor name="多选按钮字体颜色">
<color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="未登录提示背景色">
<color red="1" green="0.43900001049041748" blue="0.43900001049041748" alpha="0.64999997615814209" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/供应商分销商品管理/GYS_FX_SearchViewController.swift
View file @ 492c9bbf
......@@ -43,7 +43,6 @@ class GYS_FX_SearchViewController: BaseViewController,UITableViewDelegate,UITabl
if keyword.count > 0 {
self.home_list_tbv.mj_header?.beginRefreshing()
}
}
//MARK:--取消搜索代理
func clearSearchAction() {
......
GeliBusinessPlatform/ViewController/分销收益页/FXSY_Cell.swift 0 → 100644
View file @ 492c9bbf
//
// FXSY_Cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/12/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class FXSY_Cell: UITableViewCell {
@IBOutlet weak var order_id_lbl2: UILabel!
@IBOutlet weak var time_lbl: UILabel!
@IBOutlet weak var order_id_lbl: UILabel!
@IBOutlet weak var price_lbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/分销收益页/FXSY_Cell.xib 0 → 100644
View file @ 492c9bbf
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FXSY_Cell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dYv-Zp-euR">
<rect key="frame" x="15" y="83" width="305" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ZKO-ar-JqT"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U3t-Za-6cK">
<rect key="frame" x="15" y="10" width="8" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="多选按钮字体颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b1H-lz-RdM">
<rect key="frame" x="15" y="33.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UX-LB-mec">
<rect key="frame" x="305" y="33.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wuq-Qz-gAj">
<rect key="frame" x="15" y="38.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="2UX-LB-mec" firstAttribute="centerY" secondItem="b1H-lz-RdM" secondAttribute="centerY" id="0bK-mz-0ig"/>
<constraint firstItem="dYv-Zp-euR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="0wv-nq-HIl"/>
<constraint firstItem="wuq-Qz-gAj" firstAttribute="leading" secondItem="b1H-lz-RdM" secondAttribute="leading" id="4Oe-sZ-pRd"/>
<constraint firstAttribute="trailing" secondItem="dYv-Zp-euR" secondAttribute="trailing" id="5qC-9a-KH9"/>
<constraint firstItem="b1H-lz-RdM" firstAttribute="leading" secondItem="U3t-Za-6cK" secondAttribute="leading" id="BMK-Ff-YRD"/>
<constraint firstItem="wuq-Qz-gAj" firstAttribute="top" secondItem="b1H-lz-RdM" secondAttribute="bottom" constant="5" id="Dkn-Jh-Jmt"/>
<constraint firstItem="U3t-Za-6cK" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="FVo-YQ-ckR"/>
<constraint firstAttribute="bottom" secondItem="dYv-Zp-euR" secondAttribute="bottom" id="TZJ-Tc-FZd"/>
<constraint firstItem="U3t-Za-6cK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="WVW-9J-eAb"/>
<constraint firstAttribute="trailing" secondItem="2UX-LB-mec" secondAttribute="trailing" constant="15" id="Wgd-9J-TbA"/>
<constraint firstItem="b1H-lz-RdM" firstAttribute="top" secondItem="U3t-Za-6cK" secondAttribute="bottom" constant="5" id="t46-JY-Qmz"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="order_id_lbl" destination="U3t-Za-6cK" id="m76-86-e0d"/>
<outlet property="order_id_lbl2" destination="wuq-Qz-gAj" id="Br8-9Z-on5"/>
<outlet property="price_lbl" destination="2UX-LB-mec" id="li6-X0-YED"/>
<outlet property="time_lbl" destination="b1H-lz-RdM" id="DP7-LG-V2R"/>
</connections>
<point key="canvasLocation" x="142" y="103"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="多选按钮字体颜色">
<color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.swift 0 → 100644
View file @ 492c9bbf
//
// FXSY_ViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/12/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class FXSY_ViewController: BaseViewController,GLTimeSelectViewDelegate,UITableViewDelegate,UITableViewDataSource, UISearchBarDelegate, SearchBarViewDelegate, GLAlertSelectViewDelegate{
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
view.removeFromSuperview()
glSelectView = nil
}
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
inc_exp_type = selectNum
getData()
view.removeFromSuperview()
glSelectView = nil
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return dataArr.count
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 84
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = dataArr[indexPath.row]
// model.order_sn
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "FXSY_Cell") as! FXSY_Cell
let data = model?.res![indexPath.row]
if data != nil {
cell.order_id_lbl.text = "#"+(data?.record_sn)!
cell.time_lbl.text = data?.add_time!
cell.price_lbl.text = data?.in_amount!
cell.order_id_lbl2.text = (data?.order_sn!)! + "(" + (data?.remark!)! + ")"
}
return cell
}
var dataArr:Array<dbtIncomeInfoDatasModel> = []
@IBOutlet weak var top_view_h: NSLayoutConstraint!
@IBOutlet weak var top_view: UIView!
func GLTimeSelectViewSelectFinish(date: String) {
if date.count == 4 {
date_lbl.text = date + "年"
}else if date.count > 4 && date.count <= 7 {
let arr = date.components(separatedBy: "-")
date_lbl.text = arr.first! + "年" + arr.last! + "月"
}else{
let arr = date.components(separatedBy: "-")
date_lbl.text = arr.first! + "年" + arr[1] + "月" + arr.last! + "日"
}
strNowTime = date
getData()
}
@IBAction func date_select_action(_ sender: Any) {
let vc = GLTimeSelectView(frame: self.view.bounds)
vc.delegate = self
vc.dateStr = strNowTime
self.view.addSubview(vc)
}
var role_type = 1
var inc_exp_type = 0
var keyword = ""
@IBAction func top_btn_click(_ sender: UIButton) {
if sender == left_btn {
left_btn.isSelected = true
right_btn.isSelected = false
self.bottom_line.snp.updateConstraints { (make) in
make.width.equalTo(ScreenWidth*0.5)
make.height.equalTo(3)
make.left.equalTo(0)
make.top.equalTo(self.left_btn.snp_bottom)
}
role_type = 1
}else{
left_btn.isSelected = false
right_btn.isSelected = true
role_type = 2
self.bottom_line.snp.updateConstraints { (make) in
make.left.width.equalTo(ScreenWidth*0.5)
make.height.equalTo(3)
make.top.equalTo(self.left_btn.snp_bottom)
}
}
getData()
}
func getData(){
var year = "0"
var month = "0"
var day = "0"
if strNowTime.count == 4 {
year = strNowTime
}else if strNowTime.count > 4 && strNowTime.count <= 7 {
let arr = strNowTime.components(separatedBy: "-")
year = arr.first!
month = arr.last!
}else{
let arr = strNowTime.components(separatedBy: "-")
year = arr.first!
month = arr[1]
day = arr.last!
}
let dic = ["user_token":UserToken as Any,
"role_type":role_type as Any,
"inc_exp_type":inc_exp_type as Any,
"keyword":keyword as Any,
"year":year as Any,
"month":month as Any,
"day":day as Any
]
loadData(dic: dic)
}
var glSelectView:GLAlertSelectView?
@IBOutlet weak var right_btn: UIButton!
@IBOutlet weak var left_btn: UIButton!
@IBOutlet weak var bottom_line: UIView!
@IBAction func type_select(_ sender: Any) {
if glSelectView == nil {
let view = GLAlertSelectView(frame: self.view.bounds)
view.titleLbl.text = "请选择国家"
view.delegate = self
view.dataArr = ["收入","支出"]
view.selectNum = inc_exp_type
self.view.addSubview(view)
glSelectView = view
}
}
@IBOutlet weak var arrow_img: UIImageView!
@IBOutlet weak var refuse_lbl: UILabel!
@IBOutlet weak var income_lbl: UILabel!
@IBOutlet weak var date_lbl: UILabel!
@IBOutlet weak var search_view: UIView!
@IBOutlet weak var gys_list: UITableView!
// @IBOutlet weak var fxs_list: UITableView!
weak var searchV: SearchBarView? = nil
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
if keyword.count > 0 {
getData()
}
}
//MARK:--取消搜索代理
func clearSearchAction() {
print("取消搜索代理了--")
}
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--")
removeBlackBtnView()
if keyword.count > 0 {
keyword = searchBar.text!
if keyword.count == 0 {
getData()
}
}
}
@objc func removeBlackBtnView(){
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
time_select_btn.isUserInteractionEnabled = true
}
}
@IBOutlet weak var time_select_btn: UIButton!
var blackBtnView:UIButton! = nil
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
print("调起搜索后添加个蒙版本")
blackBtnView = UIButton ()
time_select_btn.isUserInteractionEnabled = false
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
self.view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.top.equalTo(search_view!.snp_bottom)
make.left.right.bottom.equalToSuperview()
}
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
blackBtnView.isUserInteractionEnabled = false
return true
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var strNowTime = ""
func getDate()->Array<Int>{
let date = Date()
let timeFormatter = DateFormatter()
//日期显示格式，可按自己需求显示
timeFormatter.dateFormat = "yyyy-MM-dd"
strNowTime = timeFormatter.string(from: date) as String
let dateArr = strNowTime.components(separatedBy: "-")
let year = Int(dateArr.first!)!
let month = Int(dateArr[1])!
let day = Int(dateArr[2])!
return [year,month,day]
}
var model:dbtIncomeInfoDataModel?
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "分销收益"
self.view.addSubview(navbar)
gys_list.separatorStyle = .none
gys_list.showsVerticalScrollIndicator = false
gys_list.register(UINib(nibName: "FXSY_Cell", bundle: nil), forCellReuseIdentifier: "FXSY_Cell")
let searchBr = SearchBarView.init()
searchV = searchBr
self.search_view.addSubview(searchBr)
searchV?.changecornerRadius(cornerRadius: 35*0.5)
searchBr.placeholderStr = "请输入订单编号"
searchBr.delegate = self
searchBr.delegateL = self
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(0)
make.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
let arr = getDate()
date_lbl.text = "\(arr.first!)年\(arr[1])月\(arr.last!)日"
let dic = ["user_token":UserToken as Any,
"role_type":"" as Any,
"inc_exp_type":inc_exp_type as Any,
"keyword":keyword as Any,
"year":"" as Any,
"month":"" as Any,
"day":"" as Any
]
loadData(dic: dic)
}
var isFirstTime = true
func loadData(dic:Dictionary<String,Any>){
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)
}
if self.model?.exp != nil {
self.refuse_lbl.text = "支出:¥"+String(format: "%.02f", self.model?.exp as! CVarArg)
}
self.dataArr.removeAll()
self.model?.res?.forEach({ (item) in
self.dataArr.append(item)
})
self.gys_list.reloadData()
if self.isFirstTime {
self.isFirstTime = false
if self.model?.is_dbt == 1 && self.model?.is_sup == 0 {
self.role_type = 2
self.left_btn.isSelected = false
self.right_btn.isSelected = true
self.bottom_line.snp.updateConstraints { (make) in
make.left.width.equalTo(ScreenWidth*0.5)
make.height.equalTo(3)
make.top.equalTo(self.left_btn.snp_bottom)
}
}
if self.model?.is_sup == 1 && self.model?.is_dbt == 1 {
self.top_view.isHidden = false
self.bottom_line.isHidden = false
SetTopFrame(view: self.top_view, height: 44)
}else{
self.top_view.isHidden = true
SetTopFrame(view: self.top_view, height: 0.00001)
}
}
} failture: { (err) in
}
}
}
GeliBusinessPlatform/ViewController/分销收益页/FXSY_ViewController.xib 0 → 100644
View file @ 492c9bbf
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FXSY_ViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="arrow_img" destination="LRJ-fs-pAL" id="I0L-fH-eGz"/>
<outlet property="bottom_line" destination="IxS-20-RHd" id="ySN-mt-ImV"/>
<outlet property="date_lbl" destination="p0d-nN-gRY" id="32x-fS-Ztn"/>
<outlet property="gys_list" destination="x8A-F9-ceB" id="r5R-8a-geu"/>
<outlet property="income_lbl" destination="Bxv-vi-fqZ" id="cTf-ig-rKc"/>
<outlet property="left_btn" destination="oz8-MC-aZt" id="511-qe-BKP"/>
<outlet property="refuse_lbl" destination="WW0-jT-mpV" id="YWH-Ad-Bim"/>
<outlet property="right_btn" destination="67A-fb-ve2" id="ycR-Zq-5xs"/>
<outlet property="search_view" destination="UKe-tW-CyK" id="wnc-Uv-VwN"/>
<outlet property="time_select_btn" destination="LLc-OZ-DX2" id="kaq-qL-iJs"/>
<outlet property="top_view" destination="WSB-Vn-KNN" id="qWg-yo-cin"/>
<outlet property="top_view_h" destination="qGv-cC-f7b" id="c1U-ul-JHn"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WSB-Vn-KNN">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oz8-MC-aZt">
<rect key="frame" x="0.0" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="供应商收益">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<state key="selected" title="供应商收益">
<color key="titleColor" name="按钮渐变色下,字体颜色"/>
</state>
<connections>
<action selector="top_btn_click:" destination="-1" eventType="touchUpInside" id="6FW-jJ-1Bw"/>
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="67A-fb-ve2">
<rect key="frame" x="207" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="分销商收益">
<color key="titleColor" name="多选按钮字体颜色"/>
</state>
<state key="selected" title="分销商收益">
<color key="titleColor" name="按钮渐变色下,字体颜色"/>
</state>
<connections>
<action selector="top_btn_click:" destination="-1" eventType="touchUpInside" id="9Ac-P3-mwH"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="67A-fb-ve2" firstAttribute="top" secondItem="WSB-Vn-KNN" secondAttribute="top" id="7nB-lT-Fwk"/>
<constraint firstItem="oz8-MC-aZt" firstAttribute="top" secondItem="WSB-Vn-KNN" secondAttribute="top" id="Bgs-MJ-FRj"/>
<constraint firstItem="67A-fb-ve2" firstAttribute="leading" secondItem="oz8-MC-aZt" secondAttribute="trailing" id="Pof-Pw-f20"/>
<constraint firstItem="67A-fb-ve2" firstAttribute="width" secondItem="oz8-MC-aZt" secondAttribute="width" id="QiC-TE-0Y4"/>
<constraint firstAttribute="bottom" secondItem="67A-fb-ve2" secondAttribute="bottom" id="VfI-TA-58A"/>
<constraint firstAttribute="trailing" secondItem="67A-fb-ve2" secondAttribute="trailing" id="hCp-si-9Ty"/>
<constraint firstItem="oz8-MC-aZt" firstAttribute="leading" secondItem="WSB-Vn-KNN" secondAttribute="leading" id="hhF-eh-act"/>
<constraint firstAttribute="height" constant="44" id="qGv-cC-f7b"/>
<constraint firstAttribute="bottom" secondItem="oz8-MC-aZt" secondAttribute="bottom" id="yjz-Qy-gGg"/>
</constraints>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IxS-20-RHd">
<rect key="frame" x="0.0" y="88" width="207" height="3"/>
<color key="backgroundColor" name="按钮渐变色下,字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="3" id="q3l-Fx-Tde"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="1.5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bVM-Rj-Ldp">
<rect key="frame" x="0.0" y="91" width="414" height="53"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9no-gN-m2H">
<rect key="frame" x="347" y="0.0" width="52" height="53"/>
<constraints>
<constraint firstAttribute="width" constant="52" id="huf-HQ-Jxk"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="收支类型"/>
<connections>
<action selector="type_select:" destination="-1" eventType="touchUpInside" id="BLT-4x-LRg"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UKe-tW-CyK">
<rect key="frame" x="15" y="0.0" width="317" height="53"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="53" id="4kY-da-omi"/>
<constraint firstAttribute="bottom" secondItem="9no-gN-m2H" secondAttribute="bottom" id="5jw-RP-Kjv"/>
<constraint firstAttribute="bottom" secondItem="UKe-tW-CyK" secondAttribute="bottom" id="8Mj-WT-8V4"/>
<constraint firstAttribute="trailing" secondItem="9no-gN-m2H" secondAttribute="trailing" constant="15" id="Jnz-Qa-IUE"/>
<constraint firstItem="9no-gN-m2H" firstAttribute="leading" secondItem="UKe-tW-CyK" secondAttribute="trailing" constant="15" id="gai-Rh-DDg"/>
<constraint firstItem="9no-gN-m2H" firstAttribute="top" secondItem="bVM-Rj-Ldp" secondAttribute="top" id="qKY-5c-ozT"/>
<constraint firstItem="UKe-tW-CyK" firstAttribute="leading" secondItem="bVM-Rj-Ldp" secondAttribute="leading" constant="15" id="uUN-2w-P68"/>
<constraint firstItem="UKe-tW-CyK" firstAttribute="top" secondItem="bVM-Rj-Ldp" secondAttribute="top" id="wH8-LJ-hmh"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Agb-5D-GhT">
<rect key="frame" x="0.0" y="144" width="414" height="87.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0d-nN-gRY">
<rect key="frame" x="15" y="20" width="44" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="XpY-IB-o9U"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bxv-vi-fqZ">
<rect key="frame" x="15" y="54" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WW0-jT-mpV">
<rect key="frame" x="30" y="54" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LRJ-fs-pAL">
<rect key="frame" x="64" y="29" width="12" height="6"/>
<constraints>
<constraint firstAttribute="height" constant="6" id="6h3-zg-g2Y"/>
<constraint firstAttribute="width" constant="12" id="d6H-QU-A90"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LLc-OZ-DX2">
<rect key="frame" x="0.0" y="0.0" width="414" height="87.5"/>
<connections>
<action selector="date_select_action:" destination="-1" eventType="touchUpInside" id="z4H-Pt-0Fj"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.90196078431372551" green="0.91764705882352937" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="LLc-OZ-DX2" secondAttribute="bottom" id="Gug-G2-us1"/>
<constraint firstItem="p0d-nN-gRY" firstAttribute="top" secondItem="Agb-5D-GhT" secondAttribute="top" constant="20" id="PPM-bv-iF6"/>
<constraint firstItem="LLc-OZ-DX2" firstAttribute="leading" secondItem="Agb-5D-GhT" secondAttribute="leading" id="UMT-Qk-Q0c"/>
<constraint firstAttribute="trailing" secondItem="LLc-OZ-DX2" secondAttribute="trailing" id="cN3-HA-O8B"/>
<constraint firstAttribute="height" constant="87.5" id="fKJ-GL-IrP"/>
<constraint firstItem="LRJ-fs-pAL" firstAttribute="leading" secondItem="p0d-nN-gRY" secondAttribute="trailing" constant="5" id="g2R-00-lCd"/>
<constraint firstItem="p0d-nN-gRY" firstAttribute="leading" secondItem="Agb-5D-GhT" secondAttribute="leading" constant="15" id="gFf-aY-Idf"/>
<constraint firstItem="LLc-OZ-DX2" firstAttribute="top" secondItem="Agb-5D-GhT" secondAttribute="top" id="hof-1E-QQe"/>
<constraint firstItem="WW0-jT-mpV" firstAttribute="centerY" secondItem="Bxv-vi-fqZ" secondAttribute="centerY" id="jxj-vy-qLO"/>
<constraint firstItem="Bxv-vi-fqZ" firstAttribute="top" secondItem="p0d-nN-gRY" secondAttribute="bottom" constant="10" id="pzi-hu-9lq"/>
<constraint firstItem="LRJ-fs-pAL" firstAttribute="centerY" secondItem="p0d-nN-gRY" secondAttribute="centerY" id="rgE-jf-N9Z"/>
<constraint firstItem="WW0-jT-mpV" firstAttribute="leading" secondItem="Bxv-vi-fqZ" secondAttribute="trailing" constant="15" id="v0K-Qx-suZ"/>
<constraint firstItem="Bxv-vi-fqZ" firstAttribute="leading" secondItem="p0d-nN-gRY" secondAttribute="leading" id="wBd-5w-aua"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="x8A-F9-ceB">
<rect key="frame" x="0.0" y="231.5" width="414" height="664.5"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="lzg-Kc-PQT"/>
<outlet property="delegate" destination="-1" id="J1J-9y-9B9"/>
</connections>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="Agb-5D-GhT" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="0yT-7f-y6P"/>
<constraint firstItem="WSB-Vn-KNN" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="2mp-e7-uPo"/>
<constraint firstItem="WSB-Vn-KNN" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="7m6-nL-EBm"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="WSB-Vn-KNN" secondAttribute="trailing" id="CnI-wo-2Vl"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Agb-5D-GhT" secondAttribute="trailing" id="P5u-N7-vtX"/>
<constraint firstAttribute="bottom" secondItem="x8A-F9-ceB" secondAttribute="bottom" id="Pt8-vh-lRl"/>
<constraint firstItem="IxS-20-RHd" firstAttribute="width" secondItem="oz8-MC-aZt" secondAttribute="width" id="QOg-Go-jvb"/>
<constraint firstItem="IxS-20-RHd" firstAttribute="top" secondItem="WSB-Vn-KNN" secondAttribute="bottom" id="R4g-Nd-3rz"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="bVM-Rj-Ldp" secondAttribute="trailing" id="WIT-60-9Ri"/>
<constraint firstItem="x8A-F9-ceB" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="aIP-0Y-veR"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="x8A-F9-ceB" secondAttribute="trailing" id="dJO-9v-RjF"/>
<constraint firstItem="Agb-5D-GhT" firstAttribute="top" secondItem="bVM-Rj-Ldp" secondAttribute="bottom" id="dKP-38-e8r"/>
<constraint firstItem="IxS-20-RHd" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="eKf-c6-rbc"/>
<constraint firstItem="bVM-Rj-Ldp" firstAttribute="top" secondItem="IxS-20-RHd" secondAttribute="bottom" id="jCp-qB-ztS"/>
<constraint firstItem="bVM-Rj-Ldp" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="npf-z2-EPD"/>
<constraint firstItem="x8A-F9-ceB" firstAttribute="top" secondItem="Agb-5D-GhT" secondAttribute="bottom" id="ywx-kA-VKG"/>
</constraints>
<point key="canvasLocation" x="-200.00000000000003" y="92.410714285714278"/>
</view>
</objects>
<resources>
<namedColor name="多选按钮字体颜色">
<color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 492c9bbf
......@@ -634,6 +634,17 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case 139: //分销员管理
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 140://待审核分销员管理
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 141://分销客户管理
HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 142://分销收益管理
let vc = FXSY_ViewController()
self.navigationController?.pushViewController(vc, animated: true)
// HUD.flash(.label("敬请期待"),delay: 1.2)
return
case 136: //分销商品管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = FX_Product_GuanLiVC()
......
GeliBusinessPlatform/ViewController/采购单列表/CGDListViewController.swift
View file @ 492c9bbf
......@@ -38,8 +38,10 @@ class CGDListViewController: BaseViewController ,UISearchBarDelegate, SearchBar
var searchV : SearchBarView? = nil
func rightBtnClick() {
removeBlackBtnView()
removeBlackBtnView()
let vc = XinCaiGouViewController()
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment