Skip to content

G
GeliBusinessPlatform
Commit d0071fa7 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

完成分销订单最新修正

parent 04e100aa
Show whitespace changes
Inline Side-by-side
Showing with 531 additions and 162 deletions
GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift
View file @ d0071fa7
......@@ -88,6 +88,7 @@ class dbtOrderLisModel: Mappable {
class dbtOrderLisDataModel: Mappable {
var order_id:Int?
var shop_id:Int?
var order_sn : String?
var dbt_type:Int?
var dbt_target : Int?
......@@ -96,12 +97,14 @@ class dbtOrderLisDataModel: Mappable {
var commission_status:Int?
var user_name : String?
var order_goods:Array<dbtOrderLisGoodsDataModel>?
var pay_status:Int? //支付状态;0未付款;1欠款;2已付款3付款异常,线下汇款（4待提交凭证，5审核中，6重新提交凭证，7审核成功）,8(部分)账期支付,9欠款(废弃)
required init?( map: Map) {
}
func mapping(map: Map) {
order_id <- map["order_id"]
shop_id <- map["shop_id"]
order_sn <- map["order_sn"]
dbt_type <- map["dbt_type"]
dbt_target <- map["dbt_target"]
......@@ -110,12 +113,15 @@ class dbtOrderLisDataModel: Mappable {
commission_status <- map["commission_status"]
user_name <- map["user_name"]
order_goods <- map["order_goods"]
pay_status <- map["pay_status"]
}
}
class dbtOrderLisGoodsDataModel: Mappable {
var goods_name:String?
var goods_number : Int?
var amount:String?
required init?( map: Map) {
......@@ -123,6 +129,8 @@ class dbtOrderLisGoodsDataModel: Mappable {
func mapping(map: Map) {
goods_name <- map["goods_name"]
goods_number <- map["goods_number"]
amount <- map["amount"]
}
}
//MARK: - 供应商铺货界面商品和商家查询
......
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17125"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @ d0071fa7
......@@ -31,12 +31,23 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
}
//MARK:--加载数据
var orderId:Int? //订单编号
var dbt_shop_id:Int? = nil
var dataMdoel: OrderDetailDataModel? = nil
let UserToken = UserDefaults.standard.value(forKey: "user_token")
func loadData() {
HUD.flash(.progress)
if dbt_shop_id != nil {
orderDetail(["user_token":UserToken as Any,"order_id":orderId as Any,"dbt_shop_id" : dbt_shop_id as Any], success: { [self] (data) in
HUD.hide(animated: true)
let dataM = data as! OrderDetailModel
self.dataMdoel = dataM.data
self.listView.reloadData()
}) { (error) in
self.listView.isHidden = true
}
}else{
orderDetail(["user_token":UserToken as Any,"order_id":orderId as Any], success: { [self] (data) in
HUD.hide(animated: true)
let dataM = data as! OrderDetailModel
......@@ -47,6 +58,8 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
self.listView.isHidden = true
}
}
}
func numberOfSections(in tableView: UITableView) -> Int {
if self.dataMdoel == nil {
return 0
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @ d0071fa7
......@@ -10,14 +10,99 @@ import UIKit
class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte,UITableViewDelegate,UITableViewDataSource,RetailManageFooterViewDelagte, GeliAlertViewDelegate{
var page : Int = 0
var page2 : Int = 0
var ischange:Bool = false
var ischange2:Bool = false
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var startTime :Int? = 0
var endTime :Int? = 0
var dbt_type : Int = 0
var dbt_target : Int = 0
var dbt_people : Int = 1 //分销人类型（1我的订单分销，2代销订单）
@IBOutlet weak var lineVceX: NSLayoutConstraint!
@IBOutlet weak var saleBtn: UIButton!
@IBOutlet weak var mySaleBtn: UIButton!
@IBAction func seclectSaleTypeAction(_ sender: UIButton) {
if showSelectV != nil {
showSelectV.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
if timeShowDView != nil {
timeShowDView.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
searchV?.text = keyword
}
if sender == saleBtn {
lineVceX.constant = ScreenWidth/2.0
saleBtn.setTitleColor(UIColor.init(named: "蓝色字体颜色"), for: .normal)
mySaleBtn.setTitleColor(UIColor.init(named: "灰色字体颜色"), for: .normal)
seclectSaleType = 1
}else{
lineVceX.constant = 0
saleBtn.setTitleColor(UIColor.init(named: "灰色字体颜色"), for: .normal)
mySaleBtn.setTitleColor(UIColor.init(named: "蓝色字体颜色"), for: .normal)
seclectSaleType = 0
}
self.listView.reloadData()
if seclectSaleType == 1 {
if self.dataArr2.count == 0 {
ischange2 = false
listView.mj_header?.beginRefreshing()
}else{
if ischange2 {
ischange2 = false
listView.mj_header?.beginRefreshing()
}else{
if indexP2 != nil {
if self.dataArr2.count >= indexP2!.row {
listView.scrollToRow(at: indexP2!, at: .top, animated: false)
}
}
}
}
}else{
if self.dataArr.count == 0 {
ischange = false
listView.mj_header?.beginRefreshing()
}else{
if ischange {
ischange = false
listView.mj_header?.beginRefreshing()
}else{
if indexP != nil {
if self.dataArr.count >= indexP!.row {
listView.scrollToRow(at: indexP!, at: .top, animated: false)
}
}
}
}
}
}
var indexP2 : IndexPath? = nil
var indexP : IndexPath? = nil
@IBOutlet weak var selectTpyeView: UIView!
var seclectSaleType = 0
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBgView: UIView!
@IBOutlet weak var changeBgView: UIView!
override func viewDidLoad() {
......@@ -25,7 +110,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
navbar.title = "分销订单管理"
navbar.lineView.isHidden = true
self.view.addSubview(navbar)
SetTopFrame(view: searchBgView, height: 45)
SetTopFrame(view: selectTpyeView, height: 45)
//searchbar
initSearchBar()
......@@ -40,6 +125,8 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
listView.mj_footer = footerMJ
listView.mj_header?.beginRefreshing()
}
//MARK:--initSearchBar
weak var searchV: SearchBarView? = nil
......@@ -53,7 +140,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
make.height.equalTo(35)
}
searchV = searchBr
searchBr.placeholderStr = "请输入分销员/分销商"
searchBr.placeholderStr = "请输入订单编号/商品名称"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
......@@ -67,7 +154,12 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
if keyword.count > 0 {
keyword = searchBar.text!
if keyword.count == 0 {
loadData()
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
}
removeBlackBtnView()
......@@ -78,7 +170,13 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
......@@ -118,9 +216,16 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
func initHeaderSelectView() {
let selectView = HeaderSelectView()
selectView.firstBtn.setTitle("结算方式", for: .normal)
selectView.secBtn.setTitle("订单类型", for: .normal)
selectView.thereBtn.setTitle("结算时间", for: .normal)
selectView.secBtn.setTitle("结算时间", for: .normal)
selectView.thereBtn.removeFromSuperview()
selectView.firstBtn.snp_makeConstraints { (make) in
make.left.top.bottom.equalTo(0)
make.width.equalTo(fullScreenWidth*0.5)
}
selectView.secBtn.snp_makeConstraints { (make) in
make.right.top.bottom.equalTo(0)
make.width.equalTo(fullScreenWidth*0.5)
}
changeBgView.addSubview(selectView)
selectView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalTo(0);
......@@ -148,21 +253,6 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
break
case 1:
do {
let showSelectView = SelectContentView()
showSelectView.delegate = self
self.view.addSubview(showSelectView)
showSelectView.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(changeBgView.snp_bottom)
}
showSelectV = showSelectView
showSelectView.dataArr = ["全部", "分销商订单", "分销员订单"]
showSelectView.selectIndx = selectIndexArr[1]
}
break
case 2:
do {
//选择时间
let timeShowDownView = TimeShowDownView()
......@@ -201,6 +291,11 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
selectIndexArr[showSelectvIndex] = sender
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
func selectContentvRemoveForSup() {
......@@ -221,30 +316,56 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
startTime = Int(timeInterval)
endTime = Int(timeIntervalEnd)
}
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
//MARK:--loadData
//MARK:--列表数据源
var dataArr:Array<dbtOrderLisDataModel> = []
var dataArr2:Array<dbtOrderLisDataModel> = []
@objc func loadData(){
//结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
//分销商订单（0全部2分销商 3分销员）
dbt_type = selectIndexArr[0]
if selectIndexArr[1] == 0 {
dbt_target = 0
}else if selectIndexArr[1] == 1 {
dbt_target = 2
var pageNum = 1
}else if selectIndexArr[1] == 2 {
dbt_target = 3
}
if seclectSaleType == 1 {
page2 = 1
dbt_people = 2
pageNum = page2
}else{
page = 1
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_target":dbt_target,"start_time":startTime as Any,"end_time":endTime as Any]
dbt_people = 1
pageNum = page
}
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":pageNum,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel
if self.seclectSaleType == 1 {
self.dataArr2.removeAll()
dataM.data?.forEach({ (model) in
self.dataArr2.append(model)
})
self.listView.mj_header?.endRefreshing()
self.listView.reloadData()
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
self.listView.mj_footer?.endRefreshing()
}
self.page2 = 2
}else{
self.dataArr.removeAll()
dataM.data?.forEach({ (model) in
self.dataArr.append(model)
......@@ -258,16 +379,45 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
self.listView.mj_footer?.endRefreshing()
}
self.page = 2
}
} failture: { (error) in
self.listView.mj_header?.endRefreshing()
}
}
@objc func loadMoreData(){
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_target":dbt_target,"start_time":startTime as Any,"end_time":endTime as Any]
dbt_type = selectIndexArr[0]
var pageNum = 2
if seclectSaleType == 1 {
dbt_people = 2
pageNum = page2
}else{
dbt_people = 1
pageNum = page
}
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":pageNum,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel
if self.seclectSaleType == 1 {
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
self.page2 += 1
dataM.data?.forEach({ (model) in
self.dataArr2.append(model)
})
self.listView.reloadData()
self.listView.mj_footer?.endRefreshing()
}
}else{
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
......@@ -278,26 +428,57 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
self.listView.reloadData()
self.listView.mj_footer?.endRefreshing()
}
}
} failture: { (error) in
self.listView.mj_footer?.endRefreshing()
}
}
func numberOfSections(in tableView: UITableView) -> Int {
if self.seclectSaleType == 1 {
return self.dataArr2.count
}
return self.dataArr.count
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if self.seclectSaleType == 1 {
let goodArrModel = self.dataArr2[section]
return goodArrModel.order_goods!.count
}
let goodArrModel = self.dataArr[section]
return goodArrModel.order_goods!.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
if self.seclectSaleType == 1 {
let goodArrModel = self.dataArr2[indexPath.section]
let goodModel = goodArrModel.order_goods![indexPath.row]
cell.goodsLbl.text = goodModel.goods_name
cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
cell.priceLbl.text = "￥" + goodModel.amount!
if (indexPath.row + 1) == goodArrModel.order_goods?.count {
cell.dotImgV.isHidden = true
}else{
cell.dotImgV.isHidden = false
}
}else{
let goodArrModel = self.dataArr[indexPath.section]
let goodModel = goodArrModel.order_goods![indexPath.row]
cell.goodsLbl.text = goodModel.goods_name
cell.numLbl.text = "x" + StringByInt(number: goodModel.goods_number!)
cell.priceLbl.text = "￥" + goodModel.amount!
if (indexPath.row + 1) == goodArrModel.order_goods?.count {
cell.dotImgV.isHidden = true
......@@ -305,24 +486,50 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}else{
cell.dotImgV.isHidden = false
}
}
if seclectSaleType == 1 {
indexP2 = indexPath
}else{
indexP = indexPath
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if self.seclectSaleType == 1 {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr2[indexPath.section]
vc.orderId = goodArrModel.order_id
vc.dbt_shop_id = goodArrModel.shop_id
self.navigationController?.pushViewController(vc, animated: true)
}else{
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[indexPath.section]
vc.orderId = goodArrModel.order_id
self.navigationController?.pushViewController(vc, animated: true)
}
}
@objc func didselectCellHorF(sender:UITapGestureRecognizer){
if seclectSaleType == 1 {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr2[sender.view!.tag]
vc.orderId = goodArrModel.order_id
vc.dbt_shop_id = goodArrModel.shop_id
self.navigationController?.pushViewController(vc, animated: true)
}else{
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr[sender.view!.tag]
vc.orderId = goodArrModel.order_id
self.navigationController?.pushViewController(vc, animated: true)
}
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if self.seclectSaleType == 1 {
let headerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
headerV.addGestureRecognizer(tap)
......@@ -333,37 +540,77 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.nameLbl.text = model.user_name
contentV.payTypeLbl.isHidden = false
if model.dbt_type == 1 {
contentV.payTypeLbl.text = "人工"
contentV.comLeft.constant = 40
}else{
contentV.payTypeLbl.isHidden = true
contentV.comLeft.constant = 8
let model = self.dataArr2[section]
contentV.snNumLbl.text = model.order_sn
var dbt_typeStr = "人工结算"
if model.dbt_type == 2 {
dbt_typeStr = "自动结算"
}
contentV.comTypeLbl.isHidden = false
if model.dbt_target == 1 {
contentV.comTypeLbl.text = "供应商"
if model.pay_status == 2 {
contentV.stateLbl.text = "已付款/" + dbt_typeStr
}else if model.dbt_target == 2 {
contentV.comTypeLbl.text = "分销商"
}else{
contentV.stateLbl.text = "未付款/" + dbt_typeStr
}else if model.dbt_target == 3 {
contentV.comTypeLbl.text = "分销员"
}
return headerV
}else{
contentV.comTypeLbl.isHidden = true
let headerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
headerV.addGestureRecognizer(tap)
headerV.tag = section
let contentV = RetailManageHeaderView()
headerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.snNumLbl.text = model.order_sn
var dbt_typeStr = "人工结算"
if model.dbt_type == 2 {
dbt_typeStr = "自动结算"
}
if model.pay_status == 2 {
contentV.stateLbl.text = "已付款/" + dbt_typeStr
}else{
contentV.stateLbl.text = "未付款/" + dbt_typeStr
}
return headerV
}
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 88
return 50
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
if self.seclectSaleType == 1 {
let footerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
footerV.addGestureRecognizer(tap)
footerV.tag = section
let contentV = RetailManageFooterView()
footerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr2[section]
contentV.priceLbl.text = model.sum_amount!
if model.commission_status == 1 {
contentV.moneyLbl.text = model.sum_commission_val! + "(已结算)"
}else{
contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
}
contentV.actionBtn.tag = section
contentV.delgate = self
return footerV
}else{
let footerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
footerV.addGestureRecognizer(tap)
......@@ -375,11 +622,20 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.moneyLbl.text = model.sum_amount! + "(佣金" + model.sum_commission_val! + "元)"
contentV.priceLbl.text = model.sum_amount!
if model.commission_status == 1 {
contentV.moneyLbl.text = model.sum_commission_val! + "(已结算)"
}else{
contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
}
contentV.actionBtn.tag = section
contentV.delgate = self
return footerV
}
}
func tapRetailManageFooterBtnAction(sender: Int) {
//标记为人工结算
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......@@ -392,6 +648,18 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
func sureGeliAlertViewAction(sender: UIButton) {
HUD.flash(.progress)
if seclectSaleType == 1 {
let model = self.dataArr2[sender.tag]
editCommissionStatus(["user_token":UserToken as Any,"order_id":model.order_id as Any]) { (data) in
HUD.hide()
model.commission_status = 1
HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
self.listView.reloadSections([sender.tag], with: .none)
} failture: { (error) in
}
}else{
let model = self.dataArr[sender.tag]
editCommissionStatus(["user_token":UserToken as Any,"order_id":model.order_id as Any]) { (data) in
HUD.hide()
......@@ -402,10 +670,24 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
} failture: { (error) in
}
}
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
if self.seclectSaleType == 1 {
let model = self.dataArr2[section]
//已结算
if model.commission_status == 1 {
return 48
}
//或 自动结算 不需要显示标记
if model.dbt_type == 2 {
return 48
}
return 100
}else{
let model = self.dataArr[section]
//已结算
if model.commission_status == 1 {
......@@ -417,4 +699,6 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
return 100
}
}
}
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
......@@ -13,8 +13,12 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RetailManageViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="changeBgView" destination="Dne-dW-uPU" id="U0z-0u-4EA"/>
<outlet property="lineVceX" destination="u4V-SZ-opk" id="Zyw-gj-5dZ"/>
<outlet property="listView" destination="rD1-9Z-Grg" id="zax-lF-6eL"/>
<outlet property="mySaleBtn" destination="3OR-5G-5HO" id="kh2-Vk-hpQ"/>
<outlet property="saleBtn" destination="r9G-mS-IAE" id="t4m-7s-pc0"/>
<outlet property="searchBgView" destination="9De-Db-9oa" id="i9d-Xs-UPi"/>
<outlet property="selectTpyeView" destination="cdm-Hu-SP9" id="oiW-5G-Hv2"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......@@ -24,45 +28,123 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9De-Db-9oa">
<rect key="frame" x="0.0" y="44" width="414" height="45"/>
<rect key="frame" x="0.0" y="89" width="414" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="Ypr-rF-zvE"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dne-dW-uPU">
<rect key="frame" x="0.0" y="89" width="414" height="45"/>
<rect key="frame" x="0.0" y="134" width="414" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="6Ma-LE-6Vg"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="rD1-9Z-Grg">
<rect key="frame" x="0.0" y="134" width="414" height="762"/>
<rect key="frame" x="0.0" y="179" width="414" height="717"/>
<color key="backgroundColor" name="app底色"/>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cdm-Hu-SP9">
<rect key="frame" x="0.0" y="44" width="414" height="45"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kEe-UA-d0Z">
<rect key="frame" x="0.0" y="44" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Kkg-cI-9im"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OR-5G-5HO">
<rect key="frame" x="0.0" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="我的分销订单">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="seclectSaleTypeAction:" destination="-1" eventType="touchUpInside" id="peD-Cl-4it"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r9G-mS-IAE">
<rect key="frame" x="207" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="代销订单">
<color key="titleColor" name="灰色字体颜色"/>
</state>
<connections>
<action selector="seclectSaleTypeAction:" destination="-1" eventType="touchUpInside" id="7Mu-Vq-pMr"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jfM-BQ-3Bh" userLabel="lineView">
<rect key="frame" x="0.0" y="41" width="207" height="3"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="3" id="OYr-jN-xAy"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="1.5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="kEe-UA-d0Z" secondAttribute="trailing" id="0sM-Mj-T6s"/>
<constraint firstItem="kEe-UA-d0Z" firstAttribute="leading" secondItem="cdm-Hu-SP9" secondAttribute="leading" id="2xr-Bm-1KM"/>
<constraint firstAttribute="height" constant="45" id="8Ge-Z4-F4B"/>
<constraint firstItem="kEe-UA-d0Z" firstAttribute="top" secondItem="jfM-BQ-3Bh" secondAttribute="bottom" id="BKQ-NK-Xz9"/>
<constraint firstAttribute="trailing" secondItem="r9G-mS-IAE" secondAttribute="trailing" id="CtB-jw-GBN"/>
<constraint firstItem="kEe-UA-d0Z" firstAttribute="top" secondItem="3OR-5G-5HO" secondAttribute="bottom" id="Hgw-f4-vH1"/>
<constraint firstItem="3OR-5G-5HO" firstAttribute="top" secondItem="cdm-Hu-SP9" secondAttribute="top" id="I0q-VA-rlj"/>
<constraint firstItem="r9G-mS-IAE" firstAttribute="top" secondItem="cdm-Hu-SP9" secondAttribute="top" id="UZf-yc-kKK"/>
<constraint firstItem="kEe-UA-d0Z" firstAttribute="top" secondItem="r9G-mS-IAE" secondAttribute="bottom" id="d6o-wm-0Xo"/>
<constraint firstAttribute="centerX" secondItem="3OR-5G-5HO" secondAttribute="trailing" id="gUh-Kg-7ck"/>
<constraint firstItem="3OR-5G-5HO" firstAttribute="leading" secondItem="cdm-Hu-SP9" secondAttribute="leading" id="gkY-3S-qZN"/>
<constraint firstAttribute="bottom" secondItem="kEe-UA-d0Z" secondAttribute="bottom" id="iBT-Ms-DL0"/>
<constraint firstItem="r9G-mS-IAE" firstAttribute="leading" secondItem="3OR-5G-5HO" secondAttribute="trailing" id="nLS-tE-tqG"/>
<constraint firstItem="jfM-BQ-3Bh" firstAttribute="centerX" secondItem="3OR-5G-5HO" secondAttribute="centerX" id="u4V-SZ-opk"/>
<constraint firstItem="jfM-BQ-3Bh" firstAttribute="width" secondItem="3OR-5G-5HO" secondAttribute="width" id="xgs-sS-OE8"/>
</constraints>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="cdm-Hu-SP9" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="89d-Ym-afX"/>
<constraint firstItem="9De-Db-9oa" firstAttribute="top" secondItem="cdm-Hu-SP9" secondAttribute="bottom" id="8nC-UZ-2Ss"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="rD1-9Z-Grg" secondAttribute="trailing" id="I3i-6b-ylF"/>
<constraint firstItem="9De-Db-9oa" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="IMa-9D-pY4"/>
<constraint firstItem="Dne-dW-uPU" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="RTk-rs-WuV"/>
<constraint firstItem="cdm-Hu-SP9" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="X4h-LB-Ejd"/>
<constraint firstItem="rD1-9Z-Grg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="aEw-6L-Zh2"/>
<constraint firstAttribute="bottom" secondItem="rD1-9Z-Grg" secondAttribute="bottom" id="eeT-2r-TnA"/>
<constraint firstItem="cdm-Hu-SP9" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="hQh-BH-qYD"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Dne-dW-uPU" secondAttribute="trailing" id="iCd-pX-M1p"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="9De-Db-9oa" secondAttribute="trailing" id="iEb-Y0-FwM"/>
<constraint firstItem="9De-Db-9oa" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="rx4-C1-4Ad"/>
<constraint firstItem="cdm-Hu-SP9" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="tPL-2I-Tcs"/>
<constraint firstItem="rD1-9Z-Grg" firstAttribute="top" secondItem="Dne-dW-uPU" secondAttribute="bottom" id="vjO-k6-gBs"/>
<constraint firstItem="Dne-dW-uPU" firstAttribute="top" secondItem="9De-Db-9oa" secondAttribute="bottom" id="xzt-pE-zLt"/>
</constraints>
<point key="canvasLocation" x="109" y="127"/>
<point key="canvasLocation" x="97" y="110"/>
</view>
</objects>
<resources>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" 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="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" 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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.swift
View file @ d0071fa7
......@@ -17,6 +17,7 @@ class RetailManageFooterView: UIView {
@IBAction func ActionByBtn(_ sender: UIButton) {
delgate?.tapRetailManageFooterBtnAction(sender: sender.tag)
}
@IBOutlet weak var priceLbl: UILabel!
@IBOutlet weak var actionBtn: UIButton!
@IBOutlet weak var moneyLbl: UILabel!
@IBOutlet weak var contentBgView: UIView!
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
......@@ -15,37 +15,38 @@
<outlet property="actionBtn" destination="2A1-E3-ezo" id="F6k-yP-6HB"/>
<outlet property="contentBgView" destination="Q67-Wj-Dca" id="RdH-6q-rFn"/>
<outlet property="moneyLbl" destination="DU0-hj-Wex" id="Nip-lf-4Bw"/>
<outlet property="priceLbl" destination="rt2-yJ-U8I" id="Pdz-d6-GRm"/>
</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="331"/>
<rect key="frame" x="0.0" y="0.0" width="515" height="331"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q67-Wj-Dca">
<rect key="frame" x="15" y="0.0" width="384" height="331"/>
<rect key="frame" x="15" y="0.0" width="485" height="331"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GLe-RE-bAi">
<rect key="frame" x="0.0" y="0.0" width="384" height="1"/>
<rect key="frame" x="0.0" y="0.0" width="485" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="erF-fm-M52"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12500.00（佣金200元)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DU0-hj-Wex">
<rect key="frame" x="233" y="16" width="136" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12500.00（未结算)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DU0-hj-Wex">
<rect key="frame" x="358" y="16" width="112" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<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="HNd-Yn-970">
<rect key="frame" x="191" y="16" width="39" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HNd-Yn-970">
<rect key="frame" x="316" y="16" width="39" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2A1-E3-ezo">
<rect key="frame" x="239" y="55" width="130" height="30"/>
<rect key="frame" x="340" y="55" width="130" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="6ws-mc-JjN"/>
<constraint firstAttribute="width" constant="130" id="BMa-bg-Ae0"/>
......@@ -69,10 +70,23 @@
<action selector="ActionByBtn:" destination="-1" eventType="touchUpInside" id="POP-nq-Wgz"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cWY-Ns-39Y">
<rect key="frame" x="208.5" y="16" width="39" height="19"/>
<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="12500.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rt2-yJ-U8I">
<rect key="frame" x="250.5" y="16" width="55.5" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="DU0-hj-Wex" firstAttribute="top" secondItem="GLe-RE-bAi" secondAttribute="bottom" constant="15" id="0gO-0r-VeR"/>
<constraint firstItem="rt2-yJ-U8I" firstAttribute="leading" secondItem="cWY-Ns-39Y" secondAttribute="trailing" constant="3" id="7ae-CZ-MGb"/>
<constraint firstItem="2A1-E3-ezo" firstAttribute="top" secondItem="DU0-hj-Wex" secondAttribute="bottom" constant="20" id="Bqo-tB-1xp"/>
<constraint firstAttribute="trailing" secondItem="DU0-hj-Wex" secondAttribute="trailing" constant="15" id="Cjx-4U-FjT"/>
<constraint firstItem="DU0-hj-Wex" firstAttribute="leading" secondItem="HNd-Yn-970" secondAttribute="trailing" constant="3" id="JSX-0W-vob"/>
......@@ -80,7 +94,10 @@
<constraint firstItem="GLe-RE-bAi" firstAttribute="leading" secondItem="Q67-Wj-Dca" secondAttribute="leading" id="OhS-no-0na"/>
<constraint firstItem="HNd-Yn-970" firstAttribute="centerY" secondItem="DU0-hj-Wex" secondAttribute="centerY" id="PNC-3e-hKG"/>
<constraint firstAttribute="trailing" secondItem="GLe-RE-bAi" secondAttribute="trailing" id="Qzt-Gm-10E"/>
<constraint firstItem="rt2-yJ-U8I" firstAttribute="centerY" secondItem="HNd-Yn-970" secondAttribute="centerY" id="ShW-bl-ZGT"/>
<constraint firstItem="cWY-Ns-39Y" firstAttribute="centerY" secondItem="rt2-yJ-U8I" secondAttribute="centerY" id="gEj-yc-oZj"/>
<constraint firstItem="GLe-RE-bAi" firstAttribute="top" secondItem="Q67-Wj-Dca" secondAttribute="top" id="hBz-yR-jeg"/>
<constraint firstItem="HNd-Yn-970" firstAttribute="leading" secondItem="rt2-yJ-U8I" secondAttribute="trailing" constant="10" id="tXH-qZ-lT9"/>
</constraints>
</view>
</subviews>
......@@ -93,7 +110,7 @@
<constraint firstAttribute="trailing" secondItem="Q67-Wj-Dca" secondAttribute="trailing" constant="15" id="uzL-xJ-Gle"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="-19" y="89"/>
<point key="canvasLocation" x="52.898550724637687" y="88.727678571428569"/>
</view>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.swift
View file @ d0071fa7
......@@ -11,13 +11,12 @@ import UIKit
class RetailManageHeaderView: UIView {
var contentView:UIView!
@IBOutlet weak var comLeft: NSLayoutConstraint!
@IBOutlet weak var contentBgView: UIView!
@IBOutlet weak var stateLbl: UILabel!
@IBOutlet weak var snNumLbl: UILabel!
@IBOutlet weak var comTypeLbl: UILabel!
@IBOutlet weak var payTypeLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
......@@ -12,12 +12,9 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="RetailManageHeaderView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="comLeft" destination="iit-sO-7u3" id="zc2-c0-d3M"/>
<outlet property="comTypeLbl" destination="c5g-wK-iAJ" id="Ap8-45-AXM"/>
<outlet property="contentBgView" destination="RWd-sV-lFx" id="Qri-og-Hme"/>
<outlet property="nameLbl" destination="WTX-Sq-vnA" id="C5F-0z-HhN"/>
<outlet property="payTypeLbl" destination="Jue-E7-WiA" id="Zgi-fn-vXA"/>
<outlet property="snNumLbl" destination="Z5b-eN-oot" id="Xuc-u1-T60"/>
<outlet property="stateLbl" destination="Wv0-DX-LPH" id="cY2-cB-Kbu"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
......@@ -28,54 +25,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RWd-sV-lFx">
<rect key="frame" x="15" y="10" width="451" height="192"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="粱小锋（15577124121）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTX-Sq-vnA">
<rect key="frame" x="15" y="15" width="140" height="19"/>
<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="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jue-E7-WiA">
<rect key="frame" x="160" y="16.5" width="30" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="q5o-tv-lNT"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="企业、预售字体"/>
<nil key="highlightedColor"/>
<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="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分销商" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c5g-wK-iAJ">
<rect key="frame" x="195" y="16.5" width="45" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="45" id="GeU-W7-7cq"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="密码错误字体颜色"/>
<nil key="highlightedColor"/>
<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="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GL81521815136515100004" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z5b-eN-oot">
<rect key="frame" x="15" y="44" width="158" height="19"/>
<rect key="frame" x="15" y="86.5" width="158" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......@@ -87,19 +38,21 @@
<constraint firstAttribute="height" constant="1" id="tSf-JN-RJq"/>
</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="Wv0-DX-LPH">
<rect key="frame" x="343" y="86.5" width="98" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="rIW-ep-vjk" secondAttribute="bottom" id="6Qd-tx-WmH"/>
<constraint firstItem="rIW-ep-vjk" firstAttribute="leading" secondItem="RWd-sV-lFx" secondAttribute="leading" id="87m-2K-H83"/>
<constraint firstItem="Z5b-eN-oot" firstAttribute="top" secondItem="WTX-Sq-vnA" secondAttribute="bottom" constant="10" id="8PX-Mm-wbK"/>
<constraint firstItem="Jue-E7-WiA" firstAttribute="centerY" secondItem="WTX-Sq-vnA" secondAttribute="centerY" id="R6H-M7-frj"/>
<constraint firstAttribute="trailing" secondItem="Wv0-DX-LPH" secondAttribute="trailing" constant="10" id="Neu-mc-ZR8"/>
<constraint firstItem="Z5b-eN-oot" firstAttribute="centerY" secondItem="RWd-sV-lFx" secondAttribute="centerY" id="Odu-Pr-VQF"/>
<constraint firstItem="Z5b-eN-oot" firstAttribute="leading" secondItem="RWd-sV-lFx" secondAttribute="leading" constant="15" id="RdM-yQ-urd"/>
<constraint firstItem="Jue-E7-WiA" firstAttribute="leading" secondItem="WTX-Sq-vnA" secondAttribute="trailing" constant="5" id="YWe-oZ-YL8"/>
<constraint firstItem="c5g-wK-iAJ" firstAttribute="leading" secondItem="WTX-Sq-vnA" secondAttribute="trailing" constant="40" id="iit-sO-7u3"/>
<constraint firstItem="WTX-Sq-vnA" firstAttribute="leading" secondItem="RWd-sV-lFx" secondAttribute="leading" constant="15" id="kjW-OW-9AK"/>
<constraint firstItem="WTX-Sq-vnA" firstAttribute="top" secondItem="RWd-sV-lFx" secondAttribute="top" constant="15" id="maI-hd-Mol"/>
<constraint firstItem="c5g-wK-iAJ" firstAttribute="centerY" secondItem="WTX-Sq-vnA" secondAttribute="centerY" id="qPv-sL-Efl"/>
<constraint firstItem="Wv0-DX-LPH" firstAttribute="centerY" secondItem="RWd-sV-lFx" secondAttribute="centerY" id="cfc-qY-6la"/>
<constraint firstAttribute="trailing" secondItem="rIW-ep-vjk" secondAttribute="trailing" id="rUg-1O-Jma"/>
</constraints>
</view>
......@@ -113,15 +66,12 @@
<constraint firstItem="RWd-sV-lFx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="pvu-O0-TLz"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="-122.46376811594205" y="-20.089285714285712"/>
<point key="canvasLocation" x="-328" y="-16"/>
</view>
</objects>
<resources>
<namedColor name="企业、预售字体">
<color red="1" green="0.68627450980392157" blue="0.47058823529411764" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="密码错误字体颜色">
<color red="0.88999998569488525" green="0.27799999713897705" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<namedColor name="#F57575">
<color red="0.96100002527236938" green="0.45899999141693115" blue="0.45899999141693115" 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"/>
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.swift
View file @ d0071fa7
......@@ -18,6 +18,7 @@ class RetailManageViewCell: UITableViewCell {
}
@IBOutlet weak var numLbl: UILabel!
@IBOutlet weak var priceLbl: UILabel!
@IBOutlet weak var dotImgV: UIImageView!
@IBOutlet weak var goodsLbl: UILabel!
override func setSelected(_ selected: Bool, animated: Bool) {
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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"/>
......@@ -13,29 +13,35 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="228" id="KGk-i7-Jjw" customClass="RetailManageViewCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="331" height="228"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="228"/>
<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="331" height="228"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="228"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UDV-hj-QDc">
<rect key="frame" x="15" y="0.0" width="301" height="228"/>
<rect key="frame" x="15" y="0.0" width="345" height="228"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dotLine" translatesAutoresizingMaskIntoConstraints="NO" id="7Tt-vd-rRF">
<rect key="frame" x="15" y="227" width="286" height="1"/>
<rect key="frame" x="15" y="227" width="330" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="jLb-Fe-NA5"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zL3-WS-mto">
<rect key="frame" x="15" y="104.5" width="26" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品发撒风扇都法师法师法师法师飞洒发都发凡是都是" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zL3-WS-mto">
<rect key="frame" x="15" y="104.5" width="185" height="19"/>
<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="x1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rz0-eV-8Mh">
<rect key="frame" x="274" y="104.5" width="12" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="×200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rz0-eV-8Mh">
<rect key="frame" x="215" y="105" width="31.5" 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="¥55050.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y4l-v0-mzx">
<rect key="frame" x="269" y="105" width="66" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
......@@ -43,14 +49,17 @@
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="rz0-eV-8Mh" secondAttribute="trailing" constant="15" id="2s4-Eh-yaY"/>
<constraint firstItem="Y4l-v0-mzx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="rz0-eV-8Mh" secondAttribute="trailing" constant="5" id="7IB-4X-cqv"/>
<constraint firstItem="Y4l-v0-mzx" firstAttribute="centerY" secondItem="UDV-hj-QDc" secondAttribute="centerY" id="BTP-KQ-scT"/>
<constraint firstAttribute="trailing" secondItem="Y4l-v0-mzx" secondAttribute="trailing" constant="10" id="JMO-kE-xLx"/>
<constraint firstAttribute="trailing" secondItem="rz0-eV-8Mh" secondAttribute="leading" constant="130" id="LiC-eN-DEJ"/>
<constraint firstAttribute="trailing" secondItem="7Tt-vd-rRF" secondAttribute="trailing" id="MH4-9F-Lhw"/>
<constraint firstAttribute="bottom" secondItem="7Tt-vd-rRF" secondAttribute="bottom" id="Pxe-Il-Xwa"/>
<constraint firstItem="rz0-eV-8Mh" firstAttribute="centerY" secondItem="UDV-hj-QDc" secondAttribute="centerY" id="Q1f-U0-WcG"/>
<constraint firstItem="zL3-WS-mto" firstAttribute="leading" secondItem="UDV-hj-QDc" secondAttribute="leading" constant="15" id="QPN-Gg-hpV"/>
<constraint firstItem="zL3-WS-mto" firstAttribute="centerY" secondItem="UDV-hj-QDc" secondAttribute="centerY" id="dLO-Q8-hMy"/>
<constraint firstItem="7Tt-vd-rRF" firstAttribute="leading" secondItem="UDV-hj-QDc" secondAttribute="leading" constant="15" id="hcL-ig-85r"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zL3-WS-mto" secondAttribute="trailing" constant="60" id="sZb-jU-gGU"/>
<constraint firstItem="rz0-eV-8Mh" firstAttribute="leading" secondItem="zL3-WS-mto" secondAttribute="trailing" constant="15" id="vdW-pV-u2A"/>
</constraints>
</view>
</subviews>
......@@ -67,6 +76,7 @@
<outlet property="dotImgV" destination="7Tt-vd-rRF" id="pjf-F7-9Kw"/>
<outlet property="goodsLbl" destination="zL3-WS-mto" id="wYK-Xt-SgC"/>
<outlet property="numLbl" destination="rz0-eV-8Mh" id="emd-H7-AOF"/>
<outlet property="priceLbl" destination="Y4l-v0-mzx" id="wOo-K5-VIH"/>
</connections>
<point key="canvasLocation" x="73.188405797101453" y="184.15178571428569"/>
</tableViewCell>
......
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.xib
View file @ d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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>
......@@ -23,7 +24,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f4t-Fn-Swl" userLabel="searchView">
<rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="yth-ne-PfG"/>
</constraints>
......@@ -44,10 +45,11 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gk3-xb-88Q">
<rect key="frame" x="0.0" y="46" width="375" height="621"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="gk3-xb-88Q" firstAttribute="top" secondItem="ETb-BZ-IdF" secondAttribute="bottom" id="99k-0E-t0t"/>
<constraint firstItem="ETb-BZ-IdF" firstAttribute="top" secondItem="f4t-Fn-Swl" secondAttribute="bottom" id="JQs-Tb-3vz"/>
......@@ -63,7 +65,6 @@
<constraint firstItem="f4t-Fn-Swl" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="ytf-De-vhY"/>
<constraint firstItem="gk3-xb-88Q" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="zmL-6P-JFb"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="132" y="153.37331334332833"/>
</view>
</objects>
......@@ -72,5 +73,8 @@
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
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