Skip to content

G
GeliBusinessPlatform
Commit 158edb34 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

完成商家信息初步UI

parent b17794a9
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 100 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 158edb34
......@@ -61,6 +61,8 @@
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0D4166324483058008DCAB4 /* ChangePassViewController.xib */; };
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */; };
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9B512448530E0080D6E3 /* GeliAlertView.swift */; };
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */; };
F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F95D9CA324493E840080D6E3 /* ShopInfoViewController.xib */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -153,6 +155,8 @@
E0D4166324483058008DCAB4 /* ChangePassViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChangePassViewController.xib; sourceTree = "<group>"; };
F95D9B4F24484FAE0080D6E3 /* GeliAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GeliAlertView.xib; sourceTree = "<group>"; };
F95D9B512448530E0080D6E3 /* GeliAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeliAlertView.swift; sourceTree = "<group>"; };
F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopInfoViewController.swift; sourceTree = "<group>"; };
F95D9CA324493E840080D6E3 /* ShopInfoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShopInfoViewController.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -495,6 +499,8 @@
F95D9CA124493AB90080D6E3 /* 商家信息 */ = {
isa = PBXGroup;
children = (
F95D9CA224493E840080D6E3 /* ShopInfoViewController.swift */,
F95D9CA324493E840080D6E3 /* ShopInfoViewController.xib */,
);
path = "商家信息";
sourceTree = "<group>";
......@@ -618,6 +624,7 @@
E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
......@@ -694,6 +701,7 @@
E0D197C12448431C002B080C /* BabyToy.m in Sources */,
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */,
E0D197C02448431C002B080C /* BabyCentralManager.m in Sources */,
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
E00D85DF244561FD00F5F816 /* AppDelegate.swift in Sources */,
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */,
E0516F822448086700E373CE /* MsgCenterCell.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/字体色/个人中心灰色字体.colorset/Contents.json
View file @ 158edb34
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.396",
"alpha" : "1.000",
"blue" : "0.396",
"green" : "0.396"
"blue" : "0x64",
"green" : "0x64",
"red" : "0x64"
}
}
},
"idiom" : "universal"
}
]
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/字体色/标题字颜色.colorset/Contents.json
View file @ 158edb34
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.180",
"alpha" : "1.000",
"blue" : "0.180",
"green" : "0.180"
"blue" : "0x2E",
"green" : "0x2E",
"red" : "0x2E"
}
}
},
"idiom" : "universal"
}
]
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/字体色/灰色字体颜色.colorset/Contents.json
View file @ 158edb34
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.600",
"alpha" : "1.000",
"blue" : "0.600",
"green" : "0.600"
"blue" : "0x99",
"green" : "0x99",
"red" : "0x99"
}
}
},
"idiom" : "universal"
}
]
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/背景色/app底色.colorset/Contents.json
View file @ 158edb34
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.949",
"alpha" : "1.000",
"blue" : "0.949",
"green" : "0.949"
"blue" : "0xF1",
"green" : "0xF1",
"red" : "0xF1"
}
}
},
"idiom" : "universal"
}
]
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/背景色/灰色分界线.colorset/Contents.json
View file @ 158edb34
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0.929",
"alpha" : "1.000",
"blue" : "0.929",
"green" : "0.929"
"blue" : "0xED",
"green" : "0xED",
"red" : "0xED"
}
}
},
"idiom" : "universal"
}
]
}
\ No newline at end of file
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/BaseView/BaseViewController.swift
View file @ 158edb34
......@@ -24,14 +24,14 @@ class BaseViewController: UIViewController ,NavBarViewDelegate{
override func viewDidLoad() {
super.viewDidLoad()
navbar.deleagte = self
if IsOldIos() {
self.automaticallyAdjustsScrollViewInsets = false;
}
self.view.backgroundColor = UIColor(named: "app底色")
// Do any additional setup after loading the view.
navbar.deleagte = self
// self.view.addSubview(navbar)
}
override func didReceiveMemoryWarning() {
......@@ -43,4 +43,5 @@ class BaseViewController: UIViewController ,NavBarViewDelegate{
func backAction() {
self.navigationController?.popViewController(animated: true)
}
}
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift 0 → 100644
View file @ 158edb34
//
// ShopInfoViewController.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/17.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class ShopInfoViewController: BaseViewController {
@IBOutlet weak var scrollHeight: NSLayoutConstraint!
@IBOutlet weak var scrlloV: UIScrollView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "商家信息"
self.view.addSubview(navbar)
scrlloV.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.bottom.right.equalTo(0)
}
// scrollHeight.constant = 2000;
// super.updateViewConstraints()
}
}
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.xib 0 → 100644
View file @ 158edb34
This source diff could not be displayed because it is too large. You can view the blob instead.
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @ 158edb34
......@@ -12,27 +12,27 @@ import CryptoSwift
import LGButton
class LoginViewController: BaseViewController {
// @IBAction func forgetPasswordAction(_ sender: Any) {
//// let vc = DemoViewController()
//// self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// self.view.window?.addSubview(alertView)
//
// }
//
// @IBAction func shPassAction(_ sender: UIButton) {
// shBtn.isSelected = !shBtn.isSelected
// passTF.isSecureTextEntry = !shBtn.isSelected
// }
//
// @IBAction func loginAction(_ sender: Any) {
// print("loginAction")
// let vc = ChangePassViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// }
//MARK: - 输入账号、密码、验证码
// @IBAction func forgetPasswordAction(_ sender: Any) {
//// let vc = DemoViewController()
//// self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// self.view.window?.addSubview(alertView)
//
// }
//
// @IBAction func shPassAction(_ sender: UIButton) {
// shBtn.isSelected = !shBtn.isSelected
// passTF.isSecureTextEntry = !shBtn.isSelected
// }
//
// @IBAction func loginAction(_ sender: Any) {
// print("loginAction")
// let vc = ChangePassViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// }
//MARK: - 输入账号、密码、验证码
@IBOutlet weak var loginBtn: LGButton!
@IBOutlet weak var codeView: UIView!
@IBOutlet weak var phoneTF: UITextField!
......@@ -64,23 +64,23 @@ class LoginViewController: BaseViewController {
make.height.equalTo(60)
}
//登录中状态
// loginBtn.isLoading = true
// loginBtn.isLoading = true
}
//MARK: -跳转忘记密码,登录
@IBAction func forgetPasswordAction(_ sender: Any) {
let vc = DemoViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func shPassAction(_ sender: UIButton) {
shBtn.isSelected = !shBtn.isSelected
passTF.isSecureTextEntry = !shBtn.isSelected
}
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = BluetoothConnectViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func forgetPasswordAction(_ sender: Any) {
let vc = ShopInfoViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func shPassAction(_ sender: UIButton) {
shBtn.isSelected = !shBtn.isSelected
passTF.isSecureTextEntry = !shBtn.isSelected
}
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = BluetoothConnectViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
}
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