Commit 6ebacc59 authored by lujunye's avatar lujunye

调整位置

parent 15a48e6b
...@@ -349,8 +349,6 @@ ...@@ -349,8 +349,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E0516F7E244806C500E373CE /* MsgCenterViewController.swift */, E0516F7E244806C500E373CE /* MsgCenterViewController.swift */,
E0516F802448086700E373CE /* MsgCenterCell.swift */,
E0516F812448086700E373CE /* MsgCenterCell.xib */,
); );
path = "消息中心"; path = "消息中心";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -489,10 +487,6 @@ ...@@ -489,10 +487,6 @@
children = ( children = (
E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */, E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */,
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */, E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */,
E08B0672244A98B2001D2E01 /* WareHouseSpCell.swift */,
E08B0673244A98B2001D2E01 /* WareHouseSpCell.xib */,
E0B6036C244D376900A56B38 /* KuWeiCell.swift */,
E0B6036D244D376900A56B38 /* KuWeiCell.xib */,
); );
path = "新增、编辑(查看)仓库"; path = "新增、编辑(查看)仓库";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -527,8 +521,6 @@ ...@@ -527,8 +521,6 @@
children = ( children = (
E0D197C4244845FD002B080C /* PersonCenterViewController.swift */, E0D197C4244845FD002B080C /* PersonCenterViewController.swift */,
E0D197C5244845FD002B080C /* PersonCenterViewController.xib */, E0D197C5244845FD002B080C /* PersonCenterViewController.xib */,
E0D197C824484D90002B080C /* PersonCenterCell.swift */,
E0D197C924484D90002B080C /* PersonCenterCell.xib */,
); );
path = "个人中心"; path = "个人中心";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -538,8 +530,6 @@ ...@@ -538,8 +530,6 @@
children = ( children = (
E0D197CD24485649002B080C /* BluetoothConnectViewController.swift */, E0D197CD24485649002B080C /* BluetoothConnectViewController.swift */,
E0D197CE24485649002B080C /* BluetoothConnectViewController.xib */, E0D197CE24485649002B080C /* BluetoothConnectViewController.xib */,
E0D197D3244860B1002B080C /* BlueToothCell.swift */,
E0D197D4244860B1002B080C /* BlueToothCell.xib */,
); );
path = "蓝牙连接"; path = "蓝牙连接";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -613,6 +603,16 @@ ...@@ -613,6 +603,16 @@
F9023F642449A3AE00DD5A63 /* Cell */ = { F9023F642449A3AE00DD5A63 /* Cell */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E08B0672244A98B2001D2E01 /* WareHouseSpCell.swift */,
E08B0673244A98B2001D2E01 /* WareHouseSpCell.xib */,
E0B6036C244D376900A56B38 /* KuWeiCell.swift */,
E0B6036D244D376900A56B38 /* KuWeiCell.xib */,
E0D197C824484D90002B080C /* PersonCenterCell.swift */,
E0D197C924484D90002B080C /* PersonCenterCell.xib */,
E0516F802448086700E373CE /* MsgCenterCell.swift */,
E0516F812448086700E373CE /* MsgCenterCell.xib */,
E0D197D3244860B1002B080C /* BlueToothCell.swift */,
E0D197D4244860B1002B080C /* BlueToothCell.xib */,
F9023F672449A50900DD5A63 /* TitleContentCell.swift */, F9023F672449A50900DD5A63 /* TitleContentCell.swift */,
F9023F682449A50900DD5A63 /* TitleContentCell.xib */, F9023F682449A50900DD5A63 /* TitleContentCell.xib */,
F9023F6B2449A9B100DD5A63 /* TitleAndTFCell.swift */, F9023F6B2449A9B100DD5A63 /* TitleAndTFCell.swift */,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>GeliBusinessPlatform.xcscheme_^#shared#^_</key> <key>GeliBusinessPlatform.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>22</integer> <integer>21</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<color key="textColor" name="标题字颜色"/> <color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="xianshi " translatesAutoresizingMaskIntoConstraints="NO" id="lgj-DW-SOJ"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="yuxuan" translatesAutoresizingMaskIntoConstraints="NO" id="lgj-DW-SOJ">
<rect key="frame" x="340" y="14.5" width="20" height="20"/> <rect key="frame" x="340" y="14.5" width="20" height="20"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="20" id="CEb-px-b2F"/> <constraint firstAttribute="height" constant="20" id="CEb-px-b2F"/>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</tableViewCell> </tableViewCell>
</objects> </objects>
<resources> <resources>
<image name="xianshi " width="37" height="24"/> <image name="yuxuan" width="19" height="19"/>
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="标题字颜色"> <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>
<namedColor name="灰色字体颜色"> <namedColor name="灰色字体颜色">
<color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
<resources> <resources>
<image name="jinru" width="13" height="23"/> <image name="jinru" width="13" height="23"/>
<namedColor name="标题字颜色"> <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>
<namedColor name="灰色分界线"> <namedColor name="灰色分界线">
<color red="0.92900002002716064" green="0.92900002002716064" blue="0.92900002002716064" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
</resources> </resources>
</document> </document>
...@@ -82,7 +82,7 @@ class LoginViewController: BaseViewController { ...@@ -82,7 +82,7 @@ class LoginViewController: BaseViewController {
@IBAction func loginAction(_ sender: Any) { @IBAction func loginAction(_ sender: Any) {
print("loginAction") print("loginAction")
let vc = OrderDViewController() let vc = CheckWareHourseViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds) // let alertView = GeliAlertView(frame: self.view.window!.bounds)
// alertView.tishiLbl.text = "202121"; // alertView.tishiLbl.text = "202121";
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<key>SVProgressHUD.xcscheme_^#shared#^_</key> <key>SVProgressHUD.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>21</integer> <integer>22</integer>
</dict> </dict>
<key>SkeletonView.xcscheme</key> <key>SkeletonView.xcscheme</key>
<dict> <dict>
......
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