Skip to content

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

完成分销订单管理列表

parent eb4ccd97
Show whitespace changes
Inline Side-by-side
Showing with 736 additions and 20 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ d7cca550
......@@ -606,6 +606,9 @@
F995CEA62547CAC000202BA8 /* InvoiceInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F995CEA52547CAC000202BA8 /* InvoiceInfoModel.swift */; };
F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */; };
F9A0E1DF246D1B1E00D7F26F /* GetGoodsInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */; };
F9A1D4A4255B77070018DA8A /* RetailManageViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A1D4A2255B77070018DA8A /* RetailManageViewCell.swift */; };
F9A1D4A5255B77070018DA8A /* RetailManageViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A1D4A3255B77070018DA8A /* RetailManageViewCell.xib */; };
F9A1D4AB255B7AF70018DA8A /* RetailManageHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A1D4AA255B7AF70018DA8A /* RetailManageHeaderView.xib */; };
F9A4AB6E24C927E900094BD1 /* LogisticsCostDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A4AB6C24C927E900094BD1 /* LogisticsCostDetailViewController.swift */; };
F9A4AB6F24C927E900094BD1 /* LogisticsCostDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A4AB6D24C927E900094BD1 /* LogisticsCostDetailViewController.xib */; };
F9A4AB7324C933A700094BD1 /* XiaDanUserInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A4AB7124C933A700094BD1 /* XiaDanUserInfoViewController.swift */; };
......@@ -632,6 +635,9 @@
F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */; };
F9DDBE972457D3EC00A32CB2 /* WebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */; };
F9F2866724CA95FD00959142 /* TitleTimeHeaderFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F2866624CA95FD00959142 /* TitleTimeHeaderFooterView.swift */; };
F9FA9C4D255B8033004034B3 /* RetailManageHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9FA9C4C255B8033004034B3 /* RetailManageHeaderView.swift */; };
F9FA9C55255B858C004034B3 /* RetailManageFooterView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9FA9C54255B858C004034B3 /* RetailManageFooterView.xib */; };
F9FA9C5A255B8772004034B3 /* RetailManageFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9FA9C59255B8772004034B3 /* RetailManageFooterView.swift */; };
F9FF1E45247D1F670026FCE3 /* StringFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9FF1E44247D1F670026FCE3 /* StringFile.swift */; };
F9FF7BA124760DA9006E305E /* LogisticsCompanyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9FF7BA024760DA9006E305E /* LogisticsCompanyModel.swift */; };
/* End PBXBuildFile section */
......@@ -1320,6 +1326,9 @@
F995CEA52547CAC000202BA8 /* InvoiceInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceInfoModel.swift; sourceTree = "<group>"; };
F9A0E1DC246D198B00D7F26F /* CusListAllModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CusListAllModel.swift; sourceTree = "<group>"; };
F9A0E1DE246D1B1E00D7F26F /* GetGoodsInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGoodsInfoModel.swift; sourceTree = "<group>"; };
F9A1D4A2255B77070018DA8A /* RetailManageViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetailManageViewCell.swift; sourceTree = "<group>"; };
F9A1D4A3255B77070018DA8A /* RetailManageViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RetailManageViewCell.xib; sourceTree = "<group>"; };
F9A1D4AA255B7AF70018DA8A /* RetailManageHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RetailManageHeaderView.xib; sourceTree = "<group>"; };
F9A4AB6C24C927E900094BD1 /* LogisticsCostDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsCostDetailViewController.swift; sourceTree = "<group>"; };
F9A4AB6D24C927E900094BD1 /* LogisticsCostDetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LogisticsCostDetailViewController.xib; sourceTree = "<group>"; };
F9A4AB7124C933A700094BD1 /* XiaDanUserInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XiaDanUserInfoViewController.swift; sourceTree = "<group>"; };
......@@ -1346,6 +1355,9 @@
F9DDBE942457D3EC00A32CB2 /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
F9DDBE952457D3EC00A32CB2 /* WebViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WebViewController.xib; sourceTree = "<group>"; };
F9F2866624CA95FD00959142 /* TitleTimeHeaderFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleTimeHeaderFooterView.swift; sourceTree = "<group>"; };
F9FA9C4C255B8033004034B3 /* RetailManageHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetailManageHeaderView.swift; sourceTree = "<group>"; };
F9FA9C54255B858C004034B3 /* RetailManageFooterView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RetailManageFooterView.xib; sourceTree = "<group>"; };
F9FA9C59255B8772004034B3 /* RetailManageFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetailManageFooterView.swift; sourceTree = "<group>"; };
F9FF1E44247D1F670026FCE3 /* StringFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringFile.swift; sourceTree = "<group>"; };
F9FF7BA024760DA9006E305E /* LogisticsCompanyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogisticsCompanyModel.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -3096,6 +3108,7 @@
F970B3642550F59D0026F9D5 /* 分销订单管理 */ = {
isa = PBXGroup;
children = (
F9A1D4A9255B7AC50018DA8A /* View */,
F970B3652550F5AA0026F9D5 /* RetailManageViewController.swift */,
F970B3662550F5AA0026F9D5 /* RetailManageViewController.xib */,
);
......@@ -3112,6 +3125,19 @@
path = "商品分类";
sourceTree = "<group>";
};
F9A1D4A9255B7AC50018DA8A /* View */ = {
isa = PBXGroup;
children = (
F9A1D4A2255B77070018DA8A /* RetailManageViewCell.swift */,
F9A1D4A3255B77070018DA8A /* RetailManageViewCell.xib */,
F9FA9C4C255B8033004034B3 /* RetailManageHeaderView.swift */,
F9A1D4AA255B7AF70018DA8A /* RetailManageHeaderView.xib */,
F9FA9C59255B8772004034B3 /* RetailManageFooterView.swift */,
F9FA9C54255B858C004034B3 /* RetailManageFooterView.xib */,
);
path = View;
sourceTree = "<group>";
};
F9A4AB6A24C9220C00094BD1 /* 货拉拉 */ = {
isa = PBXGroup;
children = (
......@@ -3441,6 +3467,7 @@
E09B3AD224B2FCAF00E3B238 /* ShareSDKUI.bundle in Resources */,
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
E08A7AE124652E2C00F934F2 /* BingDingKeHuViewController.xib in Resources */,
F9A1D4AB255B7AF70018DA8A /* RetailManageHeaderView.xib in Resources */,
E00CBA0224820CF000701D9D /* CRKSumCell.xib in Resources */,
E0206335246CE45A007A40C4 /* HeaderOnlyTitleView.xib in Resources */,
E0A409D524640B8300CFF109 /* DZGLViewController.xib in Resources */,
......@@ -3478,6 +3505,7 @@
E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */,
E042F74524529B8500CDFA12 /* JiTuoWuXinXiView.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
F9FA9C55255B858C004034B3 /* RetailManageFooterView.xib in Resources */,
E0A409CD2464026B00CFF109 /* SecondCell.xib in Resources */,
F90D37E825528D72001F3AED /* GLAlertTbAddView.xib in Resources */,
F95A9EEA24558B8800867849 /* ShowAlGoodsViewController.xib in Resources */,
......@@ -3492,6 +3520,7 @@
E0BE8A91245A9B9600E80134 /* YingFuZhangKuanCell.xib in Resources */,
E0EFB9C724930C0D005FB0CD /* CGDListViewController.xib in Resources */,
E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */,
F9A1D4A5255B77070018DA8A /* RetailManageViewCell.xib in Resources */,
F971D7B3248B6432007F1619 /* address_new.json in Resources */,
E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
E02DDD962450106C00ABB707 /* PuTongJieTiCell.xib in Resources */,
......@@ -3729,6 +3758,7 @@
F9531F412465108800724BEE /* JXPhotoBrowserView.swift in Sources */,
E074B69C24DD305600777003 /* TitleHeaderCell.swift in Sources */,
F956D5AB246A2D9C003FF510 /* LMNNumberingLine.m in Sources */,
F9FA9C4D255B8033004034B3 /* RetailManageHeaderView.swift in Sources */,
F96E9D5B246656A700B5B94A /* HGImageCollectionViewCell.swift in Sources */,
E0EFB9C624930C0D005FB0CD /* CGDListViewController.swift in Sources */,
E0D197C02448431C002B080C /* BabyCentralManager.m in Sources */,
......@@ -3812,6 +3842,7 @@
E0D197BD2448431C002B080C /* BabySpeaker.m in Sources */,
F9956B22246408A6001A617D /* GoodsClassViewController.swift in Sources */,
F950FDDA24518B9500C40530 /* FSCalendarCell.m in Sources */,
F9A1D4A4255B77070018DA8A /* RetailManageViewCell.swift in Sources */,
F96E9D5D246656A700B5B94A /* HGImagePickerController.swift in Sources */,
F969BF1E244EE67900C79953 /* GoodsManageListVC.swift in Sources */,
E0273DD824551B4C00B3FCAE /* SendTimeSelectView.swift in Sources */,
......@@ -3897,6 +3928,7 @@
F9531F3A2465108800724BEE /* JXPhotoBrowserNoneAnimator.swift in Sources */,
E07B1E62245921A60055BA3C /* KeHuXQCell.swift in Sources */,
E0CC847C24823087009B1FE9 /* GetGoodBatchModel.swift in Sources */,
F9FA9C5A255B8772004034B3 /* RetailManageFooterView.swift in Sources */,
E077DC6A25512E94000B0DA5 /* FX_Product_GuanLiVC.swift in Sources */,
E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */,
E0F8E91F248747D200817A08 /* NewCKVc.swift in Sources */,
......@@ -4190,6 +4222,7 @@
/usr/include/libxml2,
);
INFOPLIST_FILE = GeliBusinessPlatform/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......@@ -4319,6 +4352,7 @@
/usr/include/libxml2,
);
INFOPLIST_FILE = GeliBusinessPlatform/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
......
GeliBusinessPlatform/View/Cell/CGDListCell2.xib
View file @ d7cca550
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<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>
......@@ -95,13 +96,13 @@
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KO3-dv-aSL">
<rect key="frame" x="15" y="43.5" width="315" height="30"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="MiX-0n-brC"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="aXp-oN-Cl6" firstAttribute="leading" secondItem="J1p-oh-7KC" secondAttribute="trailing" constant="10" id="2ki-px-UcJ"/>
<constraint firstItem="Fv7-Qm-wPF" firstAttribute="centerY" secondItem="J1p-oh-7KC" secondAttribute="centerY" id="3db-dH-3ub"/>
......@@ -122,7 +123,7 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZEQ-bR-jNZ">
<rect key="frame" x="0.0" y="48.5" width="345" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预售" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ekx-rs-uaM">
<rect key="frame" x="67" y="15" width="32" height="18"/>
......@@ -167,7 +168,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="ZEQ-bR-jNZ" firstAttribute="leading" secondItem="xNb-6a-mWT" secondAttribute="leading" id="3H6-Mf-efn"/>
<constraint firstItem="HVh-eU-WcT" firstAttribute="top" secondItem="xNb-6a-mWT" secondAttribute="top" constant="15" id="3vl-Na-tUS"/>
......@@ -207,8 +208,8 @@
<constraint firstItem="xNb-6a-mWT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hMZ-Hc-nFG"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" name="app底色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<color key="backgroundColor" name="app底色"/>
<connections>
<outlet property="btnBgView" destination="KO3-dv-aSL" id="FKG-4d-9rD"/>
<outlet property="countLbl" destination="J1p-oh-7KC" id="brI-AH-qUH"/>
......@@ -248,5 +249,8 @@
<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>
</resources>
</document>
GeliBusinessPlatform/View/TimeSelectView/TimeShowDownView.swift
View file @ d7cca550
......@@ -9,6 +9,8 @@
import UIKit
protocol TimeShowDownViewDeleagte {
func TimeShowDownViewSelectMoreDate(beginDate:Date?,endginDate:Date?)
func TimeShowDownViewRemoveForSup()
}
......@@ -17,11 +19,13 @@ class TimeShowDownView: UIView,TimeSelectViewDelgate {
var delegate:TimeShowDownViewDeleagte?
@IBAction func resetAction(_ sender: UIButton) {
delegate?.TimeShowDownViewSelectMoreDate(beginDate: nil, endginDate: nil)
self.delegate?.TimeShowDownViewRemoveForSup()
self.removeFromSuperview()
}
@IBAction func sureAction(_ sender: UIButton) {
delegate?.TimeShowDownViewSelectMoreDate(beginDate: BeginDate, endginDate: EndDate)
self.delegate?.TimeShowDownViewRemoveForSup()
self.removeFromSuperview()
}
......@@ -47,6 +51,15 @@ class TimeShowDownView: UIView,TimeSelectViewDelgate {
@IBOutlet weak var timeBgView: UIView!
weak var CalendarV:TimeSelectView?
func setOld(){
if BeginDate != nil {
CalendarV?.setOldDate(beginD: BeginDate, endD: EndDate)
let timeInterval:TimeInterval = BeginDate.timeIntervalSince1970
let timeIntervalEnd:TimeInterval = EndDate.timeIntervalSince1970
startTimeBtn.setTitle(dayByDouble(sender: timeInterval), for: .normal)
endTimeBtn.setTitle(dayByDouble(sender: timeIntervalEnd), for: .normal)
}
}
func addTimeView() {
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @ d7cca550
......@@ -8,9 +8,15 @@
import UIKit
class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte,UITableViewDelegate,UITableViewDataSource{
class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte,UITableViewDelegate,UITableViewDataSource,RetailManageFooterViewDelagte, GeliAlertViewDelegate{
var page : Int = 0
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
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBgView: UIView!
@IBOutlet weak var changeBgView: UIView!
......@@ -24,11 +30,16 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
//searchbar
initSearchBar()
initHeaderSelectView()
listView.register(UINib(nibName: "TitleContentCell", bundle: nil), forCellReuseIdentifier: "TitleContentCell")
listView.register(UINib(nibName: "RetailManageViewCell", bundle: nil), forCellReuseIdentifier: "RetailManageViewCell")
listView.separatorStyle = .none
listView.delegate = self
listView.dataSource = self
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
listView.mj_header = headerMJ
//上拉加载相关设置
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
listView.mj_footer = footerMJ
listView.mj_header?.beginRefreshing()
}
//MARK:--initSearchBar
weak var searchV: SearchBarView? = nil
......@@ -42,7 +53,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,8 +78,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
// listView.mj_header?.beginRefreshing()
listView.mj_header?.beginRefreshing()
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
......@@ -147,7 +157,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
make.top.equalTo(changeBgView.snp_bottom)
}
showSelectV = showSelectView
showSelectView.dataArr = ["全部", "分销员订单", "分销商订单"]
showSelectView.dataArr = ["全部", "分销商订单", "分销员订单"]
showSelectView.selectIndx = selectIndexArr[1]
}
......@@ -163,6 +173,15 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
timeShowDView = timeShowDownView
timeShowDownView.delegate = self
if startTime != 0 {
var time = TimeInterval(exactly: startTime!)
timeShowDownView.BeginDate = Date(timeIntervalSince1970: time!)
time = TimeInterval(exactly: endTime!)
timeShowDownView.EndDate = Date(timeIntervalSince1970: time!)
timeShowDownView.setOld()
}
}
break
default: break
......@@ -182,7 +201,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
func didselectCell(sender: Int) {
selectIndexArr[showSelectvIndex] = sender
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
// listView.mj_header?.beginRefreshing()
listView.mj_header?.beginRefreshing()
}
func selectContentvRemoveForSup() {
......@@ -192,22 +211,191 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
func TimeShowDownViewRemoveForSup() {
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
func TimeShowDownViewSelectMoreDate(beginDate: Date?, endginDate: Date?) {
if beginDate == nil {
startTime = 0
endTime = 0
}else{
let timeInterval:TimeInterval = beginDate!.timeIntervalSince1970
let timeIntervalEnd:TimeInterval = endginDate!.timeIntervalSince1970
startTime = Int(timeInterval)
endTime = Int(timeIntervalEnd)
}
listView.mj_header?.beginRefreshing()
}
//MARK:--loadData
//MARK:--列表数据源
var dataArr: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
}else if selectIndexArr[1] == 2 {
dbt_target = 3
}
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]
dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel
self.dataArr.removeAll()
dataM.data?.forEach({ (model) in
self.dataArr.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.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]
dbtOrderLis(dic) { (data) in
let dataM = data as! dbtOrderLisModel
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
self.page += 1
dataM.data?.forEach({ (model) in
self.dataArr.append(model)
})
self.listView.reloadData()
self.listView.mj_footer?.endRefreshing()
}
} failture: { (error) in
self.listView.mj_footer?.endRefreshing()
}
}
func numberOfSections(in tableView: UITableView) -> Int {
return 3
return self.dataArr.count
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 2
let goodArrModel = self.dataArr[section]
return goodArrModel.order_goods!.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleContentCell") as! TitleContentCell
let cell = tableView.dequeueReusableCell(withIdentifier: "RetailManageViewCell") as! RetailManageViewCell
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!)
if (indexPath.row + 1) == goodArrModel.order_goods?.count {
cell.dotImgV.isHidden = true
}else{
cell.dotImgV.isHidden = false
}
return cell
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let headerV = UIView()
let contentV = RetailManageHeaderView()
headerV.addSubview(contentV)
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
}
contentV.comTypeLbl.isHidden = false
if model.dbt_target == 1 {
contentV.comTypeLbl.text = "供应商"
}else if model.dbt_target == 2 {
contentV.comTypeLbl.text = "分销商"
}else if model.dbt_target == 3 {
contentV.comTypeLbl.text = "分销员"
}else{
contentV.comTypeLbl.isHidden = true
}
contentV.snNumLbl.text = model.order_sn
return headerV
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 88
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let footerV = UIView()
let contentV = RetailManageFooterView()
footerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.moneyLbl.text = model.sum_amount! + "(佣金" + 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)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否把该订单标记为已人工结算？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确定"), for: .normal)
alertView.rightBtn.tag = sender
self.view.window?.addSubview(alertView)
}
func sureGeliAlertViewAction(sender: UIButton) {
HUD.flash(.progress)
let model = self.dataArr[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
}
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
let model = self.dataArr[section]
//已结算
if model.commission_status == 1 {
return 48
}
//或 自动结算 不需要显示标记
if model.dbt_type == 2 {
return 48
}
return 100
}
}
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib
View file @ d7cca550
......@@ -37,7 +37,7 @@
<constraint firstAttribute="height" constant="45" id="6Ma-LE-6Vg"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="rD1-9Z-Grg">
<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"/>
<color key="backgroundColor" name="app底色"/>
</tableView>
......
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.swift 0 → 100644
View file @ d7cca550
//
// RetailManageFooterView.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/11/11.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol RetailManageFooterViewDelagte {
func tapRetailManageFooterBtnAction(sender:Int)
}
class RetailManageFooterView: UIView {
var delgate : RetailManageFooterViewDelagte?
var contentView:UIView!
@IBAction func ActionByBtn(_ sender: UIButton) {
delgate?.tapRetailManageFooterBtnAction(sender: sender.tag)
}
@IBOutlet weak var actionBtn: UIButton!
@IBOutlet weak var moneyLbl: UILabel!
@IBOutlet weak var contentBgView: UIView!
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
contentBgView.layer.cornerRadius = 10;
contentBgView.layer.maskedCorners = [CACornerMask.layerMinXMaxYCorner,CACornerMask.layerMaxXMaxYCorner]
}
// /初始化时将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()
}
contentBgView.layer.cornerRadius = 10;
contentBgView.layer.maskedCorners = [CACornerMask.layerMinXMaxYCorner,CACornerMask.layerMaxXMaxYCorner]
}
//加载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/ViewController/分销订单管理/View/RetailManageFooterView.xib 0 → 100644
View file @ d7cca550
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<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="RetailManageFooterView" customModule="TestClass" customModuleProvider="target">
<connections>
<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"/>
</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"/>
<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"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GLe-RE-bAi">
<rect key="frame" x="0.0" y="0.0" width="384" 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"/>
<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"/>
<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"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="6ws-mc-JjN"/>
<constraint firstAttribute="width" constant="130" id="BMa-bg-Ae0"/>
</constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<state key="normal" title="标记为已人工结算">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<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>
<connections>
<action selector="ActionByBtn:" destination="-1" eventType="touchUpInside" id="POP-nq-Wgz"/>
</connections>
</button>
</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="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"/>
<constraint firstAttribute="trailing" secondItem="2A1-E3-ezo" secondAttribute="trailing" constant="15" id="OUl-f1-Kia"/>
<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="GLe-RE-bAi" firstAttribute="top" secondItem="Q67-Wj-Dca" secondAttribute="top" id="hBz-yR-jeg"/>
</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="Q67-Wj-Dca" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="6Q1-me-COg"/>
<constraint firstAttribute="bottom" secondItem="Q67-Wj-Dca" secondAttribute="bottom" id="8wc-Zu-dJe"/>
<constraint firstItem="Q67-Wj-Dca" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="bCe-0K-uDJ"/>
<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"/>
</view>
</objects>
<resources>
<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"/>
</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.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>
</resources>
</document>
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.swift 0 → 100644
View file @ d7cca550
//
// RetailManageHeaderView.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/11/11.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class RetailManageHeaderView: UIView {
var contentView:UIView!
@IBOutlet weak var comLeft: NSLayoutConstraint!
@IBOutlet weak var contentBgView: UIView!
@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)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
contentBgView.layer.cornerRadius = 10;
contentBgView.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
}
// /初始化时将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()
}
contentBgView.layer.cornerRadius = 10;
contentBgView.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
}
//加载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/ViewController/分销订单管理/View/RetailManageHeaderView.xib 0 → 100644
View file @ d7cca550
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<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="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"/>
</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="481" height="202"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<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"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rIW-ep-vjk">
<rect key="frame" x="0.0" y="191" width="451" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="tSf-JN-RJq"/>
</constraints>
</view>
</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 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 firstAttribute="trailing" secondItem="rIW-ep-vjk" secondAttribute="trailing" id="rUg-1O-Jma"/>
</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 firstAttribute="bottom" secondItem="RWd-sV-lFx" secondAttribute="bottom" id="EZf-gq-3pT"/>
<constraint firstItem="RWd-sV-lFx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="bBe-6F-8jT"/>
<constraint firstAttribute="trailing" secondItem="RWd-sV-lFx" secondAttribute="trailing" constant="15" id="lvg-Lt-ER6"/>
<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"/>
</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>
<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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.swift 0 → 100644
View file @ d7cca550
//
// RetailManageViewCell.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/11/11.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class RetailManageViewCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
selectionStyle = .none
}
@IBOutlet weak var numLbl: UILabel!
@IBOutlet weak var dotImgV: UIImageView!
@IBOutlet weak var goodsLbl: UILabel!
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.xib 0 → 100644
View file @ d7cca550
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="rz0-eV-8Mh" secondAttribute="trailing" constant="15" id="2s4-Eh-yaY"/>
<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"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="UDV-hj-QDc" secondAttribute="trailing" constant="15" id="Rhr-cP-ade"/>
<constraint firstItem="UDV-hj-QDc" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Xbd-Np-H0m"/>
<constraint firstAttribute="bottom" secondItem="UDV-hj-QDc" secondAttribute="bottom" id="cXA-U6-TPY"/>
<constraint firstItem="UDV-hj-QDc" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="vXJ-Ur-sxC"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<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"/>
</connections>
<point key="canvasLocation" x="73.188405797101453" y="184.15178571428569"/>
</tableViewCell>
</objects>
<resources>
<image name="dotLine" width="330" height="0.5"/>
<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.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" 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 @ d7cca550
......@@ -656,7 +656,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return
case 140: //分销订单管理
HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = RetailManageViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
case 142: //供应商商品管理
HUD.flash(.label("敬请期待"),delay: 1.2)
......
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