Skip to content

G
GeliBusinessPlatform
Commit 476412c2 authored by lujunye's avatar lujunye
Browse files
Options

222222222

parent 8a1d11fd
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 5 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 476412c2
......@@ -499,6 +499,8 @@
E0F1BE4924692379003015B2 /* ItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F1BE4724692379003015B2 /* ItemCell.xib */; };
E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */; };
E0F3C2CC24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F3C2CA24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.xib */; };
E0F503E02648DE52000F9633 /* SY_DLS_GL_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F503DE2648DE52000F9633 /* SY_DLS_GL_VC.swift */; };
E0F503E12648DE52000F9633 /* SY_DLS_GL_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F503DF2648DE52000F9633 /* SY_DLS_GL_VC.xib */; };
E0F83BA925F7085400D31672 /* NewPiCiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F83BA725F7085400D31672 /* NewPiCiCell.swift */; };
E0F83BAA25F7085400D31672 /* NewPiCiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F83BA825F7085400D31672 /* NewPiCiCell.xib */; };
E0F8E91B248737F100817A08 /* NewOnlyRKCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F8E919248737F100817A08 /* NewOnlyRKCell.swift */; };
......@@ -1326,6 +1328,8 @@
E0F1BE4724692379003015B2 /* ItemCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ItemCell.xib; sourceTree = "<group>"; };
E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinZengAndBianJiKeHuViewController.swift; sourceTree = "<group>"; };
E0F3C2CA24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinZengAndBianJiKeHuViewController.xib; sourceTree = "<group>"; };
E0F503DE2648DE52000F9633 /* SY_DLS_GL_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SY_DLS_GL_VC.swift; sourceTree = "<group>"; };
E0F503DF2648DE52000F9633 /* SY_DLS_GL_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SY_DLS_GL_VC.xib; sourceTree = "<group>"; };
E0F83BA725F7085400D31672 /* NewPiCiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewPiCiCell.swift; sourceTree = "<group>"; };
E0F83BA825F7085400D31672 /* NewPiCiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewPiCiCell.xib; sourceTree = "<group>"; };
E0F8E919248737F100817A08 /* NewOnlyRKCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewOnlyRKCell.swift; sourceTree = "<group>"; };
......@@ -1812,13 +1816,13 @@
isa = PBXGroup;
children = (
E02F43C1246A91C1000ECFB1 /* GeliBusinessPlatform.entitlements */,
E09B039E2445AEF800211A51 /* Appdelegate */,
E088CC882446FFA1000DAA8A /* Other */,
E09B03AD2445B0BA00211A51 /* ViewController */,
E09B03AC2445B0B200211A51 /* View */,
E09B03B32445B19400211A51 /* Interface */,
E09B03A92445B09200211A51 /* Model */,
E09B03A42445B03200211A51 /* BaseView */,
E09B039E2445AEF800211A51 /* Appdelegate */,
E00D85E4244561FE00F5F816 /* Assets.xcassets */,
E00D85E9244561FE00F5F816 /* LaunchScreen.storyboard */,
E09B039F2445AF4D00211A51 /* Define */,
......@@ -2508,6 +2512,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E0F503DD2648DE22000F9633 /* 上游代理商管理 */,
E05AEFA3261577C600FB7CF4 /* 拼拼货group */,
E083F0B826047B8200627DBE /* 店长管理 */,
E0E6A59525FC66A800C9BCD6 /* 店长审核 */,
......@@ -3081,6 +3086,15 @@
path = PurchaseModel;
sourceTree = "<group>";
};
E0F503DD2648DE22000F9633 /* 上游代理商管理 */ = {
isa = PBXGroup;
children = (
E0F503DE2648DE52000F9633 /* SY_DLS_GL_VC.swift */,
E0F503DF2648DE52000F9633 /* SY_DLS_GL_VC.xib */,
);
path = "上游代理商管理";
sourceTree = "<group>";
};
E0F83BA625F7082E00D31672 /* 批次库新Cell */ = {
isa = PBXGroup;
children = (
......@@ -4176,6 +4190,7 @@
E0EFB9C724930C0D005FB0CD /* CGDListViewController.xib in Resources */,
E02DDD9A24501A5B00ABB707 /* DelGuiGeCell.xib in Resources */,
F9A1D4A5255B77070018DA8A /* RetailManageViewCell.xib in Resources */,
E0F503E12648DE52000F9633 /* SY_DLS_GL_VC.xib in Resources */,
E0402603259C186800EDF182 /* KHXQ_Cell.xib in Resources */,
F971D7B3248B6432007F1619 /* address_new.json in Resources */,
E00D85E8244561FE00F5F816 /* Preview Assets.xcassets in Resources */,
......@@ -4469,6 +4484,7 @@
E083F0BB26047BA100627DBE /* DZGL_VC.swift in Sources */,
F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */,
E0F503E02648DE52000F9633 /* SY_DLS_GL_VC.swift in Sources */,
F9171EFC245128B200359C2B /* Interface.swift in Sources */,
E0AACC76255BB03C00FC9010 /* TitleAndSelectCell.swift in Sources */,
E0F97B082451620B001BD600 /* ProductDetailViewController.swift in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ 476412c2
......@@ -282,7 +282,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
let v2 = GoodsManageListVC()
let v3 = WorkCViewController()
// let v3 = WorkCViewController()
let v3 = SY_DLS_GL_VC()
let v4 = WarehoseMangementListVC()
......
GeliBusinessPlatform/ViewController/上游代理商管理/SY_DLS_GL_VC.swift 0 → 100644
View file @ 476412c2
//
// SY_DLS_GL_VC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/5/10.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class SY_DLS_GL_VC: BaseViewController, UISearchBarDelegate, SearchBarViewDelegate {
func rightBtnClick() {
print("新增代理商")
}
@IBOutlet weak var list_view: UITableView!
@IBOutlet weak var contentV: UIView!
var keyword = ""
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "上游代理商管理"
navbar.rightTitle = "新增代理商"
self.view.addSubview(navbar)
SetTopFrame(view: contentV, height: 45)
let searchBr = SearchBarView.init()
searchV = searchBr
self.contentV.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)
}
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
list_view.mj_header = self.headerMJ
list_view.mj_header?.beginRefreshing()
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
list_view.mj_footer = self.footerMJ
}
@objc func loadData(){}
@objc func loadMoreData(){}
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(contentV!.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
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
searchBar.resignFirstResponder()
keyword = searchBar.text!
removeBlackBtnView()
if keyword.count > 0 {
list_view.mj_header?.beginRefreshing()
}
}
//MARK:--取消搜索代理
func clearSearchAction() {
print("取消搜索代理了--")
}
func searchBarTextDidEndEditing(_ searchBar: UISearchBar) {
print("编辑即将结束了--")
removeBlackBtnView()
if keyword.count > 0 {
keyword = searchBar.text!
if keyword.count == 0 {
list_view.mj_header?.beginRefreshing()
}
}
}
}
GeliBusinessPlatform/ViewController/上游代理商管理/SY_DLS_GL_VC.xib 0 → 100644
View file @ 476412c2
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.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="SY_DLS_GL_VC" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="contentV" destination="eg2-nl-cTO" id="5qO-4k-tM9"/>
<outlet property="list_view" destination="JGX-pe-Vih" id="JMG-LT-hwQ"/>
<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"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eg2-nl-cTO">
<rect key="frame" x="0.0" y="44" width="414" height="45"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="ogq-se-mVd"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="JGX-pe-Vih">
<rect key="frame" x="0.0" y="89" width="414" height="807"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="eg2-nl-cTO" secondAttribute="trailing" id="0ed-80-iYn"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="JGX-pe-Vih" secondAttribute="trailing" id="Mfg-AE-P5N"/>
<constraint firstItem="eg2-nl-cTO" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="TNe-hl-6V1"/>
<constraint firstItem="eg2-nl-cTO" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="X7Y-uZ-VLa"/>
<constraint firstAttribute="bottom" secondItem="JGX-pe-Vih" secondAttribute="bottom" id="hoh-Pd-04e"/>
<constraint firstItem="JGX-pe-Vih" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="wJA-iL-zRZ"/>
<constraint firstItem="JGX-pe-Vih" firstAttribute="top" secondItem="eg2-nl-cTO" secondAttribute="bottom" id="zBX-5l-Hcw"/>
</constraints>
<point key="canvasLocation" x="141" y="60"/>
</view>
</objects>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 476412c2
......@@ -680,10 +680,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
} failture: { (error) in
}
return
case 132: //分销订单管理
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = RetailListMgVC()
self.navigationController?.pushViewController(vc, animated: true)
return
......
GeliBusinessPlatform/ViewController/蓝牙连接/BtViewController.m
View file @ 476412c2
......@@ -9,7 +9,7 @@
#import "BtViewController.h"
#import "SVProgressHUD.h"
#import "Bt_Cell.h"
#import "BabyBluetooth.h"
@interface BtViewController ()<UITableViewDelegate,UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UITableView *tableView;
......@@ -95,6 +95,9 @@
}
}];
}
-(void)viewDidDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
[Manager stopScan];
......
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