Commit 8e0526fb authored by 刘俊宏's avatar 刘俊宏

完善商品管理

parent d7e4e33f
......@@ -91,6 +91,11 @@
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 */; };
F961D264244FD744007FBE70 /* SearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F961D263244FD744007FBE70 /* SearchBarView.swift */; };
F961D26924500550007FBE70 /* HeaderSelectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D26824500550007FBE70 /* HeaderSelectView.xib */; };
F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F961D26A24500FF6007FBE70 /* HeaderSelectView.swift */; };
F961D26F245015D6007FBE70 /* SelectContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D26E245015D6007FBE70 /* SelectContentView.xib */; };
F961D271245016B7007FBE70 /* SelectContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F961D270245016B7007FBE70 /* SelectContentView.swift */; };
F969BF07244EC38000C79953 /* GoodsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F969BF05244EC38000C79953 /* GoodsCollectionViewCell.swift */; };
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F969BF06244EC38000C79953 /* GoodsCollectionViewCell.xib */; };
F969BF1E244EE67900C79953 /* GoodsManageListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F969BF1C244EE67900C79953 /* GoodsManageListVC.swift */; };
......@@ -217,6 +222,11 @@
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>"; };
F961D263244FD744007FBE70 /* SearchBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBarView.swift; sourceTree = "<group>"; };
F961D26824500550007FBE70 /* HeaderSelectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeaderSelectView.xib; sourceTree = "<group>"; };
F961D26A24500FF6007FBE70 /* HeaderSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderSelectView.swift; sourceTree = "<group>"; };
F961D26E245015D6007FBE70 /* SelectContentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SelectContentView.xib; sourceTree = "<group>"; };
F961D270245016B7007FBE70 /* SelectContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectContentView.swift; sourceTree = "<group>"; };
F969BF05244EC38000C79953 /* GoodsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsCollectionViewCell.swift; sourceTree = "<group>"; };
F969BF06244EC38000C79953 /* GoodsCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GoodsCollectionViewCell.xib; sourceTree = "<group>"; };
F969BF1C244EE67900C79953 /* GoodsManageListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsManageListVC.swift; sourceTree = "<group>"; };
......@@ -445,6 +455,8 @@
E09B03AC2445B0B200211A51 /* View */ = {
isa = PBXGroup;
children = (
F961D267244FFD47007FBE70 /* HeaderSelectView */,
F961D25E244FCE55007FBE70 /* SearchView */,
F969BF04244EC27E00C79953 /* CollectionCell */,
F9023F642449A3AE00DD5A63 /* Cell */,
F95D9B4E24484F140080D6E3 /* AlertView */,
......@@ -655,6 +667,25 @@
path = "商家信息";
sourceTree = "<group>";
};
F961D25E244FCE55007FBE70 /* SearchView */ = {
isa = PBXGroup;
children = (
F961D263244FD744007FBE70 /* SearchBarView.swift */,
);
path = SearchView;
sourceTree = "<group>";
};
F961D267244FFD47007FBE70 /* HeaderSelectView */ = {
isa = PBXGroup;
children = (
F961D26824500550007FBE70 /* HeaderSelectView.xib */,
F961D26A24500FF6007FBE70 /* HeaderSelectView.swift */,
F961D26E245015D6007FBE70 /* SelectContentView.xib */,
F961D270245016B7007FBE70 /* SelectContentView.swift */,
);
path = HeaderSelectView;
sourceTree = "<group>";
};
F969BF04244EC27E00C79953 /* CollectionCell */ = {
isa = PBXGroup;
children = (
......@@ -794,6 +825,7 @@
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
F969BF1F244EE67900C79953 /* GoodsManageListVC.xib in Resources */,
E0C9EF13244E922200277435 /* OrderDViewController.xib in Resources */,
F961D26924500550007FBE70 /* HeaderSelectView.xib in Resources */,
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */,
E0D197D6244860B1002B080C /* BlueToothCell.xib in Resources */,
E0D197CB24484D90002B080C /* PersonCenterCell.xib in Resources */,
......@@ -803,6 +835,7 @@
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
E0DDCB19244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib in Resources */,
F95D9CA524493E840080D6E3 /* ShopInfoViewController.xib in Resources */,
F961D26F245015D6007FBE70 /* SelectContentView.xib in Resources */,
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */,
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
......@@ -883,6 +916,7 @@
F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */,
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
F961D264244FD744007FBE70 /* SearchBarView.swift in Sources */,
F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,
E09B03B62445B85A00211A51 /* LoginViewController.swift in Sources */,
......@@ -898,6 +932,7 @@
E0D197D5244860B1002B080C /* BlueToothCell.swift in Sources */,
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */,
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */,
F961D26B24500FF6007FBE70 /* HeaderSelectView.swift in Sources */,
E0D4166424483058008DCAB4 /* ChangePassViewController.swift in Sources */,
E0C4F4A7244EC82A00CC7E2F /* TitleAndBtnCell.swift in Sources */,
E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
......@@ -906,6 +941,7 @@
E00D85E1244561FD00F5F816 /* SceneDelegate.swift in Sources */,
F969BF1E244EE67900C79953 /* GoodsManageListVC.swift in Sources */,
E09B03A12445AF7100211A51 /* Define.swift in Sources */,
F961D271245016B7007FBE70 /* SelectContentView.swift in Sources */,
E08B0674244A98B2001D2E01 /* WareHouseSpCell.swift in Sources */,
E0D197CA24484D90002B080C /* PersonCenterCell.swift in Sources */,
E09B03A82445B04E00211A51 /* BaseView.swift in Sources */,
......
{
"images" : [
{
"filename" : "shangla.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "shangla@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "shangla@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "sousuo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "sousuo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "sousuo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "xiala.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "xiala@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "xiala@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x99",
"green" : "0x99",
"red" : "0x99"
"blue" : "0x66",
"green" : "0x66",
"red" : "0x66"
}
},
"idiom" : "universal"
......
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "237",
"green" : "231",
"red" : "233"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -10,6 +10,8 @@ import UIKit
class TitleContentCell: UITableViewCell {
@IBOutlet weak var contentLbl: UILabel!
@IBOutlet weak var titleLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
......
<?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">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<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"/>
......@@ -49,6 +49,10 @@
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="contentLbl" destination="eRf-WZ-Ifb" id="GbM-pJ-rEu"/>
<outlet property="titleLbl" destination="3WG-vq-JrT" id="42Q-VU-VBN"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="103.79464285714285"/>
</tableViewCell>
</objects>
......
//
// HeaderSelectView.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/22.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
protocol HeaderSelectViewDelegate {
// 协议定义
func showAction(sender:Int)
func colseAction(sender:Int)
}
class HeaderSelectView: UIView {
var delegate:HeaderSelectViewDelegate?
@IBOutlet weak var firstBtn: UIButton!
@IBOutlet weak var secBtn: UIButton!
@IBOutlet weak var thereBtn: UIButton!
var contentView:UIView!
let upImg = UIImage.init(named: "shangla")
let dowImg = UIImage.init(named: "xiala")
let upColor = UIColor.init(named: "蓝色字体颜色")
let dowColor = UIColor.init(named: "标题字颜色")
@IBAction func fristBtnAction(_ sender: UIButton) {
if sender.titleColor(for: .normal) == upColor {
sender.setTitleColor(dowColor, for: .normal)
sender.setImage(dowImg, for: .normal)
self.delegate?.colseAction(sender: 0)
}else{
sender.setTitleColor(upColor, for: .normal)
sender.setImage(upImg, for: .normal)
secBtn.setTitleColor(upColor, for: .normal)
thereBtn.setTitleColor(upColor, for: .normal)
secBtnAction(secBtn)
thereBtnAction(thereBtn)
self.delegate?.showAction(sender: 0)
}
}
@IBAction func secBtnAction(_ sender: UIButton) {
if sender.titleColor(for: .normal) == upColor {
sender.setTitleColor(dowColor, for: .normal)
sender.setImage(dowImg, for: .normal)
self.delegate?.colseAction(sender: 1)
}else{
sender.setTitleColor(upColor, for: .normal)
sender.setImage(upImg, for: .normal)
firstBtn.setTitleColor(upColor, for: .normal)
thereBtn.setTitleColor(upColor, for: .normal)
fristBtnAction(firstBtn)
thereBtnAction(thereBtn)
self.delegate?.showAction(sender: 1)
}
}
@IBAction func thereBtnAction(_ sender: UIButton) {
if sender.titleColor(for: .normal) == upColor {
sender.setTitleColor(dowColor, for: .normal)
sender.setImage(dowImg, for: .normal)
self.delegate?.colseAction(sender: 2)
}else{
sender.setTitleColor(upColor, for: .normal)
sender.setImage(upImg, for: .normal)
firstBtn.setTitleColor(upColor, for: .normal)
secBtn.setTitleColor(upColor, for: .normal)
fristBtnAction(firstBtn)
secBtnAction(secBtn)
self.delegate?.showAction(sender: 2)
}
}
func colseBytitleArr(arr:[String],index:Int){
if arr.count > 0 {
let str1 = arr[0] + " "
if index == 0 {
firstBtn.setTitle(str1, for: .normal)
}else if index == 1{
secBtn.setTitle(str1, for: .normal)
}
}
firstBtn.setTitleColor(dowColor, for: .normal)
secBtn.setTitleColor(dowColor, for: .normal)
thereBtn.setTitleColor(dowColor, for: .normal)
firstBtn.setImage(dowImg, for: .normal)
secBtn.setImage(dowImg, for: .normal)
thereBtn.setImage(dowImg, for: .normal)
}
//初始化时将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()
}
}
// /初始化时将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()
}
}
//加载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
return view
}
}
<?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" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" 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="HeaderSelectView">
<connections>
<outlet property="firstBtn" destination="NPE-os-75s" id="7Zt-Z2-bOc"/>
<outlet property="secBtn" destination="fJG-vM-HVA" id="knT-F9-Z5d"/>
<outlet property="thereBtn" destination="qBG-jC-B4y" id="nG2-ax-9cr"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="404" height="166"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NPE-os-75s">
<rect key="frame" x="0.0" y="0.0" width="134.5" height="166"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="全部商品 " image="xiala">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
<action selector="fristBtnAction:" destination="-1" eventType="touchUpInside" id="6g3-xa-mrO"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fJG-vM-HVA">
<rect key="frame" x="134.5" y="0.0" width="135" height="166"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="全部 " image="xiala">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
<action selector="secBtnAction:" destination="-1" eventType="touchUpInside" id="Ixk-Ze-f1L"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qBG-jC-B4y" userLabel="排序">
<rect key="frame" x="269.5" y="0.0" width="134.5" height="166"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="排序 " image="xiala">
<color key="titleColor" name="标题字颜色"/>
</state>
<connections>
<action selector="thereBtnAction:" destination="-1" eventType="touchUpInside" id="oCp-ME-OZP"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="fJG-vM-HVA" firstAttribute="width" secondItem="qBG-jC-B4y" secondAttribute="width" id="147-PD-30D"/>
<constraint firstAttribute="bottom" secondItem="fJG-vM-HVA" secondAttribute="bottom" id="3UK-w4-fob"/>
<constraint firstItem="fJG-vM-HVA" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="6eJ-0v-uBR"/>
<constraint firstAttribute="bottom" secondItem="NPE-os-75s" secondAttribute="bottom" id="9QH-bO-WHD"/>
<constraint firstAttribute="trailing" secondItem="qBG-jC-B4y" secondAttribute="trailing" id="D3l-ng-SMR"/>
<constraint firstAttribute="bottom" secondItem="qBG-jC-B4y" secondAttribute="bottom" id="FTx-MU-vS0"/>
<constraint firstItem="fJG-vM-HVA" firstAttribute="leading" secondItem="NPE-os-75s" secondAttribute="trailing" id="KEW-tP-yMb"/>
<constraint firstItem="NPE-os-75s" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="O8m-HI-ZUk"/>
<constraint firstItem="NPE-os-75s" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="QB7-bA-y7G"/>
<constraint firstItem="qBG-jC-B4y" firstAttribute="leading" secondItem="fJG-vM-HVA" secondAttribute="trailing" id="SM0-SQ-QIA"/>
<constraint firstItem="qBG-jC-B4y" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="jqX-nV-jcY"/>
<constraint firstItem="NPE-os-75s" firstAttribute="width" secondItem="fJG-vM-HVA" secondAttribute="width" id="r6h-DN-TwR"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="121.59999999999999" y="-138.53073463268368"/>
</view>
</objects>
<resources>
<image name="xiala" width="9" height="4.5"/>
<namedColor name="标题字颜色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
//
// SelectContentView.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/22.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
protocol SelectContentViewDelegate {
func didselectCell(sender:Int)
func selectContentvRemoveForSup()
}
class SelectContentView: UIView, UITableViewDelegate, UITableViewDataSource {
var delegate:SelectContentViewDelegate?
@IBOutlet weak var tabContentHeight: NSLayoutConstraint!
@IBOutlet weak var tabContentV: UIView!
var contentView:UIView!
var tableV :UITableView!
var selectIndx : Int = 0 {
didSet{
tableV.selectRow(at: IndexPath(row: selectIndx, section: 0), animated: false, scrollPosition: .none)
}
}
var dataArr : [String] = []{
didSet{
if dataArr.count > 3 {
if dataArr.count > 6 {
tabContentHeight.constant = 50 * 5 + 5
}else{
tabContentHeight.constant = CGFloat(50 * dataArr.count + 5)
}
}else{
tabContentHeight.constant = 155
}
tableV.reloadData()
}
}
func setTabv() {
tableV = UITableView()
tabContentV.addSubview(tableV);
tableV.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(5)
}
tableV.delegate = self
tableV.dataSource = self
tableV.separatorStyle = .none
tableV?.register(UINib(nibName: "TitleContentCell", bundle: nil), forCellReuseIdentifier: "TitleContentCell")
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return dataArr.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleContentCell") as! TitleContentCell
cell.selectionStyle = .none
let titleStr = dataArr[indexPath.row]
cell.contentLbl.text = ""
cell.titleLbl.text = titleStr
if selectIndx == indexPath.row {
cell.titleLbl.textColor = UIColor.init(named: "蓝色字体颜色")
}else{
cell.titleLbl.textColor = UIColor.init(named: "标题字颜色")
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
self.delegate?.didselectCell(sender: indexPath.row)
self.removeFromSuperview()
}
@IBAction func balckTapAction(_ sender: UITapGestureRecognizer) {
self.delegate?.selectContentvRemoveForSup()
self.removeFromSuperview()
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 50
}
//初始化时将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()
}
setTabv()
}
// /初始化时将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()
}
setTabv()
}
//加载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
return view
}
}
<?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" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<capability name="Named colors" 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="SelectContentView" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="tabContentHeight" destination="S1h-DP-cWZ" id="pxH-D1-vbP"/>
<outlet property="tabContentV" destination="bMO-eQ-C5Q" id="ta3-G5-KzK"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="klJ-LA-Bg9">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" name="提示视图背景色"/>
<gestureRecognizers/>
<connections>
<outletCollection property="gestureRecognizers" destination="lbB-EL-qxS" appends="YES" id="LUi-SM-beh"/>
</connections>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bMO-eQ-C5Q">
<rect key="frame" x="0.0" y="-5" width="375" height="155"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="155" id="S1h-DP-cWZ"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="bMO-eQ-C5Q" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="-5" id="3yC-V9-M5c"/>
<constraint firstItem="klJ-LA-Bg9" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="AQ1-ls-pFG"/>
<constraint firstItem="bMO-eQ-C5Q" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Bx2-Lc-LuS"/>
<constraint firstItem="klJ-LA-Bg9" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="ONl-MS-AkF"/>
<constraint firstAttribute="bottom" secondItem="klJ-LA-Bg9" secondAttribute="bottom" id="SLv-9j-42I"/>
<constraint firstAttribute="trailing" secondItem="klJ-LA-Bg9" secondAttribute="trailing" id="bXs-2X-b6K"/>
<constraint firstAttribute="trailing" secondItem="bMO-eQ-C5Q" secondAttribute="trailing" id="bra-ql-qxf"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="132" y="137"/>
</view>
<tapGestureRecognizer id="lbB-EL-qxS">
<connections>
<action selector="balckTapAction:" destination="-1" id="Jse-Sh-MOJ"/>
</connections>
</tapGestureRecognizer>
</objects>
<resources>
<namedColor name="提示视图背景色">
<color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
//
// SearchBarView.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/22.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class SearchBarView: UISearchBar {
override init(frame: CGRect) {
super.init(frame: frame)
setInit()
}
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
setInit()
}
var placeholderStr: String?{
didSet{
print("didset")
changePlstr(placeStr: placeholderStr)
}
}
var cornerRadius:CGFloat = 0{
didSet{
changecornerRadius(cornerRadius: cornerRadius)
}
}
//初始设置
func setInit() {
self.searchBarStyle = .minimal
self.backgroundColor = UIColor.init(named: "白色背景色")
self.setPositionAdjustment(UIOffset(horizontal: 10, vertical: 0), for: .search)
self.setImage(UIImage.init(named: "sousuo"), for: .search, state: .normal)
self.placeholder = "搜索相关关键字"
for subV:UIView in self.subviews {
for subv in subV.subviews {
for sbV in subv.subviews {
print("sp\(sbV)")
if sbV.isKind(of: NSClassFromString("UISearchBarTextField")!) {
print("打印\(sbV.subviews)")
let sbvV = sbV as! UITextField
sbvV.textColor = UIColor.init(named: "标题字颜色")
sbvV.clipsToBounds = true
}
}
}
}
}
//修改圆角
func changecornerRadius(cornerRadius:CGFloat) {
for subV:UIView in self.subviews {
for subv in subV.subviews {
for sbV in subv.subviews {
if sbV.isKind(of: NSClassFromString("UISearchBarTextField")!) {
let sbvV = sbV as! UITextField
sbvV.layer.cornerRadius = cornerRadius
}
}
}
}
}
//修改占位字
func changePlstr(placeStr:String?) {
for subV:UIView in self.subviews {
for subv in subV.subviews {
for sbV in subv.subviews {
if sbV.isKind(of: NSClassFromString("UISearchBarTextField")!) {
let sbvV = sbV as! UITextField
let str = NSAttributedString.init(string: placeStr!, attributes: [NSAttributedString.Key.font:UIFont.systemFont(ofSize: 13)])
sbvV.attributedPlaceholder = str
}
}
}
}
}
}
......@@ -9,18 +9,45 @@
import UIKit
import ViewAnimator
class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollectionViewDataSource ,UICollectionViewDelegateFlowLayout{
class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollectionViewDataSource ,UICollectionViewDelegateFlowLayout,HeaderSelectViewDelegate,SelectContentViewDelegate,UISearchBarDelegate{
var collection : UICollectionView? = nil
var layout = UICollectionViewFlowLayout()
private let animations = [AnimationType.from(direction: .bottom, offset: 100.0)]
private var items = [Any?]()
weak var showSelectV: SelectContentView! = nil
weak var selectV: HeaderSelectView! = nil
var selectIndexArr = [0,0,0]
var showSelectvIndex = 0
@IBOutlet weak var collectionBgView: UIView!
@IBOutlet weak var changeBgView: UIView!
@IBOutlet weak var searchBgView: UIView!
@IBOutlet weak var contentView: UIView!
//MARK:--添加初始化
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor.init(named: "白色背景色")
//searchbar
let searchBr = SearchBarView.init()
self.searchBgView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
searchBr.placeholderStr = "请输入商品名称"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
let selectView = HeaderSelectView()
changeBgView.addSubview(selectView)
selectView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalTo(0);
}
selectView.delegate = self
selectV = selectView
layout.headerReferenceSize = CGSize(width: 375, height: 50)
......@@ -29,15 +56,14 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
self.collection?.delegate = self
self.collection?.dataSource = self
self.collection?.backgroundColor = UIColor.init(named: "app底色")
self.view.addSubview(self.collection!)
self.collectionBgView.addSubview(self.collection!)
self.collection?.snp.makeConstraints({ (make) in
make.left.right.bottom.equalTo(0);
make.top.equalTo(100)
make.left.top.right.bottom.equalTo(0);
})
self.collection?.register(UINib(nibName: "GoodsCollectionViewCell", bundle: nil), forCellWithReuseIdentifier: "GoodsCollectionViewCell")
self.collection?.register(UICollectionReusableView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "headerIdentifier")
DispatchQueue.main.asyncAfter(deadline: .now() + 0.33) {
self.items = Array(repeating: nil, count: 11)
......@@ -45,29 +71,95 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
self.collection?.performBatchUpdates({
UIView.animate(views: self.collection!.orderedVisibleCells,
animations: self.animations, completion: {
})
})
}, completion: nil)
}
}
//MARK:--搜索按钮代理
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
}
//MARK:--新增触发
@IBAction func addNewGoodsAction(_ sender: UIButton) {
print("新增触发-")
}
//MARK:--下拉视图各种代理
func showAction(sender: Int) {
showSelectvIndex = sender
let showSelectView = SelectContentView()
showSelectView.delegate = self
self.view.window?.addSubview(showSelectView)
showSelectView.snp.makeConstraints { (make) in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(changeBgView.snp_bottom)
}
showSelectV = showSelectView
switch sender {
case 0:
do {
showSelectView.dataArr = ["全部商品", "普通商品", "预售商品"]
showSelectView.selectIndx = selectIndexArr[0]
}
break
case 1:
do {
showSelectView.dataArr = ["全部", "下架", "上架"]
showSelectView.selectIndx = selectIndexArr[1]
}
break
case 2:
do {
showSelectView.dataArr = ["新增时间最新排序", "新增时间最早排序", "销量最多排序", "销量最少排序"]
showSelectView.selectIndx = selectIndexArr[2]
}
break
default: break
}
}
func colseAction(sender: Int) {
if showSelectV != nil {
showSelectV.removeFromSuperview()
}
}
func didselectCell(sender: Int) {
selectIndexArr[showSelectvIndex] = sender
var arr:[String] = []
if showSelectvIndex == 0 {
let arr1 = ["全部商品", "普通商品", "预售商品"]
arr.append(arr1[sender])
}else if showSelectvIndex == 1{
let arr2 = ["全部", "下架", "上架"]
arr.append(arr2[sender])
}
selectV.colseBytitleArr(arr: arr, index:showSelectvIndex)
}
func selectContentvRemoveForSup() {
selectV.colseBytitleArr(arr: [], index:showSelectvIndex)
}
//MARK:--collectionView所有代理
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
let headerV = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "headerIdentifier", for: indexPath)
let headerLbl = UILabel(frame: CGRect(x: 15, y: 0, width: 100, height: 50))
let headerLbl = UILabel(frame: CGRect(x: 15, y: 10, width: 100, height: 20))
headerLbl.text = "共x件商品"
headerLbl.textColor = UIColor.init(named: "标题字颜色")
headerLbl.font = UIFont.systemFont(ofSize: 13)
headerV.addSubview(headerLbl)
return headerV
}
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
return CGSize.init(width: 375, height: 50)
}
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
return CGSize.init(width: self.contentView.bounds.width, height: 30)
}
func numberOfSections(in collectionView: UICollectionView) -> Int {
return 1
......@@ -84,7 +176,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
cell.leftBtn.tag = indexPath.row
cell.rightBtn.tag = indexPath.row
cell.codeBtn.tag = indexPath.row
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
cell.goodsName.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))
cell.priceLbl.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))
......@@ -97,7 +189,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
return CGSize(width: 165, height: 283)
}
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
return UIEdgeInsets(top: 15, left: 15, bottom: 0, right: 15)
return UIEdgeInsets(top: 15, left: 15, bottom: 15, right: 15)
}
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
print("选中===\(indexPath)")
......
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<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="GoodsManageListVC" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="contentView" destination="DIe-mL-vml" id="IT5-kL-Krm"/>
<outlet property="changeBgView" destination="Swh-le-IcW" id="U00-xj-SCY"/>
<outlet property="collectionBgView" destination="aXP-zc-ITt" id="r7C-D3-25B"/>
<outlet property="contentView" destination="DIe-mL-vml" id="xCZ-90-SVg"/>
<outlet property="searchBgView" destination="H5j-EA-EVh" id="7EP-TF-Q9e"/>
<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"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DIe-mL-vml">
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H5j-EA-EVh" userLabel="searchView">
<rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="adn-tX-j79">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xeh-de-he4" userLabel="lineView">
<rect key="frame" x="0.0" y="45" width="375" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="v2i-ik-gcK"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Swh-le-IcW" userLabel="shaixuanView">
<rect key="frame" x="0.0" y="46" width="375" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="iQo-bK-dpd">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aXP-zc-ITt" userLabel="colectionView">
<rect key="frame" x="0.0" y="91" width="375" height="576"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g5q-zA-x29">
<rect key="frame" x="330" y="8" width="30" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="新增">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
<connections>
<action selector="addNewGoodsAction:" destination="-1" eventType="touchUpInside" id="7e4-aj-Imh"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="H5j-EA-EVh" firstAttribute="leading" secondItem="DIe-mL-vml" secondAttribute="leading" id="7iQ-yY-rDw"/>
<constraint firstItem="H5j-EA-EVh" firstAttribute="top" secondItem="DIe-mL-vml" secondAttribute="top" id="8Ue-bx-ndM"/>
<constraint firstItem="Swh-le-IcW" firstAttribute="top" secondItem="Xeh-de-he4" secondAttribute="bottom" id="Ckh-XQ-l9A"/>
<constraint firstItem="Xeh-de-he4" firstAttribute="top" secondItem="H5j-EA-EVh" secondAttribute="bottom" id="GU9-u6-Gg7"/>
<constraint firstAttribute="trailing" secondItem="Xeh-de-he4" secondAttribute="trailing" id="Q42-Uk-lgI"/>
<constraint firstAttribute="bottom" secondItem="aXP-zc-ITt" secondAttribute="bottom" id="Zk4-Zv-YTt"/>
<constraint firstAttribute="trailing" secondItem="aXP-zc-ITt" secondAttribute="trailing" id="gAL-Nt-A2P"/>
<constraint firstItem="Swh-le-IcW" firstAttribute="leading" secondItem="DIe-mL-vml" secondAttribute="leading" id="gIg-X5-jrr"/>
<constraint firstAttribute="trailing" secondItem="g5q-zA-x29" secondAttribute="trailing" constant="15" id="mTK-bH-1b3">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="aXP-zc-ITt" firstAttribute="top" secondItem="Swh-le-IcW" secondAttribute="bottom" id="nnx-pM-oa1"/>
<constraint firstAttribute="trailing" secondItem="H5j-EA-EVh" secondAttribute="trailing" constant="55" id="tW6-HJ-c3x">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="aXP-zc-ITt" firstAttribute="leading" secondItem="DIe-mL-vml" secondAttribute="leading" id="vQE-nA-Yf4"/>
<constraint firstAttribute="trailing" secondItem="Swh-le-IcW" secondAttribute="trailing" id="wHr-Yc-gRh"/>
<constraint firstItem="g5q-zA-x29" firstAttribute="centerY" secondItem="H5j-EA-EVh" secondAttribute="centerY" id="xao-Qa-Yan"/>
<constraint firstItem="Xeh-de-he4" firstAttribute="leading" secondItem="DIe-mL-vml" secondAttribute="leading" id="yUT-mM-vpV"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
......@@ -34,4 +108,12 @@
<point key="canvasLocation" x="133" y="153"/>
</view>
</objects>
<resources>
<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"/>
</namedColor>
</resources>
</document>
......@@ -82,7 +82,7 @@ class LoginViewController: BaseViewController {
@IBAction func loginAction(_ sender: Any) {
print("loginAction")
let vc = CreatNewSpecsViewController()
let vc = GoodsManageListVC()
self.navigationController?.pushViewController(vc, animated: true)
// let alertView = GeliAlertView(frame: self.view.window!.bounds)
// alertView.tishiLbl.text = "202121";
......
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