Skip to content

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

同上

parent 206c7343
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 50 deletions
GeliBusinessPlatform/View/Cell/PersonCenterCell.xib
View file @ 6030cee4
<?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"/>
......@@ -21,57 +21,50 @@
<rect key="frame" x="15" y="49" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="aD2-Df-mLu"/>
<constraint firstAttribute="height" constant="1" id="vgL-oE-Vlm"/>
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinru" translatesAutoresizingMaskIntoConstraints="NO" id="vKJ-Fp-ACU">
<rect key="frame" x="353" y="21.5" width="7" height="7"/>
<constraints>
<constraint firstAttribute="width" constant="7" id="6dp-c6-A0b"/>
<constraint firstAttribute="height" constant="7" id="Vre-gs-ydB"/>
<constraint firstAttribute="height" constant="7" id="X4g-1p-GIq"/>
<constraint firstAttribute="width" constant="7" id="bTF-U1-ufz"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="增值服务" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r8W-Gd-bzH">
<rect key="frame" x="15" y="17" width="54" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="54" id="9kz-mh-I2k"/>
<constraint firstAttribute="height" constant="16" id="BuR-Ip-85l"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<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="0zA-eN-Xzx">
<rect key="frame" x="69" y="19" width="71" height="14"/>
<rect key="frame" x="69" y="18" width="71" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="FXT-XS-rEn"/>
<constraint firstAttribute="width" constant="71" id="wDQ-ox-ORg"/>
<constraint firstAttribute="width" constant="71" id="6NS-Pz-lEh"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="content" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wma-4b-cBC">
<rect key="frame" x="145" y="0.0" width="203" height="49"/>
<rect key="frame" x="301.5" y="17" width="46.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="vKJ-Fp-ACU" secondAttribute="trailing" constant="15" id="0rT-l5-ttB"/>
<constraint firstItem="vKJ-Fp-ACU" firstAttribute="leading" secondItem="wma-4b-cBC" secondAttribute="trailing" constant="5" id="8lV-gq-GiY"/>
<constraint firstItem="S2b-Xn-LyD" firstAttribute="top" secondItem="wma-4b-cBC" secondAttribute="bottom" id="BIb-fv-IRd"/>
<constraint firstAttribute="trailing" secondItem="S2b-Xn-LyD" secondAttribute="trailing" id="HOO-OY-7gP"/>
<constraint firstItem="S2b-Xn-LyD" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="OVv-wO-fUC"/>
<constraint firstItem="wma-4b-cBC" firstAttribute="leading" secondItem="0zA-eN-Xzx" secondAttribute="trailing" constant="5" id="YiM-Ut-GRm"/>
<constraint firstItem="0zA-eN-Xzx" firstAttribute="leading" secondItem="r8W-Gd-bzH" secondAttribute="trailing" id="cc1-W3-2Ik"/>
<constraint firstAttribute="bottom" secondItem="S2b-Xn-LyD" secondAttribute="bottom" id="dql-i2-0iM"/>
<constraint firstItem="wma-4b-cBC" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="hn0-zH-mGO"/>
<constraint firstItem="0zA-eN-Xzx" firstAttribute="bottom" secondItem="r8W-Gd-bzH" secondAttribute="bottom" id="nwS-xT-OSO"/>
<constraint firstItem="vKJ-Fp-ACU" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="rgH-am-JQz"/>
<constraint firstItem="r8W-Gd-bzH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="smd-ak-Gq4"/>
<constraint firstItem="r8W-Gd-bzH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="xfp-iK-ulr"/>
<constraint firstAttribute="trailing" secondItem="S2b-Xn-LyD" secondAttribute="trailing" id="G5l-fT-Q1j"/>
<constraint firstAttribute="trailing" secondItem="vKJ-Fp-ACU" secondAttribute="trailing" constant="15" id="LYh-SL-4z4"/>
<constraint firstItem="0zA-eN-Xzx" firstAttribute="leading" secondItem="r8W-Gd-bzH" secondAttribute="trailing" id="Nie-yS-L0y"/>
<constraint firstItem="0zA-eN-Xzx" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="P8x-Hz-h58"/>
<constraint firstItem="S2b-Xn-LyD" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="XTF-ke-F4j"/>
<constraint firstAttribute="bottom" secondItem="S2b-Xn-LyD" secondAttribute="bottom" id="aQd-Gm-NvL"/>
<constraint firstItem="r8W-Gd-bzH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="cfw-ZW-Qln"/>
<constraint firstItem="vKJ-Fp-ACU" firstAttribute="leading" secondItem="wma-4b-cBC" secondAttribute="trailing" constant="5" id="e9V-Lp-v14"/>
<constraint firstItem="r8W-Gd-bzH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="qdT-bQ-7O4"/>
<constraint firstItem="vKJ-Fp-ACU" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="rwI-u2-mpj"/>
<constraint firstItem="wma-4b-cBC" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="xex-8t-Tec"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
......@@ -86,13 +79,13 @@
<resources>
<image name="jinru" width="13" height="23"/>
<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.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"/>
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 6030cee4
......@@ -64,7 +64,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
print(indexPath.row)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 50
return 50*glscale
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return listArray.count
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.xib
View file @ 6030cee4
<?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="retina4_7" 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"/>
......@@ -125,7 +125,11 @@
<rect key="frame" x="15" y="175" width="345" height="150"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="150" id="sgr-YH-MQe"/>
<constraint firstAttribute="height" constant="150" id="sgr-YH-MQe">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......@@ -171,10 +175,10 @@
<image name="sekuai" width="375" height="30"/>
<image name="xiaoxi" width="34" height="36"/>
<namedColor name="个人中心灰色字体">
<color red="0.39215686274509803" green="0.39215686274509803" blue="0.39215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" 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="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift
View file @ 6030cee4
......@@ -8,23 +8,43 @@
import UIKit
class OrderListViewController: BaseViewController {
class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBarViewDelegate{
@IBOutlet weak var searchBgView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
self.view.backgroundColor = UIColor.init(named: "白色背景色")
//searchbar
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)
}
searchBr.placeholderStr = "请输入订单编号/客户名称"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
}
/*
// 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.
//MARK:--搜索按钮代理
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
}
//MARK:--取消搜索代理
func clearSearchAction() {
}
*/
//MARK:--筛选
@IBAction func SelectOtherAction(_ sender: UIButton) {
print("筛选")
}
}
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.xib
View file @ 6030cee4
<?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">
<?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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
<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="OrderListViewController" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OrderListViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="searchBgView" destination="f4t-Fn-Swl" id="yJO-4i-XHP"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......@@ -15,8 +18,56 @@
<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"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f4t-Fn-Swl" userLabel="searchView">
<rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="yth-ne-PfG"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d6S-47-95p">
<rect key="frame" x="0.0" y="45" width="375" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="R16-1j-J2i"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oFn-kE-fo4">
<rect key="frame" x="320" y="7.5" width="55" height="30"/>
<state key="normal" title="筛选"/>
<connections>
<action selector="SelectOtherAction:" destination="-1" eventType="touchUpInside" id="Q40-3H-hF7"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AJr-GA-sNP" userLabel="ContentView">
<rect key="frame" x="0.0" y="46" width="375" height="621"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="AJr-GA-sNP" secondAttribute="bottom" id="1rU-A2-zWR"/>
<constraint firstItem="d6S-47-95p" firstAttribute="top" secondItem="f4t-Fn-Swl" secondAttribute="bottom" id="6tv-EI-bOb"/>
<constraint firstItem="AJr-GA-sNP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="7Pf-an-7AK"/>
<constraint firstItem="AJr-GA-sNP" firstAttribute="top" secondItem="d6S-47-95p" secondAttribute="bottom" id="8oM-LO-1dx"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="AJr-GA-sNP" secondAttribute="trailing" id="H7A-7a-u3D"/>
<constraint firstItem="oFn-kE-fo4" firstAttribute="leading" secondItem="f4t-Fn-Swl" secondAttribute="trailing" id="Kr8-A6-MhE"/>
<constraint firstItem="d6S-47-95p" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="WkW-vN-bml"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="f4t-Fn-Swl" secondAttribute="trailing" constant="55" id="Y4X-G1-KGG"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="d6S-47-95p" secondAttribute="trailing" id="abQ-sP-NDf"/>
<constraint firstItem="f4t-Fn-Swl" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="gm8-Ze-Ng2"/>
<constraint firstItem="oFn-kE-fo4" firstAttribute="centerY" secondItem="f4t-Fn-Swl" secondAttribute="centerY" id="h63-Ae-220"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="oFn-kE-fo4" secondAttribute="trailing" id="lAN-Gh-zIz"/>
<constraint firstItem="f4t-Fn-Swl" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="ytf-De-vhY"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="132" y="154"/>
</view>
</objects>
<resources>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment