Commit ae003ed5 authored by lujunye's avatar lujunye

供应商分销商品管理

parent 83f06ec4
No related merge requests found
......@@ -271,6 +271,8 @@
E0AA3A89248F3E1400CBFC27 /* StatisticsInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */; };
E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */; };
E0AA3A92248F626400CBFC27 /* XinCaiGouViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */; };
E0AD92E92550E50500D82C17 /* GYS_FX_Product_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AD92E72550E50500D82C17 /* GYS_FX_Product_VC.swift */; };
E0AD92EA2550E50500D82C17 /* GYS_FX_Product_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */; };
E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */; };
E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */; };
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
......@@ -910,6 +912,8 @@
E0AA3A88248F3E1400CBFC27 /* StatisticsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsInterface.swift; sourceTree = "<group>"; };
E0AA3A8F248F626400CBFC27 /* XinCaiGouViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinCaiGouViewController.swift; sourceTree = "<group>"; };
E0AA3A90248F626400CBFC27 /* XinCaiGouViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinCaiGouViewController.xib; sourceTree = "<group>"; };
E0AD92E72550E50500D82C17 /* GYS_FX_Product_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_FX_Product_VC.swift; sourceTree = "<group>"; };
E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_Product_VC.xib; sourceTree = "<group>"; };
E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HuoLaLaDiZhiCell.swift; sourceTree = "<group>"; };
E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HuoLaLaDiZhiCell.xib; sourceTree = "<group>"; };
E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
......@@ -1965,6 +1969,7 @@
E09B03AD2445B0BA00211A51 /* ViewController */ = {
isa = PBXGroup;
children = (
E0AD92E62550E4DD00D82C17 /* 供应商分销商品管理 */,
F9C2F6EF254FDEAC00516E00 /* 分销商分账设置 */,
F9A4AB6A24C9220C00094BD1 /* 货拉拉 */,
F90F881B24C822750050EF02 /* 城市列表 */,
......@@ -2236,6 +2241,15 @@
path = StatisticsModel;
sourceTree = "<group>";
};
E0AD92E62550E4DD00D82C17 /* 供应商分销商品管理 */ = {
isa = PBXGroup;
children = (
E0AD92E72550E50500D82C17 /* GYS_FX_Product_VC.swift */,
E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */,
);
path = "供应商分销商品管理";
sourceTree = "<group>";
};
E0B5308224728D5600FFCC15 /* WarehouseManageModel */ = {
isa = PBXGroup;
children = (
......@@ -3352,6 +3366,7 @@
E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */,
E07B1E63245921A60055BA3C /* KeHuXQCell.xib in Resources */,
E00D85EB244561FE00F5F816 /* LaunchScreen.storyboard in Resources */,
E0AD92EA2550E50500D82C17 /* GYS_FX_Product_VC.xib in Resources */,
E02FD9FB24557E8600E10E27 /* XinZengDiZhiViewController.xib in Resources */,
E0B94624245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.xib in Resources */,
F9023F722449ACA800DD5A63 /* TitleAndSwitchCell.xib in Resources */,
......@@ -3523,6 +3538,7 @@
F956D5B3246A2D9C003FF510 /* NSTextAttachment+LMNStore.m in Sources */,
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */,
E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
E0AD92E92550E50500D82C17 /* GYS_FX_Product_VC.swift in Sources */,
F94A314924624FA400FEC38E /* ShopAdministratorInfoModel.swift in Sources */,
F9531F3E2465108800724BEE /* JXPhotoBrowserCell.swift in Sources */,
F956D59C246A2D9C003FF510 /* UIFont+LMNote.m in Sources */,
......
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "down_blue.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "down_blue@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "down_blue@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "icon_gou.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_gou@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_gou@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "icon_pilingzhongxin.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_pilingzhongxin@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_pilingzhongxin@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "up_blue.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "up_blue@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "up_blue@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
......@@ -10,13 +10,14 @@ import UIKit
class GYS_FX_ProductCellTableViewCell: UITableViewCell {
@IBOutlet weak var old_price_Lbl: UILabel!
@IBOutlet weak var new_price_Lbl: UILabel!
@IBOutlet weak var store_Lbl: NSLayoutConstraint!
@IBOutlet weak var sell_total_Lbl: UILabel!
@IBOutlet weak var title_Lbl: UILabel!
@IBOutlet weak var FX_Percent_Lbl: UILabel!
@IBOutlet weak var item_Icon_Img: UIImageView!
@IBOutlet weak var old_price_Lbl: UILabel!//原价
@IBOutlet weak var new_price_Lbl: UILabel!//分销价
@IBOutlet weak var store_lbl: UILabel!//库存
@IBOutlet weak var sell_total_Lbl: UILabel!//销量
@IBOutlet weak var title_Lbl: UILabel!//标题
@IBOutlet weak var FX_Percent_Lbl: UILabel!//分销比例
@IBOutlet weak var item_Icon_Img: UIImageView!//图标
@IBOutlet weak var submit_Btn_W: NSLayoutConstraint!
@IBOutlet weak var submitBtn: UIButton!
@IBOutlet weak var leftValue: NSLayoutConstraint!
......
......@@ -165,7 +165,7 @@
<outlet property="new_price_Lbl" destination="N0T-3l-rU8" id="Phq-aR-dw2"/>
<outlet property="old_price_Lbl" destination="Bjz-wA-QCI" id="QpF-xT-Cmt"/>
<outlet property="sell_total_Lbl" destination="kGs-Qz-GbO" id="aV5-7D-azv"/>
<outlet property="store_Lbl" destination="Bmr-gT-HR1" id="uG3-YW-WfA"/>
<outlet property="store_lbl" destination="k6M-ar-xGi" id="t58-eL-8IV"/>
<outlet property="submitBtn" destination="Cae-xu-msI" id="2xy-ux-krI"/>
<outlet property="submit_Btn_W" destination="TbZ-Ta-i8s" id="FMB-6V-kPg"/>
<outlet property="title_Lbl" destination="io4-Mx-VZ7" id="Usl-Mp-pm1"/>
......
......@@ -12,7 +12,7 @@ class GYS_GuanLi_Cell: UITableViewCell {
var isFenXiaoShang : Bool = false //分销商管理 == true,改变合作按钮颜色。
@IBOutlet weak var icon_Img: UIImageView!//公司LOGO
@IBOutlet weak var status_Lbl: UILabel!//状态
@IBOutlet weak var status_Lbl: UILabel!//状态
@IBOutlet weak var time_Lbl: UILabel!//时间
@IBOutlet weak var adr_Lbl: UILabel!//地址
@IBOutlet weak var title_Lbl: UILabel!//公司名
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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"/>
......@@ -38,7 +38,7 @@
<constraint firstAttribute="height" constant="9" id="OJd-GH-oPz"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VXU-ef-rsF">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VXU-ef-rsF">
<rect key="frame" x="224" y="0.0" width="96" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="Bcj-fx-b9m"/>
......
......@@ -12,6 +12,7 @@ import UIKit
}
class TitleAndSelectCell: UITableViewCell {
var delegate:TitleAndSelectCellDelegate?
var is_center_select = false
@IBOutlet weak var selectBtn: UIButton!
@IBOutlet weak var line: UIView!
@IBAction func selectClick(_ sender: UIButton) {
......@@ -25,6 +26,14 @@ class TitleAndSelectCell: UITableViewCell {
// Initialization code
}
override func layoutIfNeeded() {
super.layoutIfNeeded()
if is_center_select {
selectBtn.setImage(UIImage(named: ""), for: .normal)
selectBtn.setImage(UIImage(named: "icon_gou"), for: .selected)
}
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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"/>
......
//
// GYS_FX_Product_VC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/11/3.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource{
@IBOutlet weak var center_select_btn: UIButton!
@IBOutlet weak var count_lbl: UILabel!//已铺货/可铺货 数量
@IBOutlet weak var bottom_title_lbl: UILabel!
@IBOutlet weak var rightBtn: UIButton!
@IBOutlet weak var leftBtn: UIButton!
//MARK: - 顶栏按钮点击事件
@IBAction func topBtnClick(_ sender: UIButton) {
if sender.tag == 0 {
rightBtn.isSelected = false
leftBtn.isSelected = true
bottom_title_lbl.text = "已铺货"
}else{
rightBtn.isSelected = true
leftBtn.isSelected = false
bottom_title_lbl.text = "可铺货"
}
//刷新主界面
home_list_tbv.reloadData()
let leftValue = CGFloat(sender.tag) * fullScreenWidth * 0.5
top_Bottom_Line.snp.updateConstraints { (make) in
make.left.equalTo(leftValue)
make.bottom.equalTo(0)
make.width.equalTo(fullScreenWidth * 0.5)
make.height.equalTo(3)
}
}
@IBOutlet weak var top_Bottom_Line: UIView!
@IBOutlet weak var center_Name_Lbl: UILabel!
@IBOutlet weak var arrow_Img: UIImageView!
@IBOutlet weak var cover_Btn: UIButton!
@IBAction func coverCloseAction(_ sender: UIButton) {
sender.isHidden = true
select_list_tbv.isHidden = cover_Btn.isHidden
}
//MARK: - 批零中心选择事件
@IBAction func centerSelectAction(_ sender: UIButton) {
if arrow_Img.image == UIImage(named: "up_blue"){
arrow_Img.image = UIImage(named: "down_blue")
}else{
arrow_Img.image = UIImage(named: "up_blue")
}
cover_Btn.isHidden = !cover_Btn.isHidden
select_list_tbv.isHidden = cover_Btn.isHidden
}
@IBOutlet weak var select_list_tbv: UITableView!//选择中心列表
@IBOutlet weak var home_list_tbv: UITableView!//主视图列表
@IBOutlet weak var top_view: UIView!
var centersArr = ["1","2","3","4","5","6","7","8","9"]
override func viewDidLoad() {
super.viewDidLoad()
SetTopFrame(view: top_view, height: 44)
navbar.title = "供应商分销商品管理"
self.view.addSubview(navbar)
home_list_tbv.register(UINib(nibName: "GYS_FX_ProductCellTableViewCell", bundle: nil), forCellReuseIdentifier: "GYS_FX_ProductCellTableViewCell")
home_list_tbv.delegate = self
home_list_tbv.separatorStyle = .none
home_list_tbv.dataSource = self
select_list_tbv.register(UINib(nibName: "TitleAndSelectCell", bundle: nil), forCellReuseIdentifier: "TitleAndSelectCell")
select_list_tbv.delegate = self
select_list_tbv.separatorStyle = .none
select_list_tbv.showsVerticalScrollIndicator = false
select_list_tbv.dataSource = self
//MARK: - 限制中心选择高度
var select_list_tbv_height = centersArr.count * 49
if centersArr.count > 350 {
select_list_tbv_height = 350
}
select_list_tbv.snp.updateConstraints{ (make) in
make.top.equalTo(center_select_btn.snp_bottom)
make.left.right.equalTo(0)
make.height.equalTo(select_list_tbv_height)
}
}
override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
select_list_tbv.layer.cornerRadius = 5
select_list_tbv.layer.maskedCorners = [CACornerMask.layerMinXMaxYCorner,CACornerMask.layerMaxXMaxYCorner]
}
//MARK: - tableview_delegate
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if tableView == home_list_tbv {
return 3
}else{
return centersArr.count
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if tableView == home_list_tbv {
let cell = tableView.dequeueReusableCell(withIdentifier: "GYS_FX_ProductCellTableViewCell") as! GYS_FX_ProductCellTableViewCell
if bottom_title_lbl.text == "已铺货"{
cell.submitBtn.setTitle("取消铺货", for: .normal)
}else{
cell.submitBtn.setTitle("铺货", for: .normal)
}
return cell
}else{
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSelectCell") as! TitleAndSelectCell
cell.is_center_select = true
cell.titleLbl.text = centersArr[indexPath.row]
return cell
}
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if tableView == home_list_tbv {
return 125
}else{
return 49
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if tableView == home_list_tbv {
//主界面列表
}else{
//中心选择列表
tableView.visibleCells.forEach { (item) in
let cell = item as! TitleAndSelectCell
cell.selectBtn.isSelected = false
}
let cell = tableView.cellForRow(at: indexPath) as! TitleAndSelectCell
cell.selectBtn.isSelected = true
select_list_tbv.isHidden = true
cover_Btn.isHidden = true
arrow_Img.image = UIImage(named: "up_blue")
center_Name_Lbl.text = centersArr[indexPath.row]
// home_list_tbv.reloadData()
}
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
......@@ -3,7 +3,7 @@
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.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