Skip to content

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

添加订单列表流程（待完善）

parent 56579487
Show whitespace changes
Inline Side-by-side
Showing with 430 additions and 59 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ ee6201d5
......@@ -203,6 +203,12 @@
F95A9ED524551DF900867849 /* UIView+constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9ED424551DF900867849 /* UIView+constraints.swift */; };
F95A9ED8245520E500867849 /* OrderListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9ED6245520E500867849 /* OrderListVC.swift */; };
F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95A9ED7245520E500867849 /* OrderListVC.xib */; };
F95A9EDD24557CD500867849 /* GuanLianKehuVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9EDB24557CD500867849 /* GuanLianKehuVC.swift */; };
F95A9EDE24557CD500867849 /* GuanLianKehuVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95A9EDC24557CD500867849 /* GuanLianKehuVC.xib */; };
F95A9EE924558B8800867849 /* ShowAlGoodsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9EE724558B8800867849 /* ShowAlGoodsViewController.swift */; };
F95A9EEA24558B8800867849 /* ShowAlGoodsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95A9EE824558B8800867849 /* ShowAlGoodsViewController.xib */; };
F95A9EED24558E3D00867849 /* ChangeGoodsPriceVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95A9EEB24558E3D00867849 /* ChangeGoodsPriceVC.swift */; };
F95A9EEE24558E3D00867849 /* ChangeGoodsPriceVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95A9EEC24558E3D00867849 /* ChangeGoodsPriceVC.xib */; };
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */; };
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9B512448530E0080D6E3 /* GeliAlertView.swift */; };
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */; };
......@@ -468,6 +474,12 @@
F95A9ED424551DF900867849 /* UIView+constraints.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+constraints.swift"; sourceTree = "<group>"; };
F95A9ED6245520E500867849 /* OrderListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderListVC.swift; sourceTree = "<group>"; };
F95A9ED7245520E500867849 /* OrderListVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OrderListVC.xib; sourceTree = "<group>"; };
F95A9EDB24557CD500867849 /* GuanLianKehuVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuanLianKehuVC.swift; sourceTree = "<group>"; };
F95A9EDC24557CD500867849 /* GuanLianKehuVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GuanLianKehuVC.xib; sourceTree = "<group>"; };
F95A9EE724558B8800867849 /* ShowAlGoodsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowAlGoodsViewController.swift; sourceTree = "<group>"; };
F95A9EE824558B8800867849 /* ShowAlGoodsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShowAlGoodsViewController.xib; sourceTree = "<group>"; };
F95A9EEB24558E3D00867849 /* ChangeGoodsPriceVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGoodsPriceVC.swift; sourceTree = "<group>"; };
F95A9EEC24558E3D00867849 /* ChangeGoodsPriceVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChangeGoodsPriceVC.xib; sourceTree = "<group>"; };
F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GeliAlertView.xib; sourceTree = "<group>"; };
F95D9B512448530E0080D6E3 /* GeliAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeliAlertView.swift; sourceTree = "<group>"; };
F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopInfoViewController.swift; sourceTree = "<group>"; };
......@@ -986,6 +998,9 @@
E0DDCB0B244AD84500DF54C7 /* 订单管理 */ = {
isa = PBXGroup;
children = (
F95A9EE224558B3D00867849 /* 查看全部 */,
F95A9EE124558B2F00867849 /* 普通商品修改价格 */,
F95A9EDA24557C4700867849 /* 关联客户 */,
E0DDCB15244AE27500DF54C7 /* 预售价格修改 */,
);
path = "订单管理";
......@@ -1172,6 +1187,33 @@
path = Parchment;
sourceTree = "<group>";
};
F95A9EDA24557C4700867849 /* 关联客户 */ = {
isa = PBXGroup;
children = (
F95A9EDB24557CD500867849 /* GuanLianKehuVC.swift */,
F95A9EDC24557CD500867849 /* GuanLianKehuVC.xib */,
);
path = "关联客户";
sourceTree = "<group>";
};
F95A9EE124558B2F00867849 /* 普通商品修改价格 */ = {
isa = PBXGroup;
children = (
F95A9EEB24558E3D00867849 /* ChangeGoodsPriceVC.swift */,
F95A9EEC24558E3D00867849 /* ChangeGoodsPriceVC.xib */,
);
path = "普通商品修改价格";
sourceTree = "<group>";
};
F95A9EE224558B3D00867849 /* 查看全部 */ = {
isa = PBXGroup;
children = (
F95A9EE724558B8800867849 /* ShowAlGoodsViewController.swift */,
F95A9EE824558B8800867849 /* ShowAlGoodsViewController.xib */,
);
path = "查看全部";
sourceTree = "<group>";
};
F95D9B4E24484F140080D6E3 /* AlertView */ = {
isa = PBXGroup;
children = (
......@@ -1409,6 +1451,7 @@
E08B0675244A98B2001D2E01 /* WareHouseSpCell.xib in Resources */,
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
E02DDD8B244FE17400ABB707 /* NewCreateFooter.xib in Resources */,
F95A9EEE24558E3D00867849 /* ChangeGoodsPriceVC.xib in Resources */,
E0DDCB19244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib in Resources */,
E09F4CA32452D18800BE033D /* ZengZhiServicesViewController.xib in Resources */,
F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
......@@ -1416,6 +1459,7 @@
F961D27524503CCF007FBE70 /* OrderSelectMoreView.xib in Resources */,
E042F74524529B8500CDFA12 /* JiTuoWuXinXiView.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
F95A9EEA24558B8800867849 /* ShowAlGoodsViewController.xib in Resources */,
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */,
......@@ -1434,6 +1478,7 @@
E0F97B1B2451951D001BD600 /* ShangPinGguiGeCell.xib in Resources */,
E0336DD6244EC40000380BE9 /* CreatNewSpecsViewController.xib in Resources */,
E0C4F4B6244EE9EE00CC7E2F /* YuShouCell.xib in Resources */,
F95A9EDE24557CD500867849 /* GuanLianKehuVC.xib in Resources */,
E0273DDE24551D4500B3FCAE /* OnlyLabelCell.xib in Resources */,
E00D85E5244561FE00F5F816 /* Assets.xcassets in Resources */,
E0A2E82424555AA700D6DB34 /* KuCunShangPinViewController.xib in Resources */,
......@@ -1536,6 +1581,7 @@
E0F97B102451728D001BD600 /* AddGuiGeCell.swift in Sources */,
E0F97B1A2451951D001BD600 /* ShangPinGguiGeCell.swift in Sources */,
F950FDDB24518B9500C40530 /* FSCalendarStickyHeader.m in Sources */,
F95A9EE924558B8800867849 /* ShowAlGoodsViewController.swift in Sources */,
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */,
F950FDD924518B9500C40530 /* FSCalendarDelegationFactory.m in Sources */,
E0A2E82B24555D8600D6DB34 /* KuCunXiangQingCell.swift in Sources */,
......@@ -1547,13 +1593,12 @@
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
F9171EFC245128B200359C2B /* Interface.swift in Sources */,
E0F97B082451620B001BD600 /* ProductDetailViewController.swift in Sources */,
F95A9EDD24557CD500867849 /* GuanLianKehuVC.swift in Sources */,
E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */,
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */,
F950FDA52451453A00C40530 /* ShopInfoModel.swift in Sources */,
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */,
F95A9ED524551DF900867849 /* UIView+constraints.swift in Sources */,
E0A2E82324555AA700D6DB34 /* KuCunShangPinViewController.swift in Sources */,
F933F6CA2452C68B00189561 /* PKHUDRotatingImageView.swift in Sources */,
F950FDE324518B9500C40530 /* FSCalendarHeaderView.m in Sources */,
......@@ -1616,6 +1661,7 @@
E0F97B1424517A31001BD600 /* CommendCell.swift in Sources */,
E0D4165F24482AAF008DCAB4 /* AccountViewController.swift in Sources */,
F950FDB32451820D00C40530 /* TitleAndSelCalendarView.swift in Sources */,
F95A9EED24558E3D00867849 /* ChangeGoodsPriceVC.swift in Sources */,
E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */,
E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */,
F933F6C32452C68B00189561 /* FrameView.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/背景色/按钮渐变色下,字体颜色.colorset/Contents.json
View file @ ee6201d5
{
"properties" : {
"localizable" : true
},
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0x46",
"alpha" : "1.000",
"blue" : "0xE2",
"green" : "0x8F"
"blue" : "0xE3",
"green" : "0x8F",
"red" : "0x47"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
]
}
GeliBusinessPlatform/SceneDelegate.swift
View file @ ee6201d5
......@@ -35,11 +35,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
}
//MARK:--loginVC
func addLoginVc (isAgain:Bool){
// let vc = LoginViewController()
// vc.delegate = self
// let contentView = vc
let vc = LoginViewController()
vc.delegate = self
let contentView = vc
let contentView = ChuKuViewController()
// let contentView = ChuKuViewController()
if let windowScene = sceneC as? UIWindowScene {
if isAgain {
......
GeliBusinessPlatform/View/Cell/ChangePriceNormalCell.xib
View file @ ee6201d5
......@@ -128,7 +128,7 @@
</objects>
<resources>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/View/Cell/DaiQueRenCell.xib
View file @ ee6201d5
......@@ -264,7 +264,7 @@
<color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮背景颜色">
<color red="0.2199999988079071" green="0.45500001311302185" blue="0.82700002193450928" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.swift
View file @ ee6201d5
......@@ -27,6 +27,7 @@ class GuanLianKeHuCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
self.selectionStyle = .none
}
override func setSelected(_ selected: Bool, animated: Bool) {
......
GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.xib
View file @ ee6201d5
......@@ -120,12 +120,22 @@
<action selector="btnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="KpV-b1-9i2"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ec0-pY-RFD">
<rect key="frame" x="15" y="99" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="hct-Td-2CF"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="QI3-nS-9hL" firstAttribute="centerY" secondItem="llc-wu-Qjo" secondAttribute="centerY" id="3cI-Bb-s4F"/>
<constraint firstAttribute="trailing" secondItem="F70-8y-cQB" secondAttribute="trailing" constant="15" id="5kb-5L-tsd"/>
<constraint firstItem="YvY-yP-Zr7" firstAttribute="centerY" secondItem="WR0-yV-WjT" secondAttribute="centerY" id="5lG-ku-rbA"/>
<constraint firstItem="k7A-Qs-Puc" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="6u3-P3-hvr"/>
<constraint firstAttribute="bottom" secondItem="ec0-pY-RFD" secondAttribute="bottom" id="ARP-s3-aXE"/>
<constraint firstAttribute="trailing" secondItem="ec0-pY-RFD" secondAttribute="trailing" id="AbD-K6-l9Y"/>
<constraint firstItem="ec0-pY-RFD" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="DPE-Fy-OaG"/>
<constraint firstItem="ljV-Gc-YnI" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="GCg-gX-SYB"/>
<constraint firstItem="k7A-Qs-Puc" firstAttribute="leading" secondItem="WR0-yV-WjT" secondAttribute="trailing" constant="10" id="Jdc-Ll-m3r"/>
<constraint firstAttribute="trailingMargin" secondItem="vLg-1W-z2S" secondAttribute="trailing" constant="15" id="KOW-Bj-cOn"/>
......@@ -166,11 +176,14 @@
<color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/View/Cell/MsgCenterCell.xib
View file @ ee6201d5
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -49,27 +49,13 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L0Y-lD-jK8">
<rect key="frame" x="15" y="45" width="315" height="45"/>
<attributedString key="attributedText">
<fragment content="亲爱的格利食品网商户您好，您提交的（六和川香鸡柳">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" size="13" name=".PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content=" 2.5kg*2">
<fragment content="亲爱的格利食品网商户您好，您提交的（六和川香鸡柳 2.5kg*2）商品已通过审核。">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" metaFont="system"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="）商品已通过审核。">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" size="13" name=".PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
......@@ -120,10 +106,10 @@
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @ ee6201d5
......@@ -81,7 +81,9 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
//跳转订单详情
let vc = OrderDViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
......
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift 0 → 100644
View file @ ee6201d5
//
// GuanLianKehuVC.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/26.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import ViewAnimator
class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataSource{
@IBOutlet weak var contentView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "关联客户"
self.view.addSubview(navbar)
setTabv()
}
var tableV :UITableView!
private let animations = [AnimationType.from(direction: .bottom, offset: 150*glscale)]
func setTabv() {
tableV = UITableView()
contentView.addSubview(tableV);
tableV.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(navbar.snp_bottom)
}
tableV.backgroundColor = UIColor.init(named: "白色背景色")
tableV.delegate = self
tableV.dataSource = self
tableV.separatorStyle = .none
tableV?.register(UINib(nibName: "GuanLianKeHuCell", bundle: nil), forCellReuseIdentifier: "GuanLianKeHuCell")
let footerTbV = UIView(frame: CGRect(x: 0, y: 0, width: view.frame.size.width, height: 15*glscale))
footerTbV.backgroundColor = UIColor.init(named: "白色背景色")
tableV.tableFooterView = footerTbV
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "GuanLianKeHuCell") as! GuanLianKeHuCell
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 100*glscale
}
}
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.xib 0 → 100644
View file @ ee6201d5
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GuanLianKehuVC" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="contentView" destination="3TM-jG-VM2" id="MXs-d9-jVo"/>
<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="US6-R4-qxF" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="5xr-Qj-HWT"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fUh-0E-kXZ">
<rect key="frame" x="0.0" y="862" width="414" height="50"/>
<color key="backgroundColor" name="按钮渐变色下,字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="6jk-sA-tZb"/>
</constraints>
<state key="normal">
<color key="titleColor" name="按钮渐变色下,字体颜色"/>
</state>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3TM-jG-VM2">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" name="白色背景色"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="fUh-0E-kXZ" firstAttribute="top" secondItem="US6-R4-qxF" secondAttribute="bottom" id="4oc-7X-nPj"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3TM-jG-VM2" secondAttribute="trailing" id="4tF-Ah-gJ7"/>
<constraint firstItem="3TM-jG-VM2" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Hqt-Qn-BQ9"/>
<constraint firstItem="3TM-jG-VM2" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Ics-t0-UuG"/>
<constraint firstItem="fUh-0E-kXZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="LJ8-2p-TWo"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="US6-R4-qxF" secondAttribute="trailing" id="U01-EV-dom"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="US6-R4-qxF" secondAttribute="bottom" id="XWg-QJ-Det"/>
<constraint firstItem="US6-R4-qxF" firstAttribute="top" secondItem="3TM-jG-VM2" secondAttribute="bottom" id="fqZ-Ea-rhD"/>
<constraint firstAttribute="trailing" secondItem="fUh-0E-kXZ" secondAttribute="trailing" id="wmN-Jb-mVD"/>
<constraint firstItem="US6-R4-qxF" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="xio-WK-uuf"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="134.59821428571428"/>
</view>
</objects>
<resources>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/订单管理/普通商品修改价格/ChangeGoodsPriceVC.swift 0 → 100644
View file @ ee6201d5
//
// ChangeGoodsPriceVC.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/26.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class ChangeGoodsPriceVC: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "修改价格"
self.view.addSubview(navbar)
self.view.backgroundColor = UIColor.white
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
GeliBusinessPlatform/ViewController/订单管理/普通商品修改价格/ChangeGoodsPriceVC.xib 0 → 100644
View file @ ee6201d5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ChangeGoodsPriceVC" customModuleProvider="target">
<connections>
<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="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
</view>
</objects>
</document>
GeliBusinessPlatform/ViewController/订单管理/查看全部/ShowAlGoodsViewController.swift 0 → 100644
View file @ ee6201d5
//
// ShowAlGoodsViewController.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/26.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import ViewAnimator
class ShowAlGoodsViewController: BaseViewController , UITableViewDelegate, UITableViewDataSource{
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "查看全部商品"
self.view.addSubview(navbar)
setTabv()
}
var tableV :UITableView!
private let animations = [AnimationType.from(direction: .bottom, offset: 150*glscale)]
func setTabv() {
tableV = UITableView()
view.addSubview(tableV);
tableV.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(navbar.snp_bottom)
}
tableV.backgroundColor = UIColor.init(named: "白色背景色")
tableV.delegate = self
tableV.dataSource = self
tableV.separatorStyle = .none
tableV?.register(UINib(nibName: "ChangePriceNormalCell", bundle: nil), forCellReuseIdentifier: "ChangePriceNormalCell")
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "ChangePriceNormalCell") as! ChangePriceNormalCell
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print(indexPath)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 120*glscale
}
}
GeliBusinessPlatform/ViewController/订单管理/查看全部/ShowAlGoodsViewController.xib 0 → 100644
View file @ ee6201d5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ShowAlGoodsViewController" customModuleProvider="target">
<connections>
<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="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
</view>
</objects>
</document>
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ ee6201d5
......@@ -16,8 +16,7 @@ class OrderDViewController: BaseViewController {
var clientLbl:UILabel? //客户名称
var statusLbl:UILabel? //订单状态：待付款
//是否预售
var isBooking:Bool = true
//MARK: - 订单状态
var djLbl:UILabel?//定金
var wkLbl:UILabel?//尾款
......@@ -51,7 +50,8 @@ class OrderDViewController: BaseViewController {
var secondDetailLbl:UILabel?//第2个商品详情
var secondPriceLbl:UILabel?//第2个商品价格
//是否预售
var isBooking:Bool = false
//测试数据
var listArray = ["a","b","c"]
let btmBtnTitleArray = ["修改价格","打印","确认订单","取消订单"]
......@@ -72,8 +72,9 @@ class OrderDViewController: BaseViewController {
let partThird = self.setPartThird(partSecond: partSecond)
self.setPartForth(partThird: partThird)
//是否预售。
// isBooking 仅会出现一个商品
// listArray.count 根据数量判断显示
// Do any additional setup after loading the view.
}
//MARK: - 详情第四栏
......@@ -85,18 +86,18 @@ class OrderDViewController: BaseViewController {
make.top.equalTo(partThird.snp_bottom).offset(10)
make.left.equalTo(0)
make.width.equalTo(fullScreenWidth)
make.height.equalTo(515)
make.height.equalTo(485)
make.bottom.equalTo(scrollView.snp_bottom)//scrollview滚动必要代码
}
let bottomColor = UIView()
bottomColor.backgroundColor = UIColor(named: "app底色")
partForth.addSubview(bottomColor)
bottomColor.snp.makeConstraints { (make) in
make.bottom.left.right.equalTo(0)
make.height.equalTo(30)
}
//
// let bottomColor = UIView()
// bottomColor.backgroundColor = UIColor(named: "app底色")
// partForth.addSubview(bottomColor)
// bottomColor.snp.makeConstraints { (make) in
// make.bottom.left.right.equalTo(0)
// make.height.equalTo(30)
// }
//
let title = UILabel()
partForth.addSubview(title)
title.text = "订单信息"
......@@ -1112,9 +1113,11 @@ class OrderDViewController: BaseViewController {
sender.addSubview(btn)
}
}
//跳转关联客户选择
//MARK:--跳转关联客户选择
@objc func selectClint(){
print("selectClint")
let vc = GuanLianKehuVC()
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK: - 方法
func getStringSize(str:NSAttributedString)->CGSize{
......@@ -1125,11 +1128,23 @@ class OrderDViewController: BaseViewController {
return size
}
//MARK:--查看全部商品
@objc func showDetailList(){
print("showDetailList")
let vc = ShowAlGoodsViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
//MARK:--底部按钮代理
@objc func bottomButtonClickAction(sender:UIButton){
print(sender.tag)
//预售商品价格
let vc = XiuGaiYuShouJiaViewController()
self.navigationController?.pushViewController(vc, animated: true)
//普通商品修改价格
// let vc = ChangeGoodsPriceVC()
// self.navigationController?.pushViewController(vc, animated: true)
}
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.xib
View file @ ee6201d5
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -20,10 +20,29 @@
<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="wbd-9Z-bEE">
<rect key="frame" x="0.0" y="862" width="414" height="40"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="7MW-Rh-NM6"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jem-Gu-j7D">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B8o-q3-gft">
<rect key="frame" x="0.0" y="0.0" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="LYO-fR-p1o"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstItem="B8o-q3-gft" firstAttribute="top" secondItem="Jem-Gu-j7D" secondAttribute="top" id="RCR-Q9-a6n"/>
<constraint firstItem="B8o-q3-gft" firstAttribute="leading" secondItem="Jem-Gu-j7D" secondAttribute="leading" id="Zc1-DV-uD0"/>
<constraint firstAttribute="trailing" secondItem="B8o-q3-gft" secondAttribute="trailing" id="gn5-oa-9pA"/>
<constraint firstAttribute="height" constant="49" id="vdo-gl-g7M"/>
</constraints>
</view>
......@@ -54,8 +73,11 @@
<constraints>
<constraint firstItem="4uA-rD-k2j" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="1ZI-2E-T76"/>
<constraint firstItem="4uA-rD-k2j" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="2cI-nP-14D"/>
<constraint firstItem="wbd-9Z-bEE" firstAttribute="top" secondItem="Jem-Gu-j7D" secondAttribute="bottom" id="LER-og-6fg"/>
<constraint firstAttribute="trailing" secondItem="wbd-9Z-bEE" secondAttribute="trailing" id="Lxr-Hm-VyL"/>
<constraint firstItem="Jem-Gu-j7D" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="M6u-6I-XFO"/>
<constraint firstItem="4uA-rD-k2j" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="Tlv-Dy-TQe"/>
<constraint firstItem="wbd-9Z-bEE" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="bjB-XK-ifb"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="Jem-Gu-j7D" secondAttribute="bottom" id="fJd-Ae-otD"/>
<constraint firstItem="Jem-Gu-j7D" firstAttribute="top" secondItem="4uA-rD-k2j" secondAttribute="bottom" id="tSM-XJ-O3F"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Jem-Gu-j7D" secondAttribute="trailing" id="vtd-Hy-bsE"/>
......@@ -68,6 +90,9 @@
<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="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
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