Skip to content

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

完美修正分销订单的UI

parent d0071fa7
Hide whitespace changes
Inline Side-by-side
Showing with 466 additions and 631 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 52522eb2
......@@ -413,6 +413,8 @@
F90F882324C841280050EF02 /* UITableViewIndexView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F90F882224C841280050EF02 /* UITableViewIndexView.swift */; };
F9171EFC245128B200359C2B /* Interface.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9171EFB245128B200359C2B /* Interface.swift */; };
F9171F0224513C5B00359C2B /* UpDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9171F0124513C5B00359C2B /* UpDataModel.swift */; };
F91E9EBE2579D00900FAFCFA /* RetailListMgVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F91E9EBC2579D00900FAFCFA /* RetailListMgVC.swift */; };
F91E9EBF2579D00900FAFCFA /* RetailListMgVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = F91E9EBD2579D00900FAFCFA /* RetailListMgVC.xib */; };
F9217E012485E6E800C4CF67 /* MessageListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9217E002485E6E800C4CF67 /* MessageListModel.swift */; };
F924B39024971BCB00A913CD /* CustomerInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = F924B38F24971BCB00A913CD /* CustomerInterface.swift */; };
F924B39224971BFB00A913CD /* CusListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F924B39124971BFB00A913CD /* CusListModel.swift */; };
......@@ -1087,6 +1089,8 @@
F90F882224C841280050EF02 /* UITableViewIndexView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITableViewIndexView.swift; sourceTree = "<group>"; };
F9171EFB245128B200359C2B /* Interface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Interface.swift; sourceTree = "<group>"; };
F9171F0124513C5B00359C2B /* UpDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpDataModel.swift; sourceTree = "<group>"; };
F91E9EBC2579D00900FAFCFA /* RetailListMgVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetailListMgVC.swift; sourceTree = "<group>"; };
F91E9EBD2579D00900FAFCFA /* RetailListMgVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RetailListMgVC.xib; sourceTree = "<group>"; };
F9217E002485E6E800C4CF67 /* MessageListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageListModel.swift; sourceTree = "<group>"; };
F924B38F24971BCB00A913CD /* CustomerInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomerInterface.swift; sourceTree = "<group>"; };
F924B39124971BFB00A913CD /* CusListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CusListModel.swift; sourceTree = "<group>"; };
......@@ -3117,6 +3121,8 @@
F970B3662550F5AA0026F9D5 /* RetailManageViewController.xib */,
F9ECC926255CD7FD00990B61 /* RetailManageDetailViewController.swift */,
F9ECC927255CD7FD00990B61 /* RetailManageDetailViewController.xib */,
F91E9EBC2579D00900FAFCFA /* RetailListMgVC.swift */,
F91E9EBD2579D00900FAFCFA /* RetailListMgVC.xib */,
);
path = "分销订单管理";
sourceTree = "<group>";
......@@ -3542,6 +3548,7 @@
E0BE8A80245A740600E80134 /* ChengGongCell.xib in Resources */,
E0190A2E2487696F00B1E067 /* NewSelectItemVc.xib in Resources */,
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
F91E9EBF2579D00900FAFCFA /* RetailListMgVC.xib in Resources */,
E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */,
E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */,
F9D44E8424CBC50700FBD8DB /* WayBillAddressCanDelItemCell.xib in Resources */,
......@@ -3989,6 +3996,7 @@
F95567AB2453E40B009674AB /* OrderListViewController.swift in Sources */,
E00E48C22457C0D600F16545 /* XuanZeShangPinViewController.swift in Sources */,
F956D5BB246A359C003FF510 /* GoodsInterface.swift in Sources */,
F91E9EBE2579D00900FAFCFA /* RetailListMgVC.swift in Sources */,
E0BE8A83245A76AF00E80134 /* XiaDanCGDiZhiCell.swift in Sources */,
E042F730245272FF00CDFA12 /* XiaYunDanViewController.swift in Sources */,
E09B03A72445B04E00211A51 /* BaseViewController.swift in Sources */,
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.swift 0 → 100644
View file @ 52522eb2
//
// RetailListMgVC.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/12/4.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import Parchment
class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchBarDelegate, SearchBarViewDelegate ,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte{
@IBOutlet weak var contentV: UIView!
fileprivate let cities = [
"我的分销订单",
"代销订单"
]
let viewControllers = [
RetailManageViewController(title: "我的分销订单"),
RetailManageViewController(title: "代销订单")
]
//头部滚动视图
weak var pagingVC : PagingViewController?
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "分销订单管理"
navbar.lineView.isHidden = true
self.view.addSubview(navbar)
SetTopFrameView(view: contentV, btmView: self.view)
let pagingViewController = PagingViewController(viewControllers: viewControllers)
pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)
pagingViewController.font = UIFont.systemFont(ofSize: 13)
pagingViewController.selectedFont = UIFont.systemFont(ofSize: 13)
pagingViewController.textColor = UIColor.init(named: "灰色字体颜色")!
pagingViewController.selectedTextColor = UIColor.init(named: "蓝色字体颜色")!
pagingViewController.delegate = self
pagingViewController.dataSource = self
pagingViewController.sizeDelegate = self
addChild(pagingViewController)
contentV.addSubview(pagingViewController.view)
contentV.constrainToEdges(pagingViewController.view)
pagingViewController.didMove(toParent: self)
pagingVC = pagingViewController
initSearchBar()
initHeaderSelectView()
}
weak var searchV: SearchBarView? = nil
var blackBtnView:UIButton! = nil
var keyword = ""
let SearchBarContentV = UIView()
func initSearchBar() {
SearchBarContentV.backgroundColor = UIColor.white
contentV.addSubview(SearchBarContentV)
SearchBarContentV.snp.makeConstraints { (make) in
make.left.right.equalToSuperview()
make.top.equalTo(50)
make.height.equalTo(45)
}
let searchBr = SearchBarView.init()
SearchBarContentV.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
searchV = searchBr
searchBr.placeholderStr = "请输入订单编号/商品名称"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
}
func clearSearchAction() {
}
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
removeBlackBtnView()
if searchBar.text?.count == 0 && keyword.count != 0{
keyword = searchBar.text!
viewControllers.forEach { (vc) in
vc.keyword = keyword
vc.isUpData = false
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
}
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
searchBar.resignFirstResponder()
keyword = searchBar.text!
viewControllers.forEach { (vc) in
vc.keyword = keyword
vc.isUpData = false
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
@objc func removeBlackBtnView(){
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
}
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
if showSelectV != nil {
showSelectV.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
if timeShowDView != nil {
timeShowDView.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
self.view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.top.equalTo(SearchBarContentV.snp_bottom)
make.left.right.bottom.equalToSuperview()
}
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
return true
}
//MARK:--HeaderSelectView
let changeBgView = UIView()
var startTime :Int? = 0
var endTime :Int? = 0
weak var selectV: HeaderSelectView! = nil
var showSelectvIndex = 0
weak var showSelectV: SelectContentView! = nil
weak var timeShowDView: TimeShowDownView! = nil
var selectIndexArr = [0,0,0]
func initHeaderSelectView() {
contentV.addSubview(changeBgView)
changeBgView.snp.makeConstraints { (make) in
make.left.right.equalToSuperview()
make.top.equalTo(SearchBarContentV.snp_bottom)
make.height.equalTo(45)
}
let selectView = HeaderSelectView()
selectView.firstBtn.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);
}
selectView.delegate = self
selectV = selectView
}
//MARK:--下拉视图模块
func showAction(sender: Int) {
showSelectvIndex = sender
switch sender {
case 0:
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[0]
}
break
case 1:
do {
//选择时间
let timeShowDownView = TimeShowDownView()
self.view.addSubview(timeShowDownView)
timeShowDownView.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(changeBgView.snp_bottom)
}
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
}
}
func colseAction(sender: Int) {
if showSelectV != nil {
showSelectV.removeFromSuperview()
}
if timeShowDView != nil {
timeShowDView.removeFromSuperview()
}
}
//MARK:--SelectContentViewDelegate
func didselectCell(sender: Int) {
selectIndexArr[showSelectvIndex] = sender
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
viewControllers.forEach { (vc) in
vc.dbt_type = selectIndexArr[0]
vc.isUpData = false
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
func selectContentvRemoveForSup() {
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
//MARK:--TimeShowDownViewDeleagte
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)
}
viewControllers.forEach { (vc) in
vc.startTime = startTime
vc.endTime = endTime
vc.isUpData = false
}
let vc = viewControllers[selectIndex]
vc.listView.mj_header?.beginRefreshing()
}
//MARK:---滚动选择
var selectIndex = 0
func pagingViewController(_ pagingViewController: PagingViewController, didScrollToItem pagingItem: PagingItem, startingViewController: UIViewController?, destinationViewController: UIViewController, transitionSuccessful: Bool) {
guard let item = pagingItem as? PagingIndexItem else { return}
if selectIndex != item.index {
selectIndex = item.index
let vc = viewControllers[selectIndex]
if !vc.isUpData {
vc.listView.mj_header?.beginRefreshing()
}
}
}
}
extension RetailListMgVC: PagingViewControllerDataSource {
func pagingViewController(_: PagingViewController, pagingItemAt index: Int) -> PagingItem {
return PagingIndexItem(index: index, title: cities[index])
}
func pagingViewController(_: PagingViewController, viewControllerAt index: Int) -> UIViewController {
return viewControllers[index]
}
func numberOfViewControllers(in pagingViewController: PagingViewController) -> Int {
return cities.count
}
}
extension RetailListMgVC: PagingViewControllerSizeDelegate {
func pagingViewController(_ pagingViewController: PagingViewController, widthForPagingItem pagingItem: PagingItem, isSelected: Bool) -> CGFloat {
return ScreenWidth/2.0
}
}
GeliBusinessPlatform/ViewController/分销订单管理/RetailListMgVC.xib 0 → 100644
View file @ 52522eb2
<?xml version="1.0" encoding="UTF-8"?>
<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="17505"/>
<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="RetailListMgVC" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="contentV" destination="IQe-OE-2X6" id="rGJ-qQ-nX0"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IQe-OE-2X6">
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="IQe-OE-2X6" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="20f-Fo-8GQ"/>
<constraint firstItem="IQe-OE-2X6" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="aJt-84-gMv"/>
<constraint firstAttribute="bottom" secondItem="IQe-OE-2X6" secondAttribute="bottom" id="v1I-kU-eHx"/>
<constraint firstItem="IQe-OE-2X6" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="zBL-Xi-Lcz"/>
</constraints>
<point key="canvasLocation" x="35" y="92"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @ 52522eb2
......@@ -8,378 +8,83 @@
import UIKit
class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchBarViewDelegate,HeaderSelectViewDelegate ,SelectContentViewDelegate,TimeShowDownViewDeleagte,UITableViewDelegate,UITableViewDataSource,RetailManageFooterViewDelagte, GeliAlertViewDelegate{
class RetailManageViewController: BaseViewController,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_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
var keyword = ""
var isUpData = false{
didSet{
if !isUpData {
if listView != nil {
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!
//MARK:--VC 初始化
convenience init(title: String) {
self.init(title: title, content: "")
}
init(title: String, content: String) {
super.init(nibName: nil, bundle: nil)
self.title = title
if self.title == "代销订单" {
dbt_people = 2
}
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "分销订单管理"
navbar.lineView.isHidden = true
self.view.addSubview(navbar)
SetTopFrame(view: selectTpyeView, height: 45)
//searchbar
initSearchBar()
initHeaderSelectView()
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
var keyword = ""
func initSearchBar() {
let searchBr = SearchBarView.init()
self.searchBgView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
searchV = searchBr
searchBr.placeholderStr = "请输入订单编号/商品名称"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
}
//MARK: - searchView delegate
func clearSearchAction() {
print("取消搜索代理了--")
}
//MARK:--编辑即将结束
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
if keyword.count > 0 {
keyword = searchBar.text!
if keyword.count == 0 {
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
}
removeBlackBtnView()
}
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
if showSelectV != nil {
showSelectV.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
if timeShowDView != nil {
timeShowDView.removeFromSuperview()
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
self.view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.top.equalTo(searchBgView.snp_bottom)
make.left.right.bottom.equalToSuperview()
}
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
return true
}
@objc func removeBlackBtnView(){
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
}
}
var blackBtnView:UIButton! = nil
//MARK:--HeaderSelectView
weak var selectV: HeaderSelectView! = nil
var showSelectvIndex = 0
weak var showSelectV: SelectContentView! = nil
weak var timeShowDView: TimeShowDownView! = nil
var selectIndexArr = [0,0,0]
func initHeaderSelectView() {
let selectView = HeaderSelectView()
selectView.firstBtn.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);
}
selectView.delegate = self
selectV = selectView
}
//MARK:--下拉视图模块
func showAction(sender: Int) {
showSelectvIndex = sender
switch sender {
case 0:
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[0]
}
break
case 1:
do {
//选择时间
let timeShowDownView = TimeShowDownView()
self.view.addSubview(timeShowDownView)
timeShowDownView.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(changeBgView.snp_bottom)
}
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
}
}
func colseAction(sender: Int) {
if showSelectV != nil {
showSelectV.removeFromSuperview()
}
if timeShowDView != nil {
timeShowDView.removeFromSuperview()
}
}
//MARK:--SelectContentViewDelegate
func didselectCell(sender: Int) {
selectIndexArr[showSelectvIndex] = sender
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
listView.mj_header?.beginRefreshing()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
func selectContentvRemoveForSup() {
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
//MARK:--TimeShowDownViewDeleagte
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()
if seclectSaleType == 1 {
ischange = true
}else{
ischange2 = true
}
}
//MARK:--loadData
//MARK:--列表数据源
var dataArr:Array<dbtOrderLisDataModel> = []
var dataArr2:Array<dbtOrderLisDataModel> = []
@objc func loadData(){
isUpData = true
//结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
//分销商订单（0全部2分销商 3分销员）
dbt_type = selectIndexArr[0]
var pageNum = 1
if seclectSaleType == 1 {
page2 = 1
dbt_people = 2
pageNum = page2
}else{
page = 1
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]
page = 1
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"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.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.page2 = 2
self.listView.reloadData()
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
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
self.listView.mj_footer?.endRefreshing()
}
self.page = 2
} failture: { (error) in
self.listView.mj_header?.endRefreshing()
......@@ -388,47 +93,19 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
@objc func loadMoreData(){
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]
let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"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()
}
if dataM.data?.count == 0 {
self.listView.mj_footer?.endRefreshingWithNoMoreData()
}else{
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()
}
self.page += 1
dataM.data?.forEach({ (model) in
self.dataArr.append(model)
})
self.listView.reloadData()
self.listView.mj_footer?.endRefreshing()
}
......@@ -439,64 +116,36 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
}
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 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!
let goodModel = goodArrModel.order_goods![indexPath.row]
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
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
}
}
if seclectSaleType == 1 {
indexP2 = indexPath
}else{
indexP = indexPath
cell.dotImgV.isHidden = false
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if self.seclectSaleType == 1 {
if self.title == "代销订单" {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr2[indexPath.section]
vc.orderId = goodArrModel.order_id
......@@ -514,7 +163,7 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
@objc func didselectCellHorF(sender:UITapGestureRecognizer){
if seclectSaleType == 1 {
if self.title == "代销订单" {
let vc = RetailManageDetailViewController()
let goodArrModel = self.dataArr2[sender.view!.tag]
vc.orderId = goodArrModel.order_id
......@@ -529,57 +178,30 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
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)
headerV.tag = section
let contentV = RetailManageHeaderView()
headerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr2[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
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
}
return headerV
}else{
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
contentV.stateLbl.text = "未付款/" + dbt_typeStr
}else{
contentV.stateLbl.text = "未付款/" + dbt_typeStr
}
return headerV
}
return headerV
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
......@@ -587,53 +209,28 @@ class RetailManageViewController: BaseViewController,UISearchBarDelegate,SearchB
}
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! + "(已结算)"
let footerV = UIView()
let tap = UITapGestureRecognizer(target: self, action: #selector(didselectCellHorF))
footerV.addGestureRecognizer(tap)
footerV.tag = section
}else{
contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
let contentV = RetailManageFooterView()
footerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[section]
contentV.priceLbl.text = model.sum_amount!
if model.commission_status == 1 {
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)
footerV.tag = section
contentV.moneyLbl.text = model.sum_commission_val! + "(未结算)"
let contentV = RetailManageFooterView()
footerV.addSubview(contentV)
contentV.snp_makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
let model = self.dataArr[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
}
contentV.actionBtn.tag = section
contentV.delgate = self
return footerV
}
func tapRetailManageFooterBtnAction(sender: Int) {
......@@ -648,57 +245,30 @@ 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()
model.commission_status = 1
HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
self.listView.reloadSections([sender.tag], with: .none)
} failture: { (error) in
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 {
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 {
return 48
}
//或 自动结算 不需要显示标记
if model.dbt_type == 2 {
return 48
}
return 100
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 @ 52522eb2
......@@ -13,12 +13,8 @@
<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>
......@@ -28,123 +24,45 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9De-Db-9oa">
<rect key="frame" x="0.0" y="89" width="414" height="45"/>
<rect key="frame" x="0.0" y="44" width="414" height="50"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="Ypr-rF-zvE"/>
<constraint firstAttribute="height" constant="50" id="Ypr-rF-zvE"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dne-dW-uPU">
<rect key="frame" x="0.0" y="134" width="414" height="45"/>
<rect key="frame" x="0.0" y="94" 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="179" width="414" height="717"/>
<rect key="frame" x="0.0" y="139" width="414" height="757"/>
<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="9De-Db-9oa" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="6Zw-tb-D5v"/>
<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="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="97" y="110"/>
<point key="canvasLocation" x="-586" y="-21"/>
</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/工作中心/WorkCViewController.swift
View file @ 52522eb2
......@@ -666,7 +666,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return
case 140: //分销订单管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = RetailManageViewController()
let vc = RetailListMgVC()
self.navigationController?.pushViewController(vc, animated: true)
return
case 142: //供应商商品管理
......
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