Skip to content

G
GeliBusinessPlatform
Commit 61e75c1d authored by lujunye's avatar lujunye
Browse files
Options

切换货拉拉

parent 5f286e48
Hide whitespace changes
Inline Side-by-side
Showing with 339 additions and 70 deletions
GeliBusinessPlatform/Assets.xcassets/字体色/#E37847.colorset/Contents.json 0 → 100644
View file @ 61e75c1d
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.278",
"green" : "0.471",
"red" : "0.890"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 61e75c1d
......@@ -108,17 +108,58 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let vc = XiaDanChengGongViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBOutlet weak var topBtnView: UIView!
@IBOutlet weak var bottomView: UIView!
@IBOutlet weak var listView: UITableView!
var locBtn = UIButton()
@IBOutlet weak var hListView: UITableView!
@IBAction func selectAction(_ sender: UIButton) {
if rightBtn == sender {
rightBtn.isSelected = true
leftBtn.isSelected = false
lineV.frame.origin.x = fullScreenWidth * 0.5
hllView.isHidden = false
if fullScreenHeight > 736 {
hBtnViewH.constant = 83
}else{
hBtnViewH.constant = 49
}
}else{
rightBtn.isSelected = false
leftBtn.isSelected = true
lineV.frame.origin.x = 0
hllView.isHidden = true
}
}
@IBOutlet weak var lineV: UIView!
@IBOutlet weak var leftBtn: UIButton!
@IBOutlet weak var hBtnViewH: NSLayoutConstraint!
@IBOutlet weak var hllView: UIView!
@IBOutlet weak var rightBtn: UIButton!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "运单列表"
self.view.addSubview(navbar)
listView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.bottom.equalTo(bottomView.snp_top)
}
locBtn.backgroundColor = UIColor.red
self.view.addSubview(locBtn)
locBtn.snp_makeConstraints({ (make) in
make.right.equalTo(-15)
make.centerY.equalTo(navbar.snp_centerY).offset(10)
make.height.equalTo(30)
make.width.equalTo(100)
})
SetTopFrame(view: topBtnView, height: 44)
listView.separatorStyle = .none
listView.register(UINib(nibName: "AdressSelectCell", bundle: nil), forCellReuseIdentifier: "AdressSelect")
listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
......@@ -127,7 +168,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
// Do any additional setup after loading the view.
}
@objc func selectBtnClick(sender:UIButton){
if sender.tag == 99 {
//跳转查看合同页面
......@@ -267,48 +308,49 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return 49
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch indexPath.section {
case 0:
let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
cell.titleLbl.text = "寄"
cell.tag = indexPath.row
cell.delegate = self
cell.contentLbl.isHidden = false
cell.contentV.isHidden = true
if indexPath.row == 0 {
if sender != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = sender!
cell.phoneLbl.text = sendPhone!
cell.adrLbl.text = sendAdr!
// if tableView == listView {
switch indexPath.section {
case 0:
let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
cell.titleLbl.text = "寄"
cell.tag = indexPath.row
cell.delegate = self
cell.contentLbl.isHidden = false
cell.contentV.isHidden = true
if indexPath.row == 0 {
if sender != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = sender!
cell.phoneLbl.text = sendPhone!
cell.adrLbl.text = sendAdr!
}
}
}
if indexPath.row == 1 {
cell.titleLbl.backgroundColor = UIColor(named: "企业、预售字体")
cell.titleLbl.text = "收"
if receiver != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = receiver!
cell.phoneLbl.text = receivePhone!
cell.adrLbl.text = receiveAdr!
if indexPath.row == 1 {
cell.titleLbl.backgroundColor = UIColor(named: "企业、预售字体")
cell.titleLbl.text = "收"
if receiver != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = receiver!
cell.phoneLbl.text = receivePhone!
cell.adrLbl.text = receiveAdr!
}
}
}
return cell
case 1:
let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCenter") as! PersonCenterCell
cell.titleLbl.text = titleArr[indexPath.row]
if indexPath.row == 0 {
cell.introLbl.text = "（必填）"
cell.introLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.introLbl.isHidden = false
if isCheck != nil {
cell.contentStr = itemName + "; \(count!)箱; \(weight!)kg"
return cell
case 1:
let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCenter") as! PersonCenterCell
cell.titleLbl.text = titleArr[indexPath.row]
if indexPath.row == 0 {
cell.introLbl.text = "（必填）"
cell.introLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.introLbl.isHidden = false
if isCheck != nil {
cell.contentStr = itemName + "; \(count!)箱; \(weight!)kg"
}
}
}
if indexPath.row == 1 {
if indexPath.row == 1 {
var sendStr = "上门提货"
if send != 0 {
sendStr = "自送到库"
......@@ -318,26 +360,27 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
receiveStr = "到库自取"
}
cell.contentStr = sendStr + "; " + receiveStr
}
if indexPath.row == 2 {
cell.introLbl.isHidden = false
if price != nil {
cell.contentStr = "报价金额:\(price!)"
}
}
if indexPath.row == 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "WenDu") as! WenDuCell
cell.titleLbl.text = titleArr[indexPath.row]
if indexPath.row == 2 {
cell.introLbl.isHidden = false
if price != nil {
cell.contentStr = "报价金额:\(price!)"
}
}
if indexPath.row == 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "WenDu") as! WenDuCell
cell.titleLbl.text = titleArr[indexPath.row]
return cell
}
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
cell.nameLbl.text = title2Arr[indexPath.row]
return cell
}
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
cell.nameLbl.text = title2Arr[indexPath.row]
return cell
}
// }
}
}
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.xib
View file @ 61e75c1d
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -12,8 +12,15 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XiaYunDanViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="BXb-QP-ceT" id="mix-bc-FvQ"/>
<outlet property="hBtnViewH" destination="udi-Jp-eUF" id="lD6-tv-X0U"/>
<outlet property="hListView" destination="IhS-vZ-6YK" id="8cK-6U-GmQ"/>
<outlet property="hllView" destination="YuH-ma-NxC" id="NGT-vB-0HH"/>
<outlet property="leftBtn" destination="86G-oA-9TP" id="2oU-Vm-Kqo"/>
<outlet property="lineV" destination="wjp-2Y-o2i" id="sHe-xK-woI"/>
<outlet property="listView" destination="Try-UC-8fP" id="plR-El-hxN"/>
<outlet property="priceLbl" destination="TJP-xc-KTh" id="NH7-PB-8a7"/>
<outlet property="rightBtn" destination="X6m-t6-gdl" id="yiF-bx-dJm"/>
<outlet property="topBtnView" destination="3NL-zo-jTU" id="7XJ-gu-PcZ"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......@@ -54,13 +61,25 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="00z-eF-Akb" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="304" y="0.0" width="110" height="49"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下运单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wU5-88-RNl">
<rect key="frame" x="0.0" y="0.0" width="110" height="49"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="wU5-88-RNl" secondAttribute="bottom" id="6ms-kj-Etu"/>
<constraint firstItem="wU5-88-RNl" firstAttribute="leading" secondItem="00z-eF-Akb" secondAttribute="leading" id="VwB-sE-o6w"/>
<constraint firstAttribute="width" constant="110" id="nhu-c8-Mft">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstAttribute="trailing" secondItem="wU5-88-RNl" secondAttribute="trailing" id="vnG-vV-raa"/>
<constraint firstItem="wU5-88-RNl" firstAttribute="top" secondItem="00z-eF-Akb" secondAttribute="top" id="yRb-MU-1Fp"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
......@@ -70,11 +89,9 @@
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="下运单"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFangSC"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="orderAction:" destination="-1" eventType="touchUpInside" id="J3x-Db-ytY"/>
......@@ -153,13 +170,175 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Try-UC-8fP">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<rect key="frame" x="0.0" y="88" width="414" height="725"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="725" id="X1M-Vb-jWc"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="1.25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="dataSource" destination="-1" id="hQJ-nS-MOv"/>
<outlet property="delegate" destination="-1" id="xux-t3-2NT"/>
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3NL-zo-jTU">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="86G-oA-9TP">
<rect key="frame" x="0.0" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="冷链物流">
<color key="titleColor" name="9A9A9A"/>
</state>
<state key="selected" title="冷链物流">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="selectAction:" destination="-1" eventType="touchUpInside" id="qVz-i0-w67"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X6m-t6-gdl">
<rect key="frame" x="207" y="0.0" width="207" height="44"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="货拉拉">
<color key="titleColor" name="9A9A9A"/>
</state>
<state key="selected" title="货拉拉">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="selectAction:" destination="-1" eventType="touchUpInside" id="ZWY-pw-pFx"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wjp-2Y-o2i">
<rect key="frame" x="0.0" y="41.666666666666671" width="207" height="2.3333333333333357"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
<constraint firstAttribute="height" constant="2.5" id="ye7-VX-9LR"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="wjp-2Y-o2i" firstAttribute="width" secondItem="86G-oA-9TP" secondAttribute="width" id="0P6-Zl-UfX"/>
<constraint firstAttribute="trailing" secondItem="X6m-t6-gdl" secondAttribute="trailing" id="821-8V-ijz"/>
<constraint firstAttribute="bottom" secondItem="X6m-t6-gdl" secondAttribute="bottom" id="Ja5-4Z-j5K"/>
<constraint firstItem="X6m-t6-gdl" firstAttribute="leading" secondItem="86G-oA-9TP" secondAttribute="trailing" id="Ncg-0V-VRo"/>
<constraint firstAttribute="bottom" secondItem="86G-oA-9TP" secondAttribute="bottom" id="ZTP-ZO-FTn"/>
<constraint firstAttribute="bottom" secondItem="wjp-2Y-o2i" secondAttribute="bottom" id="ihi-GN-FRI"/>
<constraint firstItem="X6m-t6-gdl" firstAttribute="width" secondItem="86G-oA-9TP" secondAttribute="width" id="jMw-24-QFW"/>
<constraint firstItem="86G-oA-9TP" firstAttribute="leading" secondItem="3NL-zo-jTU" secondAttribute="leading" id="mML-rz-nHa"/>
<constraint firstItem="X6m-t6-gdl" firstAttribute="top" secondItem="3NL-zo-jTU" secondAttribute="top" id="nUr-he-cA2"/>
<constraint firstItem="86G-oA-9TP" firstAttribute="top" secondItem="3NL-zo-jTU" secondAttribute="top" id="wen-rg-toz"/>
<constraint firstItem="wjp-2Y-o2i" firstAttribute="leading" secondItem="3NL-zo-jTU" secondAttribute="leading" id="xGY-DP-rao"/>
</constraints>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YuH-ma-NxC">
<rect key="frame" x="0.0" y="88" width="414" height="808"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9RP-mp-AOf">
<rect key="frame" x="0.0" y="758" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="nUl-uv-fhR"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KH0-Nd-WU0">
<rect key="frame" x="0.0" y="759" width="304" height="49"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="下运单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zyY-z2-r2h">
<rect key="frame" x="160" y="381" width="94" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预估价格：¥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kz8-Xu-Ms3">
<rect key="frame" x="19.999999999999996" y="777" width="63.666666666666657" height="13"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6050.30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b3u-F0-etc">
<rect key="frame" x="86.666666666666671" y="769.66666666666663" width="66.000000000000014" height="24"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IhS-vZ-6YK">
<rect key="frame" x="0.0" y="0.0" width="414" height="758"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</tableView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iF4-Vu-8Dl">
<rect key="frame" x="252" y="757.66666666666663" width="52" height="52"/>
<constraints>
<constraint firstAttribute="width" constant="52" id="XCz-J7-8Wg"/>
<constraint firstAttribute="height" constant="52" id="kQy-Xw-OAK"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<state key="normal" title="明细">
<color key="titleColor" name="#E37847"/>
</state>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qOG-da-TxK" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="304" y="759" width="110" height="49"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下运单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WGD-xV-qZB">
<rect key="frame" x="333.66666666666669" y="771.66666666666663" width="51" height="24"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstItem="qOG-da-TxK" firstAttribute="leading" secondItem="iF4-Vu-8Dl" secondAttribute="trailing" id="4OG-bN-9VZ"/>
<constraint firstItem="9RP-mp-AOf" firstAttribute="top" secondItem="IhS-vZ-6YK" secondAttribute="bottom" id="52u-uo-fwV"/>
<constraint firstAttribute="trailing" secondItem="IhS-vZ-6YK" secondAttribute="trailing" id="7du-v1-iTw"/>
<constraint firstAttribute="trailing" secondItem="9RP-mp-AOf" secondAttribute="trailing" id="7nn-w0-TN7"/>
<constraint firstItem="Kz8-Xu-Ms3" firstAttribute="leading" secondItem="YuH-ma-NxC" secondAttribute="leading" constant="20" id="80R-9K-Kfr"/>
<constraint firstAttribute="trailing" secondItem="KH0-Nd-WU0" secondAttribute="trailing" constant="110" id="86d-l5-X20"/>
<constraint firstItem="IhS-vZ-6YK" firstAttribute="leading" secondItem="YuH-ma-NxC" secondAttribute="leading" id="9Ta-8U-ukQ"/>
<constraint firstAttribute="bottom" secondItem="qOG-da-TxK" secondAttribute="bottom" id="9wI-Zc-EnO"/>
<constraint firstItem="KH0-Nd-WU0" firstAttribute="leading" secondItem="YuH-ma-NxC" secondAttribute="leading" id="Jb1-nw-v3l"/>
<constraint firstItem="KH0-Nd-WU0" firstAttribute="top" secondItem="9RP-mp-AOf" secondAttribute="bottom" id="MaH-T2-yyG"/>
<constraint firstItem="WGD-xV-qZB" firstAttribute="centerX" secondItem="qOG-da-TxK" secondAttribute="centerX" id="R8I-jC-zc1"/>
<constraint firstItem="b3u-F0-etc" firstAttribute="leading" secondItem="Kz8-Xu-Ms3" secondAttribute="trailing" constant="3" id="WwB-hj-9Yf"/>
<constraint firstItem="iF4-Vu-8Dl" firstAttribute="centerY" secondItem="Kz8-Xu-Ms3" secondAttribute="centerY" id="ZSH-at-m2O"/>
<constraint firstItem="WGD-xV-qZB" firstAttribute="centerY" secondItem="Kz8-Xu-Ms3" secondAttribute="centerY" id="cU7-xY-zHX"/>
<constraint firstAttribute="bottom" secondItem="KH0-Nd-WU0" secondAttribute="bottom" id="e91-zi-M9d"/>
<constraint firstItem="qOG-da-TxK" firstAttribute="top" secondItem="9RP-mp-AOf" secondAttribute="bottom" id="hP3-nc-01e"/>
<constraint firstItem="qOG-da-TxK" firstAttribute="leading" secondItem="KH0-Nd-WU0" secondAttribute="trailing" id="hWl-5o-3Do"/>
<constraint firstAttribute="trailing" secondItem="qOG-da-TxK" secondAttribute="trailing" id="ioV-U8-VXK"/>
<constraint firstItem="Kz8-Xu-Ms3" firstAttribute="top" secondItem="9RP-mp-AOf" secondAttribute="bottom" constant="18" id="l6N-8F-KX2"/>
<constraint firstItem="IhS-vZ-6YK" firstAttribute="top" secondItem="YuH-ma-NxC" secondAttribute="top" id="l7B-SZ-1F4"/>
<constraint firstItem="b3u-F0-etc" firstAttribute="centerY" secondItem="Kz8-Xu-Ms3" secondAttribute="centerY" constant="-2" id="nkF-gv-ahQ"/>
<constraint firstItem="9RP-mp-AOf" firstAttribute="leading" secondItem="YuH-ma-NxC" secondAttribute="leading" id="q5o-vi-WAd"/>
<constraint firstAttribute="bottom" secondItem="9RP-mp-AOf" secondAttribute="bottom" constant="49" id="udi-Jp-eUF"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
......@@ -167,21 +346,35 @@
<constraint firstItem="Try-UC-8fP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="599-Ji-CiL"/>
<constraint firstItem="BXb-QP-ceT" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="5PL-sZ-SGc"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="BXb-QP-ceT" secondAttribute="bottom" id="7q4-5T-YJs"/>
<constraint firstItem="Try-UC-8fP" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="KZG-b4-Cpc"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3NL-zo-jTU" secondAttribute="trailing" id="EGK-4M-wQB"/>
<constraint firstItem="3NL-zo-jTU" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Fwd-Qe-OOT"/>
<constraint firstItem="Try-UC-8fP" firstAttribute="top" secondItem="3NL-zo-jTU" secondAttribute="bottom" id="KZG-b4-Cpc"/>
<constraint firstItem="9me-3I-LYC" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="LIc-qv-qiZ"/>
<constraint firstAttribute="bottom" secondItem="YuH-ma-NxC" secondAttribute="bottom" id="LQX-xH-UNt"/>
<constraint firstItem="YuH-ma-NxC" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="LlL-j8-IYo"/>
<constraint firstItem="Try-UC-8fP" firstAttribute="top" secondItem="3NL-zo-jTU" secondAttribute="bottom" id="R1b-g8-kZv"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Try-UC-8fP" secondAttribute="trailing" id="YKT-4e-weR"/>
<constraint firstAttribute="bottom" secondItem="9me-3I-LYC" secondAttribute="bottom" id="aja-JF-zxr"/>
<constraint firstItem="3NL-zo-jTU" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="dZl-F6-B8M"/>
<constraint firstItem="BXb-QP-ceT" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="fs5-9O-bRk"/>
<constraint firstItem="YuH-ma-NxC" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="mo6-Sq-B5x"/>
<constraint firstItem="9me-3I-LYC" firstAttribute="top" secondItem="BXb-QP-ceT" secondAttribute="top" id="niu-j0-pOL"/>
<constraint firstItem="YuH-ma-NxC" firstAttribute="top" secondItem="3NL-zo-jTU" secondAttribute="bottom" id="t37-pc-WrH"/>
<constraint firstAttribute="trailing" secondItem="9me-3I-LYC" secondAttribute="trailing" id="uFa-GF-rhx"/>
<constraint firstItem="ZUK-IF-BZm" firstAttribute="width" secondItem="00z-eF-Akb" secondAttribute="width" id="z1r-JE-qp5"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="128.98550724637681" y="120.53571428571428"/>
<point key="canvasLocation" x="175.36231884057972" y="75.669642857142847"/>
</view>
</objects>
<resources>
<image name="jinru" width="13" height="23"/>
<namedColor name="#E37847">
<color red="0.88999998569488525" green="0.47099998593330383" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="9A9A9A">
<color red="0.60392156862745094" green="0.60392156862745094" blue="0.60392156862745094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......@@ -197,5 +390,11 @@
<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>
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 61e75c1d
......@@ -37,6 +37,11 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
override func viewDidLoad() {
super.viewDidLoad()
setTabv()
NotificationCenter.default.addObserver(self, selector: #selector(jpushServiceNotification(notion:)), name: NSNotification.Name(rawValue: "jpushServiceNotification2"), object: nil)
......@@ -482,7 +487,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
case 75: //收支统计
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let vc = ShouZhiTongJiViewController()
let vc = XiaYunDanViewController()
// let vc = ShouZhiTongJiViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
case 76: //收支详情
......
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 61e75c1d
......@@ -47,7 +47,7 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
self.view.backgroundColor = UIColor(named:"白色背景色")
print("f = ",fullScreenHeight)
}
@IBAction func selectLoginAction(_ sender: UIButton) {
......
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