Skip to content

G
GeliBusinessPlatform
Commit 15a48e6b authored by lujunye's avatar lujunye
Browse files
Options

订单详情

parent 52634ad5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 1 deletion
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 15a48e6b
......@@ -44,6 +44,8 @@
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
E0C9EF12244E922200277435 /* OrderDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0C9EF10244E922200277435 /* OrderDViewController.swift */; };
E0C9EF13244E922200277435 /* OrderDViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0C9EF11244E922200277435 /* OrderDViewController.xib */; };
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197A92448431B002B080C /* BabyDefine.m */; };
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AB2448431B002B080C /* BabyCallback.m */; };
E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D197AD2448431B002B080C /* BabyPeripheralManager.m */; };
......@@ -151,6 +153,8 @@
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
E0C9EF10244E922200277435 /* OrderDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDViewController.swift; sourceTree = "<group>"; };
E0C9EF11244E922200277435 /* OrderDViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OrderDViewController.xib; sourceTree = "<group>"; };
E0D197A82448431B002B080C /* BabyCentralManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyCentralManager.h; sourceTree = "<group>"; };
E0D197A92448431B002B080C /* BabyDefine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BabyDefine.m; sourceTree = "<group>"; };
E0D197AA2448431B002B080C /* BabyOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BabyOptions.h; sourceTree = "<group>"; };
......@@ -323,6 +327,15 @@
path = DEMO;
sourceTree = "<group>";
};
E022E131244D80EA00FEF5F7 /* 订单详情 */ = {
isa = PBXGroup;
children = (
E0C9EF10244E922200277435 /* OrderDViewController.swift */,
E0C9EF11244E922200277435 /* OrderDViewController.xib */,
);
path = "订单详情";
sourceTree = "<group>";
};
E0516F742448000F00E373CE /* 支付账号（设置，修改） */ = {
isa = PBXGroup;
children = (
......@@ -419,6 +432,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E022E131244D80EA00FEF5F7 /* 订单详情 */,
E0DDCB0B244AD84500DF54C7 /* 订单管理 */,
E0A75479244A894200A84B67 /* 新增、编辑（查看）仓库 */,
F9023F5F2449996D00DD5A63 /* 仓库管理 */,
......@@ -746,6 +760,7 @@
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
E0516F782448003D00E373CE /* PayViewController.xib in Resources */,
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
E0C9EF13244E922200277435 /* OrderDViewController.xib in Resources */,
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
......@@ -848,6 +863,7 @@
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
E0C9EF12244E922200277435 /* OrderDViewController.swift in Sources */,
E0D197BD2448431C002B080C /* BabySpeaker.m in Sources */,
E00D85E1244561FD00F5F816 /* SceneDelegate.swift in Sources */,
E09B03A12445AF7100211A51 /* Define.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/订单管理/jinruDetail.imageset/Contents.json 0 → 100644
View file @ 15a48e6b
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jinruDetail@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "jinruDetail@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/订单管理/yushou.imageset/Contents.json 0 → 100644
View file @ 15a48e6b
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "yushou@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "yushou@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 15a48e6b
......@@ -11,6 +11,7 @@ import Alamofire
import CryptoSwift
import LGButton
class LoginViewController: BaseViewController {
......@@ -81,7 +82,7 @@ class LoginViewController: BaseViewController {
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = CheckWareHourseViewController()
let vc = OrderDViewController()
self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// alertView.tishiLbl.text = "202121";
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.xib 0 → 100644
View file @ 15a48e6b
<?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="OrderDViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="Jem-Gu-j7D" id="tKZ-oh-fon"/>
<outlet property="scrollView" destination="4uA-rD-k2j" id="bKZ-PC-RX8"/>
<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="Jem-Gu-j7D">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="vdo-gl-g7M"/>
</constraints>
</view>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4uA-rD-k2j">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Uj-pG-okf">
<rect key="frame" x="0.0" y="0.0" width="414" height="769"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="769" id="VeB-LC-3K4"/>
</constraints>
</view>
</subviews>
<color key="tintColor" name="app底色"/>
<constraints>
<constraint firstItem="8Uj-pG-okf" firstAttribute="leading" secondItem="4uA-rD-k2j" secondAttribute="leading" id="9MI-4o-jrf"/>
<constraint firstItem="8Uj-pG-okf" firstAttribute="trailing" secondItem="4uA-rD-k2j" secondAttribute="trailing" id="OLg-gt-QeA"/>
<constraint firstAttribute="bottom" secondItem="8Uj-pG-okf" secondAttribute="bottom" constant="-25" id="R0a-Pe-9ah"/>
<constraint firstItem="8Uj-pG-okf" firstAttribute="centerX" secondItem="4uA-rD-k2j" secondAttribute="centerX" id="p09-xz-quT"/>
<constraint firstItem="8Uj-pG-okf" firstAttribute="top" secondItem="4uA-rD-k2j" secondAttribute="top" id="yeT-D6-WhQ"/>
</constraints>
<viewLayoutGuide key="contentLayoutGuide" id="GSV-Mu-1tH"/>
<viewLayoutGuide key="frameLayoutGuide" id="h0z-iv-odh"/>
</scrollView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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="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="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"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="109.82142857142857"/>
</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="1" green="1" blue="1" 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