Skip to content

G
GeliBusinessPlatform
Commit 4ac1a51d authored by lujunye's avatar lujunye
Browse files
Options

待确认cell,预售价格修改，关联客户cell，新增，编辑（查看）仓库页面。（缺填写包含库）

parent 039ac0a6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 741 additions and 25 deletions
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 4ac1a51d
......@@ -3,4 +3,26 @@
uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
<BreakpointContent
uuid = "46B6B765-5B4F-49F9-BFB7-4E596F3F184F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "B61C3BDB-EDAD-4F1C-9E1B-3E983CC96C75"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
GeliBusinessPlatform/Assets.xcassets/仓库/daixuan.imageset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "daixuan@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "daixuan@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/仓库/kuwei.imageset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "kuwei@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "kuwei@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/仓库/yuxuan.imageset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "yuxuan @2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "yuxuan @3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/信息中心/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/字体色/企业、预售字体.colorset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "1.000",
"alpha" : "1.000",
"blue" : "0.471",
"green" : "0.690"
}
}
}
]
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/字体色/密码错误字体颜色.colorset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.890",
"alpha" : "1.000",
"blue" : "0.278",
"green" : "0.278"
}
}
}
]
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/背景色/按钮背景颜色.colorset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.220",
"alpha" : "1.000",
"blue" : "0.827",
"green" : "0.455"
}
}
}
]
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/订单管理/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/订单管理/guanlian.imageset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "guanlian@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "guanlian@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/订单管理/kehu.imageset/Contents.json 0 → 100644
View file @ 4ac1a51d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "kehu@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "kehu@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Define/Define.swift
View file @ 4ac1a51d
......@@ -33,7 +33,11 @@ let SERVERCE_HOST = "http://a.gelifood.com/apia"
//视图常量
let IS_IPHONE_X = __CGSizeEqualToSize(CGSize(width: 375.0, height: 812.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 812.0, height: 375.0),UIScreen.main.bounds.size)||__CGSizeEqualToSize(CGSize(width: 414.0, height: 896.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 896.0, height: 414.0),UIScreen.main.bounds.size)
let glscale = UIScreen.main.bounds.size.width/375
let fullScreenWidth = UIScreen.main.bounds.width //屏幕高度
let fullScreenHeight = UIScreen.main.bounds.height //屏幕宽度
let NavHeight = (IS_IPHONE_X ? 88 : 64)
......
GeliBusinessPlatform/View/Cell/TitleAndSwitchCell.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......@@ -31,7 +31,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入内容" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q6V-I9-aNd">
<rect key="frame" x="65" y="16.5" width="240" height="17.5"/>
<rect key="frame" x="65" y="16" width="240" height="18.5"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
......
GeliBusinessPlatform/View/Cell/TitleContentCell.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......
GeliBusinessPlatform/View/NavBarView/NavBarView.swift
View file @ 4ac1a51d
......@@ -36,7 +36,7 @@ class NavBarView: BaseView {
rightBtn.setTitle(rightTitle, for: .normal)
rightBtn.titleLabel?.font = setFont(15)
rightBtn.sizeToFit()
rightBtn.setTitleColor(UIColor.black, for: UIControl.State(rawValue: 0))
rightBtn.setTitleColor(UIColor(named: "按钮渐变色下,字体颜色"), for: .normal)
rightBtn.snp.makeConstraints { (make) in
make.right.equalTo(-12)
make.bottom.equalTo(-14)
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 4ac1a51d
......@@ -21,7 +21,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
override func viewDidLoad() {
super.viewDidLoad()
let glscale = UIScreen.main.bounds.size.width/375
topImgBg.snp.makeConstraints { (make) in
make.top.left.right.equalTo(0)
make.height.equalTo(227*glscale)
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.xib
View file @ 4ac1a51d
......@@ -171,10 +171,10 @@
<image name="sekuai" width="375" height="30"/>
<image name="xiaoxi" width="34" height="36"/>
<namedColor name="个人中心灰色字体">
<color red="0.39599999785423279" green="0.39599999785423279" blue="0.39599999785423279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.39215686274509803" green="0.39215686274509803" blue="0.39215686274509803" 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"/>
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......@@ -55,7 +55,11 @@
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinru" translatesAutoresizingMaskIntoConstraints="NO" id="TPl-73-La4">
<rect key="frame" x="292" y="35.5" width="13" height="23"/>
<rect key="frame" x="300" y="42.5" width="5" height="9"/>
<constraints>
<constraint firstAttribute="width" constant="5" id="R7t-ue-b86"/>
<constraint firstAttribute="height" constant="9" id="ewR-OA-vGL"/>
</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="voP-B3-BGZ">
<rect key="frame" x="15" y="64" width="275" height="14"/>
......
GeliBusinessPlatform/ViewController/修改密码/ChangePassViewController.swift
View file @ 4ac1a51d
......@@ -39,6 +39,9 @@ class ChangePassViewController: BaseViewController {
}
//MARK: -方法
@objc func tfChange(sender:UITextField){
if oldPassTF.textColor == UIColor(named: "密码错误字体颜色") {
oldPassTF.textColor = UIColor(named: "标题字颜色")
}
if oldPassTF.text!.count > 0 && newPassTF.text!.count > 0 {
submitBtn.alpha = 1
}else{
......
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.xib 0 → 100644
View file @ 4ac1a51d
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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="CheckWareHourseViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="bottomBtn" destination="3xa-Lo-irO" id="5Em-Lo-mW9"/>
<outlet property="color" destination="66s-jI-IyV" id="XJr-G2-N7Y"/>
<outlet property="listView" destination="wre-tZ-eDu" id="rds-VX-rIT"/>
<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="3xa-Lo-irO" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="sPi-Tg-Yb0"/>
</constraints>
<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"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="保存"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="TSG-mS-OJb"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="66s-jI-IyV" customClass="LGButton" customModule="LGButton">
<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="HSa-kt-EN2"/>
</constraints>
<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>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="wre-tZ-eDu">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" name="app底色"/>
</tableView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="wre-tZ-eDu" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="50I-Ba-sGR"/>
<constraint firstItem="66s-jI-IyV" firstAttribute="top" secondItem="3xa-Lo-irO" secondAttribute="bottom" id="71c-Yd-F9v"/>
<constraint firstItem="66s-jI-IyV" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Nil-Cl-hdb"/>
<constraint firstItem="3xa-Lo-irO" firstAttribute="top" secondItem="wre-tZ-eDu" secondAttribute="bottom" id="NpT-Mn-Tca"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="3xa-Lo-irO" secondAttribute="bottom" id="S0y-8Y-aqG"/>
<constraint firstItem="3xa-Lo-irO" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="VA8-u8-VRB"/>
<constraint firstAttribute="trailing" secondItem="66s-jI-IyV" secondAttribute="trailing" id="iXw-Ix-Ile"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="wre-tZ-eDu" secondAttribute="trailing" id="ipy-cj-ckD"/>
<constraint firstItem="wre-tZ-eDu" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="s1N-0S-Bze"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="3xa-Lo-irO" secondAttribute="trailing" id="yXq-zd-eqv"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="110.49107142857143"/>
</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.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" 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"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHouseSpCell.swift 0 → 100644
View file @ 4ac1a51d
//
// WareHouseSpCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
@objc protocol WareHouseSpCellDelegate {
@objc optional func clickAction(sender:UIButton)
}
class WareHouseSpCell: UITableViewCell {
var delegate:WareHouseSpCellDelegate?
@IBOutlet weak var whSwitch: UISwitch!
@IBOutlet weak var clickBtn: UIButton!
@IBOutlet weak var titleLbl: UILabel!
@IBAction func btnAction(_ sender: UIButton) {
delegate?.clickAction?(sender: sender)
}
@IBOutlet weak var btnImg: UIImageView!
@IBOutlet weak var detailTF: UITextField!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHouseSpCell.xib 0 → 100644
View file @ 4ac1a51d
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="WareHouseSpCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="仓库类型：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nns-NP-fAD">
<rect key="frame" x="15" y="0.0" width="67" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="67" id="bdp-Qd-CdZ"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kuwei" translatesAutoresizingMaskIntoConstraints="NO" id="3PL-vr-q2W">
<rect key="frame" x="285" y="12" width="20" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="3ld-7J-dce"/>
<constraint firstAttribute="height" constant="20" id="ZKY-mm-Ouf"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Eb-eL-RFq">
<rect key="frame" x="15" y="43" width="305" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="i5e-1D-SKP"/>
</constraints>
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入库位名" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zsG-fB-Zeb">
<rect key="frame" x="82" y="0.0" width="193" height="43"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uEc-pe-iBV">
<rect key="frame" x="285" y="0.0" width="35" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<action selector="btnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="utA-cq-ZXb"/>
</connections>
</button>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GUA-N4-Rgf">
<rect key="frame" x="258" y="6.5" width="49" height="31"/>
<constraints>
<constraint firstAttribute="width" constant="47" id="8ML-UL-R2l"/>
<constraint firstAttribute="height" constant="31" id="m01-R5-2E5"/>
</constraints>
</switch>
</subviews>
<constraints>
<constraint firstItem="uEc-pe-iBV" firstAttribute="leading" secondItem="zsG-fB-Zeb" secondAttribute="trailing" constant="10" id="DaV-Au-Fbz"/>
<constraint firstAttribute="bottom" secondItem="uEc-pe-iBV" secondAttribute="bottom" id="JR4-Gh-Lso"/>
<constraint firstItem="Nns-NP-fAD" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="O4l-xC-hak"/>
<constraint firstItem="6Eb-eL-RFq" firstAttribute="top" secondItem="zsG-fB-Zeb" secondAttribute="bottom" id="Ptu-ui-fcg"/>
<constraint firstAttribute="trailing" secondItem="3PL-vr-q2W" secondAttribute="trailing" constant="15" id="R0N-fj-Nf4"/>
<constraint firstItem="zsG-fB-Zeb" firstAttribute="leading" secondItem="Nns-NP-fAD" secondAttribute="trailing" id="Rci-Dj-tYx"/>
<constraint firstItem="uEc-pe-iBV" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="RyD-d7-n1a"/>
<constraint firstItem="3PL-vr-q2W" firstAttribute="leading" secondItem="zsG-fB-Zeb" secondAttribute="trailing" constant="10" id="TRp-Y3-j7f"/>
<constraint firstAttribute="trailing" secondItem="6Eb-eL-RFq" secondAttribute="trailing" id="axM-Uo-jM1"/>
<constraint firstItem="6Eb-eL-RFq" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ay3-JZ-bAy"/>
<constraint firstItem="Nns-NP-fAD" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="f18-iY-s23"/>
<constraint firstItem="3PL-vr-q2W" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="gzt-C3-0sQ"/>
<constraint firstAttribute="bottom" secondItem="6Eb-eL-RFq" secondAttribute="bottom" id="h6b-GE-I1H"/>
<constraint firstAttribute="bottom" secondItem="Nns-NP-fAD" secondAttribute="bottom" id="jIE-bB-8ic"/>
<constraint firstItem="zsG-fB-Zeb" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="kT5-VR-Vqg"/>
<constraint firstItem="GUA-N4-Rgf" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="n0g-sO-UI3"/>
<constraint firstAttribute="trailing" secondItem="uEc-pe-iBV" secondAttribute="trailing" id="riL-Qy-yIc"/>
<constraint firstAttribute="trailing" secondItem="GUA-N4-Rgf" secondAttribute="trailing" constant="15" id="zP6-ZR-myY"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btnImg" destination="3PL-vr-q2W" id="YM6-J5-D8z"/>
<outlet property="clickBtn" destination="uEc-pe-iBV" id="Ld9-MC-lkC"/>
<outlet property="detailTF" destination="zsG-fB-Zeb" id="XEU-3n-EoN"/>
<outlet property="titleLbl" destination="Nns-NP-fAD" id="qIo-DJ-djf"/>
<outlet property="whSwitch" destination="GUA-N4-Rgf" id="IZK-Bu-rZg"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="110.49107142857143"/>
</tableViewCell>
</objects>
<resources>
<image name="kuwei" width="20" height="20"/>
<namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" 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>
</resources>
</document>
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 4ac1a51d
......@@ -52,7 +52,7 @@ class LoginViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
let glscale = UIScreen.main.bounds.size.width/375
passTF.isSecureTextEntry = true
bannerImg.snp.makeConstraints { (make) in
make.top.left.right.equalTo(0)
......@@ -69,7 +69,8 @@ class LoginViewController: BaseViewController {
//MARK: -跳转忘记密码,登录
@IBAction func forgetPasswordAction(_ sender: Any) {
let vc = ShopInfoViewController()
let vc = CheckWareHourseViewController()
vc.titleStr = "新增仓库"
self.navigationController?.pushViewController(vc, animated: true)
}
......@@ -80,7 +81,7 @@ class LoginViewController: BaseViewController {
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = BluetoothConnectViewController()
let vc = XiuGaiYuShouJiaViewController()
self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// alertView.tishiLbl.text = "202121";
......
GeliBusinessPlatform/ViewController/登录/LoginViewController.xib
View file @ 4ac1a51d
......@@ -323,7 +323,7 @@
<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"/>
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/蓝牙连接/BluetoothConnectViewController.swift
View file @ 4ac1a51d
......@@ -20,6 +20,7 @@ class BluetoothConnectViewController: BaseViewController,UITableViewDelegate,UIT
self.view.addSubview(navbar)
// Do any additional setup after loading the view.
tableView.separatorStyle = .none
tableView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
......@@ -117,5 +118,6 @@ class BluetoothConnectViewController: BaseViewController,UITableViewDelegate,UIT
override func backAction() {
print("重写back")
self.navigationController?.popViewController(animated: true)
}
}
GeliBusinessPlatform/ViewController/蓝牙连接/BluetoothConnectViewController.xib
View file @ 4ac1a51d
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<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"/>
......@@ -96,10 +96,10 @@
<resources>
<image name="guanbi" width="37" height="18"/>
<namedColor name="app底色">
<color red="0.94900000095367432" green="0.94900000095367432" blue="0.94900000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" 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"/>
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/订单管理/关联客户cell/GuanLianKeHuCell.swift 0 → 100644
View file @ 4ac1a51d
//
// GuanLianKeHuCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
@objc protocol GuanLianKeHuCellDelegate {
@objc optional func btnSelect(sender:UIButton)
}
class GuanLianKeHuCell: UITableViewCell {
@IBAction func btnClick(_ sender: UIButton) {
delegate?.btnSelect?(sender: sender)
}
@IBOutlet weak var imgBtn: UIButton!
var delegate:GuanLianKeHuCellDelegate?
@IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var companyLbl: UILabel!
@IBOutlet weak var personLbl: UILabel!
@IBOutlet weak var receiverLbl: UILabel!
@IBOutlet weak var arrowImg: UIImageView!
@IBOutlet weak var senderLbl: UILabel!
@IBOutlet weak var iconImg: UIImageView!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/订单管理/待确认Cell/ChangePriceNormalCell.swift 0 → 100644
View file @ 4ac1a51d
//
// ChangePriceNormalCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class ChangePriceNormalCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/订单管理/待确认Cell/DaiQueRenCell.swift 0 → 100644
View file @ 4ac1a51d
//
// DaiQueRenCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
@objc protocol DaiQueRenCellDelegate {
@objc optional func submit(sender:UIButton)
@objc optional func cancel(sender:UIButton)
}
class DaiQueRenCell: UITableViewCell {
@IBOutlet weak var cancelBtn: UIButton!
@IBOutlet weak var submitBtn: UIButton!
@IBOutlet weak var priceLbl: UILabel!
@IBOutlet weak var countLbl: UILabel!
@IBOutlet weak var dateLbl: UILabel!
@IBOutlet weak var typeLbl: UILabel!
@IBOutlet weak var accountLbl: UILabel!
@IBOutlet weak var statusLbl: UILabel!
@IBOutlet weak var nameLbl: UILabel!
var delegate:DaiQueRenCellDelegate?
//MARK: -方法
@IBAction func cancelClick(_ sender: UIButton) {
delegate?.cancel?(sender: sender)
}
@IBAction func submitClick(_ sender: UIButton) {
delegate?.submit?(sender: sender)
}
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/订单管理/预售价格修改/XiuGaiYuShouJiaViewController.swift 0 → 100644
View file @ 4ac1a51d
//
// XiuGaiYuShouJiaViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
import LGButton
class XiuGaiYuShouJiaViewController: BaseViewController {
@IBOutlet weak var firstView: UIView!
@IBOutlet weak var weiKuanTF: UITextField!
@IBOutlet weak var dingJinTF: UITextField!
@IBOutlet weak var icomImg: UIImageView!
@IBOutlet weak var countLbl: UILabel!
@IBOutlet weak var detailLbl: UILabel!
@IBOutlet weak var titleLbl: UILabel!
@IBOutlet weak var submitBtn: LGButton!
@IBOutlet weak var color: LGButton!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "修改价格"
self.view.addSubview(navbar)
self.view.backgroundColor = UIColor.white
color.isUserInteractionEnabled = false
firstView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.height.equalTo(120*glscale)
}
// Do any additional setup after loading the view.
}
@IBAction func submitACTION(_ sender: Any) {
}
/*
// 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.
}
*/
}
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