Skip to content

G
GeliBusinessPlatform
Commit 9d1f0cbd authored by lujunye's avatar lujunye
Browse files
Options

寄派方式

parent 352db1fa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 253 additions and 8 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 9d1f0cbd
......@@ -40,6 +40,8 @@
E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E042F73B245288F800CDFA12 /* WenDuCell.xib */; };
E042F74024528CD500CDFA12 /* TitleAndOnlyBtnCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E042F73E24528CD500CDFA12 /* TitleAndOnlyBtnCell.swift */; };
E042F74124528CD500CDFA12 /* TitleAndOnlyBtnCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E042F73F24528CD500CDFA12 /* TitleAndOnlyBtnCell.xib */; };
E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E042F74224529B7B00CDFA12 /* JiTuoWuXinXiView.swift */; };
E042F74524529B8500CDFA12 /* JiTuoWuXinXiView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E042F74424529B8500CDFA12 /* JiTuoWuXinXiView.xib */; };
E0516F772448003D00E373CE /* PayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F752448003D00E373CE /* PayViewController.swift */; };
E0516F782448003D00E373CE /* PayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0516F762448003D00E373CE /* PayViewController.xib */; };
E0516F7F244806C500E373CE /* MsgCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0516F7E244806C500E373CE /* MsgCenterViewController.swift */; };
......@@ -61,6 +63,8 @@
E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E09B03BF2445B96500211A51 /* FgPassViewController.xib */; };
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C22445BD9500211A51 /* NavViewController.swift */; };
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B03C52445BF6700211A51 /* NavBarView.swift */; };
E09F4C9D2452BEBB00BE033D /* JiPaiFangShiViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09F4C9B2452BEBB00BE033D /* JiPaiFangShiViewController.swift */; };
E09F4C9E2452BEBB00BE033D /* JiPaiFangShiViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E09F4C9C2452BEBB00BE033D /* JiPaiFangShiViewController.xib */; };
E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */; };
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
......@@ -231,6 +235,8 @@
E042F73B245288F800CDFA12 /* WenDuCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WenDuCell.xib; sourceTree = "<group>"; };
E042F73E24528CD500CDFA12 /* TitleAndOnlyBtnCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndOnlyBtnCell.swift; sourceTree = "<group>"; };
E042F73F24528CD500CDFA12 /* TitleAndOnlyBtnCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndOnlyBtnCell.xib; sourceTree = "<group>"; };
E042F74224529B7B00CDFA12 /* JiTuoWuXinXiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiTuoWuXinXiView.swift; sourceTree = "<group>"; };
E042F74424529B8500CDFA12 /* JiTuoWuXinXiView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JiTuoWuXinXiView.xib; sourceTree = "<group>"; };
E0516F752448003D00E373CE /* PayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayViewController.swift; sourceTree = "<group>"; };
E0516F762448003D00E373CE /* PayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PayViewController.xib; sourceTree = "<group>"; };
E0516F7E244806C500E373CE /* MsgCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgCenterViewController.swift; sourceTree = "<group>"; };
......@@ -252,6 +258,8 @@
E09B03BF2445B96500211A51 /* FgPassViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FgPassViewController.xib; sourceTree = "<group>"; };
E09B03C22445BD9500211A51 /* NavViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavViewController.swift; sourceTree = "<group>"; };
E09B03C52445BF6700211A51 /* NavBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavBarView.swift; sourceTree = "<group>"; };
E09F4C9B2452BEBB00BE033D /* JiPaiFangShiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiPaiFangShiViewController.swift; sourceTree = "<group>"; };
E09F4C9C2452BEBB00BE033D /* JiPaiFangShiViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JiPaiFangShiViewController.xib; sourceTree = "<group>"; };
E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckWareHourseViewController.swift; sourceTree = "<group>"; };
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>"; };
......@@ -566,6 +574,7 @@
E042F72B245272AC00CDFA12 /* 代客下单 */ = {
isa = PBXGroup;
children = (
E09F4C9A2452BEA000BE033D /* 寄派方式 */,
E042F72C245272C000CDFA12 /* 下运单 */,
);
path = "代客下单";
......@@ -580,6 +589,8 @@
E042F733245274F200CDFA12 /* YunDanLieBiaoCell.xib */,
E042F73A245288F800CDFA12 /* WenDuCell.swift */,
E042F73B245288F800CDFA12 /* WenDuCell.xib */,
E042F74224529B7B00CDFA12 /* JiTuoWuXinXiView.swift */,
E042F74424529B8500CDFA12 /* JiTuoWuXinXiView.xib */,
);
path = "下运单";
sourceTree = "<group>";
......@@ -751,6 +762,15 @@
path = NavBarView;
sourceTree = "<group>";
};
E09F4C9A2452BEA000BE033D /* 寄派方式 */ = {
isa = PBXGroup;
children = (
E09F4C9B2452BEBB00BE033D /* JiPaiFangShiViewController.swift */,
E09F4C9C2452BEBB00BE033D /* JiPaiFangShiViewController.xib */,
);
path = "寄派方式";
sourceTree = "<group>";
};
E0A75479244A894200A84B67 /* 新增、编辑（查看）仓库 */ = {
isa = PBXGroup;
children = (
......@@ -1145,6 +1165,7 @@
E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */,
E02DDD92244FE55400ABB707 /* NewCreateHeader.xib in Resources */,
E09B03B72445B85A00211A51 /* LoginViewController.xib in Resources */,
E09F4C9E2452BEBB00BE033D /* JiPaiFangShiViewController.xib in Resources */,
E09B03C12445B96500211A51 /* FgPassViewController.xib in Resources */,
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
E02DDD83244FD15B00ABB707 /* TitleAndSwitchHeaderView.xib in Resources */,
......@@ -1179,6 +1200,7 @@
F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
F961D26F245015D6007FBE70 /* SelectContentView.xib in Resources */,
F961D27524503CCF007FBE70 /* OrderSelectMoreView.xib in Resources */,
E042F74524529B8500CDFA12 /* JiTuoWuXinXiView.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
......@@ -1308,6 +1330,7 @@
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */,
F950FDDD24518B9500C40530 /* FSCalendarCollectionViewLayout.m in Sources */,
F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */,
E09F4C9D2452BEBB00BE033D /* JiPaiFangShiViewController.swift in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E0C4F4A7244EC82A00CC7E2F /* TitleAndBtnCell.swift in Sources */,
F950FDD724518B9500C40530 /* FSCalendarCollectionView.m in Sources */,
......@@ -1359,6 +1382,7 @@
E09B03A72445B04E00211A51 /* BaseViewController.swift in Sources */,
E02DDD9924501A5B00ABB707 /* DelGuiGeCell.swift in Sources */,
E088CC932447124D000DAA8A /* BindViewController.swift in Sources */,
E042F74324529B7B00CDFA12 /* JiTuoWuXinXiView.swift in Sources */,
E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */,
E02DDD8D244FE43900ABB707 /* NewCreateFooter.swift in Sources */,
E0D197CF24485649002B080C /* BluetoothConnectViewController.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/代客下单/jia .imageset/Contents.json 0 → 100644
View file @ 9d1f0cbd
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jia @2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "jia @3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/Assets.xcassets/代客下单/jian.imageset/Contents.json 0 → 100644
View file @ 9d1f0cbd
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "jian@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "jian@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
GeliBusinessPlatform/SceneDelegate.swift
View file @ 9d1f0cbd
......@@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
// Create the SwiftUI view that provides the window contents.
let contentView = XiaYunDanViewController()
let contentView = JiPaiFangShiViewController()
// Use a UIHostingController as window root view controller.
if let windowScene = scene as? UIWindowScene {
......
GeliBusinessPlatform/View/Cell/ChangePriceNormalCell.xib
View file @ 9d1f0cbd
......@@ -131,13 +131,13 @@
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" 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="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/View/Cell/TitleAndBtnCell.xib
View file @ 9d1f0cbd
......@@ -86,13 +86,13 @@
<resources>
<image name="jinruDetail" width="4.5" height="9"/>
<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/View/Cell/WareHouseSpCell.xib
View file @ 9d1f0cbd
......@@ -98,13 +98,13 @@
<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"/>
<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.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/代客下单/下运单/JiTuoWuXinXiView.swift 0 → 100644
View file @ 9d1f0cbd
//
// JiTuoWuXinXiView.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/24.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class JiTuoWuXinXiView: UIView {
var contentView:UIView!
@IBOutlet weak var infoSw: UISwitch!
func setUI(){
infoSw.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
self.setUI()
}
// /初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
self.setUI()
}
//加载xib
func loadViewFromNib() -> UIView {
let className = type(of: self)
let bundle = Bundle(for: className)
let name = NSStringFromClass(className).components(separatedBy: ".").last
let nib = UINib(nibName: name!, bundle: bundle)
let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
self.setUI()
return view
}
}
GeliBusinessPlatform/ViewController/代客下单/下运单/XiaYunDanViewController.swift
View file @ 9d1f0cbd
......@@ -9,7 +9,7 @@
import UIKit
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
var jtwxxView:JiTuoWuXinXiView?
var selectBtn:UIButton?
let titleArr = ["物品寄托","寄派方式","增值服务","温控范围"]
let title2Arr = ["关联订单号","关联平台"]
......@@ -118,6 +118,25 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
default: return 2
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.section == 1 {
if indexPath.row < 3 {
print(indexPath.row)
switch indexPath.row {
case 0:
if jtwxxView == nil {
let view = JiTuoWuXinXiView(frame: self.view.bounds)
self.view.addSubview(view)
jtwxxView = view
}
break
case 1:break
default:break
}
}
}
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 {
return 70
......
GeliBusinessPlatform/ViewController/代客下单/寄派方式/JiPaiFangShiViewController.swift 0 → 100644
View file @ 9d1f0cbd
//
// JiPaiFangShiViewController.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/4/24.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class JiPaiFangShiViewController: BaseViewController {
@IBOutlet weak var timeView: UIView!
@IBOutlet weak var topView: UIView!
@IBOutlet weak var PLBL: UILabel!
@IBOutlet weak var JLBL: UILabel!
@IBOutlet weak var timeLbl: UILabel!
@IBOutlet weak var PRightBtn: UIButton!
@IBOutlet weak var PLeftBtn: UIButton!
@IBOutlet weak var JRightBtn: UIButton!
@IBOutlet weak var JLeftBtn: UIButton!
@IBOutlet weak var timeViewHeight: NSLayoutConstraint!
override func viewDidLoad() {
super.viewDidLoad()
self.setYuanJiao(sender: JLBL)
self.setYuanJiao(sender: PLBL)
navbar.title = "寄派方式"
self.view.addSubview(navbar)
JLeftBtn.isSelected = true
JLeftBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
JLeftBtn.layer.borderWidth = 0
timeViewHeight.constant = 45
PLeftBtn.isSelected = true
PLeftBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
PLeftBtn.layer.borderWidth = 0
topView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height+15)
make.left.equalTo(15)
make.right.equalTo(-15)
make.height.equalTo(55)
}
// Do any additional setup after loading the view.
}
func setYuanJiao(sender:UIView){
let maskPath = UIBezierPath(roundedRect: sender.bounds,
byRoundingCorners:[.bottomRight, .topRight], cornerRadii:CGSize(width:2, height:2))
let masklayer = CAShapeLayer()
masklayer.frame = sender.bounds
masklayer.path = maskPath.cgPath
sender.layer.mask = masklayer
}
@IBAction func sendAction(_ sender: UIButton) {
if sender == PLeftBtn {
PRightBtn.backgroundColor = UIColor.clear
PRightBtn.isSelected = false
PRightBtn.layer.borderWidth = 1
PLeftBtn.isSelected = true
PLeftBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
PLeftBtn.layer.borderWidth = 0
}else{
PLeftBtn.backgroundColor = UIColor.clear
PLeftBtn.isSelected = false
PLeftBtn.layer.borderWidth = 1
PRightBtn.isSelected = true
PRightBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
PRightBtn.layer.borderWidth = 0
}
}
@IBAction func getAction(_ sender: UIButton) {
if sender == JLeftBtn {
JRightBtn.backgroundColor = UIColor.clear
JRightBtn.isSelected = false
JRightBtn.layer.borderWidth = 1
JLeftBtn.isSelected = true
JLeftBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
JLeftBtn.layer.borderWidth = 0
timeViewHeight.constant = 45
}else{
JLeftBtn.backgroundColor = UIColor.clear
JLeftBtn.isSelected = false
JLeftBtn.layer.borderWidth = 1
timeViewHeight.constant = 0.01
JRightBtn.isSelected = true
JRightBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
JRightBtn.layer.borderWidth = 0
}
}
}
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