Commit 24bc4043 authored by lujunye's avatar lujunye

asd;lfj;alsjdfl;asjfl;dasjd;fl

parent 5d4da860
...@@ -238,6 +238,10 @@ ...@@ -238,6 +238,10 @@
E07C2FFC24ECCD590043649B /* GLMessageAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */; }; E07C2FFC24ECCD590043649B /* GLMessageAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */; };
E0833B8524D8F6A00014F3E9 /* PaymentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0833B8424D8F6A00014F3E9 /* PaymentView.xib */; }; E0833B8524D8F6A00014F3E9 /* PaymentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0833B8424D8F6A00014F3E9 /* PaymentView.xib */; };
E0833B8724D8F96D0014F3E9 /* PaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0833B8624D8F96D0014F3E9 /* PaymentView.swift */; }; E0833B8724D8F96D0014F3E9 /* PaymentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0833B8624D8F96D0014F3E9 /* PaymentView.swift */; };
E083F0BB26047BA100627DBE /* DZGL_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E083F0B926047BA100627DBE /* DZGL_VC.swift */; };
E083F0BC26047BA100627DBE /* DZGL_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E083F0BA26047BA100627DBE /* DZGL_VC.xib */; };
E083F0C526047EFF00627DBE /* DZGL_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E083F0C326047EFF00627DBE /* DZGL_Cell.swift */; };
E083F0C626047EFF00627DBE /* DZGL_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E083F0C426047EFF00627DBE /* DZGL_Cell.xib */; };
E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; }; E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC8C24470BF0000DAA8A /* CodeView.swift */; };
E088CC932447124D000DAA8A /* BindViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC912447124D000DAA8A /* BindViewController.swift */; }; E088CC932447124D000DAA8A /* BindViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E088CC912447124D000DAA8A /* BindViewController.swift */; };
E088CC942447124D000DAA8A /* BindViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E088CC922447124D000DAA8A /* BindViewController.xib */; }; E088CC942447124D000DAA8A /* BindViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E088CC922447124D000DAA8A /* BindViewController.xib */; };
...@@ -998,6 +1002,10 @@ ...@@ -998,6 +1002,10 @@
E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLMessageAlertView.xib; sourceTree = "<group>"; }; E07C2FFB24ECCD590043649B /* GLMessageAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GLMessageAlertView.xib; sourceTree = "<group>"; };
E0833B8424D8F6A00014F3E9 /* PaymentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaymentView.xib; sourceTree = "<group>"; }; E0833B8424D8F6A00014F3E9 /* PaymentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaymentView.xib; sourceTree = "<group>"; };
E0833B8624D8F96D0014F3E9 /* PaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentView.swift; sourceTree = "<group>"; }; E0833B8624D8F96D0014F3E9 /* PaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentView.swift; sourceTree = "<group>"; };
E083F0B926047BA100627DBE /* DZGL_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DZGL_VC.swift; sourceTree = "<group>"; };
E083F0BA26047BA100627DBE /* DZGL_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZGL_VC.xib; sourceTree = "<group>"; };
E083F0C326047EFF00627DBE /* DZGL_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DZGL_Cell.swift; sourceTree = "<group>"; };
E083F0C426047EFF00627DBE /* DZGL_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DZGL_Cell.xib; sourceTree = "<group>"; };
E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; }; E088CC8C24470BF0000DAA8A /* CodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeView.swift; sourceTree = "<group>"; };
E088CC912447124D000DAA8A /* BindViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindViewController.swift; sourceTree = "<group>"; }; E088CC912447124D000DAA8A /* BindViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BindViewController.swift; sourceTree = "<group>"; };
E088CC922447124D000DAA8A /* BindViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindViewController.xib; sourceTree = "<group>"; }; E088CC922447124D000DAA8A /* BindViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BindViewController.xib; sourceTree = "<group>"; };
...@@ -2176,6 +2184,17 @@ ...@@ -2176,6 +2184,17 @@
path = "新增采购单"; path = "新增采购单";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
E083F0B826047B8200627DBE /* 店长管理 */ = {
isa = PBXGroup;
children = (
E083F0B926047BA100627DBE /* DZGL_VC.swift */,
E083F0BA26047BA100627DBE /* DZGL_VC.xib */,
E083F0C326047EFF00627DBE /* DZGL_Cell.swift */,
E083F0C426047EFF00627DBE /* DZGL_Cell.xib */,
);
path = "店长管理";
sourceTree = "<group>";
};
E088CC882446FFA1000DAA8A /* Other */ = { E088CC882446FFA1000DAA8A /* Other */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -2312,6 +2331,7 @@ ...@@ -2312,6 +2331,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = { E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E083F0B826047B8200627DBE /* 店长管理 */,
E0E6A59525FC66A800C9BCD6 /* 店长审核 */, E0E6A59525FC66A800C9BCD6 /* 店长审核 */,
E0F83BA625F7082E00D31672 /* 批次库新Cell */, E0F83BA625F7082E00D31672 /* 批次库新Cell */,
E02A3CAC25C3ECCD00A4E369 /* 商品库存 */, E02A3CAC25C3ECCD00A4E369 /* 商品库存 */,
...@@ -3943,6 +3963,8 @@ ...@@ -3943,6 +3963,8 @@
E0E5605B25C169E30004BA56 /* GPrinter_Cell.xib in Resources */, E0E5605B25C169E30004BA56 /* GPrinter_Cell.xib in Resources */,
E0B94624245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.xib in Resources */, E0B94624245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.xib in Resources */,
F9023F722449ACA800DD5A63 /* TitleAndSwitchCell.xib in Resources */, F9023F722449ACA800DD5A63 /* TitleAndSwitchCell.xib in Resources */,
E083F0BC26047BA100627DBE /* DZGL_VC.xib in Resources */,
E083F0C626047EFF00627DBE /* DZGL_Cell.xib in Resources */,
E08B0675244A98B2001D2E01 /* WareHouseSpCell.xib in Resources */, E08B0675244A98B2001D2E01 /* WareHouseSpCell.xib in Resources */,
E0CC848C24824291009B1FE9 /* CRKListVC.xib in Resources */, E0CC848C24824291009B1FE9 /* CRKListVC.xib in Resources */,
E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */, E0D4166024482AAF008DCAB4 /* AccountViewController.xib in Resources */,
...@@ -4264,6 +4286,7 @@ ...@@ -4264,6 +4286,7 @@
E02EE125259AD6FB00733764 /* FXSY_Cell.swift in Sources */, E02EE125259AD6FB00733764 /* FXSY_Cell.swift in Sources */,
E020632F246CE2F9007A40C4 /* OrderDViewSumFooter.swift in Sources */, E020632F246CE2F9007A40C4 /* OrderDViewSumFooter.swift in Sources */,
E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */, E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */,
E083F0BB26047BA100627DBE /* DZGL_VC.swift in Sources */,
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */, F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */, E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */,
F9171EFC245128B200359C2B /* Interface.swift in Sources */, F9171EFC245128B200359C2B /* Interface.swift in Sources */,
...@@ -4363,6 +4386,7 @@ ...@@ -4363,6 +4386,7 @@
E0273DD824551B4C00B3FCAE /* SendTimeSelectView.swift in Sources */, E0273DD824551B4C00B3FCAE /* SendTimeSelectView.swift in Sources */,
E040399624D14D37008CF965 /* LalamoveModel.swift in Sources */, E040399624D14D37008CF965 /* LalamoveModel.swift in Sources */,
E0B903C9259B11C20041EF62 /* FXSY_Detail_ViewController.swift in Sources */, E0B903C9259B11C20041EF62 /* FXSY_Detail_ViewController.swift in Sources */,
E083F0C526047EFF00627DBE /* DZGL_Cell.swift in Sources */,
E08A7AE024652E2C00F934F2 /* BingDingKeHuViewController.swift in Sources */, E08A7AE024652E2C00F934F2 /* BingDingKeHuViewController.swift in Sources */,
F96E9D5A246656A700B5B94A /* HGImageCollectionViewController.swift in Sources */, F96E9D5A246656A700B5B94A /* HGImageCollectionViewController.swift in Sources */,
E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */, E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */,
......
...@@ -285,7 +285,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont ...@@ -285,7 +285,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
let v2 = GoodsManageListVC() let v2 = GoodsManageListVC()
// let v3 = WorkCViewController() // let v3 = WorkCViewController()
let v3 = DZSH_Mg_ViewController() let v3 = DZGL_VC()
let v4 = WarehoseMangementListVC() let v4 = WarehoseMangementListVC()
let v5 = PersonCenterViewController() let v5 = PersonCenterViewController()
......
<?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="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<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="System colors in document resources" minToolsVersion="11.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/>
......
//
// DZGL_Cell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/19.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
protocol DZGL_Cell_Delegate {
func DZGL_Cell_Del_Action(cell:DZGL_Cell)
func DZGL_Cell_Edit_Action(cell:DZGL_Cell)
}
class DZGL_Cell: UITableViewCell {
var delegate:DZGL_Cell_Delegate?
@IBOutlet weak var img_view: UIImageView!
@IBOutlet weak var name_lbl: UILabel!
@IBOutlet weak var adr_lbl: UILabel!
@IBOutlet weak var relation_lbl: UILabel!
@IBOutlet weak var status_lbl: UILabel!
@IBOutlet weak var time_lbl: UILabel!
@IBOutlet weak var del_Btn: UIButton!
@IBAction func del_action(_ sender: UIButton) {
delegate?.DZGL_Cell_Del_Action(cell: self)
}
@IBAction func edit_action(_ sender: UIButton) {
delegate?.DZGL_Cell_Edit_Action(cell: self)
}
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
This diff is collapsed.
//
// DZGL_VC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/19.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class DZGL_VC: BaseViewController, UITableViewDelegate, UITableViewDataSource, UISearchBarDelegate, SearchBarViewDelegate ,DZGL_Cell_Delegate{
func DZGL_Cell_Del_Action(cell: DZGL_Cell) {
print("Del",cell.tag)
}
func DZGL_Cell_Edit_Action(cell: DZGL_Cell) {
print("Edit",cell.tag)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if tableView.tag == 2 {
return 44
}
return 220
}
@IBOutlet weak var cover_btn: UIButton!
@IBOutlet weak var select_list: UITableView!
@IBAction func close_action(_ sender: UIButton) {
cover_btn.isHidden = true
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
var select_num = 0
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if tableView.tag == 2 {
select_num = indexPath.row
select_list.isHidden = true
cover_btn.isHidden = true
type_lbl.text = type_arr[select_num]
// self.tableView.mj_header?.beginRefreshing()
}
}
let type_arr = ["全部","1对1","1对多"]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if tableView.tag == 2 {
var cell = tableView.dequeueReusableCell(withIdentifier: "cell")
if cell == nil {
cell = UITableViewCell(style: .default, reuseIdentifier: "cell")
cell?.selectionStyle = .none
cell?.textLabel?.font = UIFont.systemFont(ofSize: 13)
}
cell?.textLabel?.text = type_arr[indexPath.row]
return cell!
}
let cell = tableView.dequeueReusableCell(withIdentifier: "DZGL_Cell") as! DZGL_Cell
cell.delegate = self
cell.tag = indexPath.row
return cell
}
func clearSearchAction() {
}
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--")
removeBlackBtnView()
if keyword.count > 0 {
keyword = searchBar.text!
if keyword.count == 0 {
tableView.mj_header?.beginRefreshing()
}
}
}
//MARK: - search
var blackBtnView:UIButton! = nil
@objc func removeBlackBtnView(){
if blackBtnView != nil {
blackBtnView.removeFromSuperview()
searchV!.resignFirstResponder()
}
}
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
print("调起搜索后添加个蒙版本")
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
self.view.addSubview(blackBtnView)
blackBtnView.snp.makeConstraints { (make) in
make.top.equalTo(search_view!.snp_bottom)
make.left.right.bottom.equalToSuperview()
}
blackBtnView.addTarget(self, action: #selector(removeBlackBtnView), for: .touchUpInside)
blackBtnView.isUserInteractionEnabled = false
return true
}
weak var searchV: SearchBarView? = nil
@IBOutlet weak var tableView: UITableView!
@IBAction func show_select_action(_ sender: UIButton) {
cover_btn.isHidden = !cover_btn.isHidden
select_list.isHidden = cover_btn.isHidden
}
@IBOutlet weak var type_lbl: UILabel!
@IBOutlet weak var search_view: UIView!
var page : Int = 0
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var keyword = ""
var isUpData = false{
didSet{
if !isUpData {
if tableView != nil {
tableView.mj_header?.beginRefreshing()
}
}
}
}
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "店长管理"
navbar.rightTitle = "新增店铺"
self.view.addSubview(navbar)
SetTopFrame(view: search_view, height: 44)
// Do any additional setup after loading the view.
let searchBr = SearchBarView.init()
searchV = searchBr
self.search_view.addSubview(searchBr)
searchV?.changecornerRadius(cornerRadius: 35*0.5)
searchBr.placeholderStr = "请输入分销商名称"
searchBr.delegate = self
searchBr.delegateL = self
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(0)
make.right.equalTo(0)
make.centerY.equalToSuperview()
make.height.equalTo(35)
}
tableView.separatorStyle = .none
tableView.showsVerticalScrollIndicator = false
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
tableView.mj_header = self.headerMJ
// tableView.mj_header?.beginRefreshing()
self.footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
tableView.mj_footer = self.footerMJ
tableView.register(UINib(nibName: "DZGL_Cell", bundle: nil), forCellReuseIdentifier: "DZGL_Cell")
}
@objc func loadData(){
page = 1
isUpData = true
}
@objc func loadMoreData(){
}
}
This diff is collapsed.
<?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="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<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="System colors in document resources" minToolsVersion="11.0"/> <capability name="System colors in document resources" minToolsVersion="11.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