Skip to content

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

修改逻辑

parent b99ac8a6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 488 additions and 123 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ e4cda593
......@@ -200,7 +200,9 @@
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */; };
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */; };
E0B5308124727ED600FFCC15 /* WareHourseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308024727ED600FFCC15 /* WareHourseModel.swift */; };
E0B5308424728D7E00FFCC15 /* ShopWarehouseListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */; };
E0B5308624728FB600FFCC15 /* WarehouseInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5308524728FB600FFCC15 /* WarehouseInterface.swift */; };
E0B530882472917F00FFCC15 /* ShopWarehouseDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */; };
E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B6036C244D376900A56B38 /* KuWeiCell.swift */; };
E0B6036F244D376900A56B38 /* KuWeiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B6036D244D376900A56B38 /* KuWeiCell.xib */; };
E0B9461E24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */; };
......@@ -677,7 +679,9 @@
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CheckWareHourseViewController.xib; sourceTree = "<group>"; };
E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DKXDAdrCell.xib; sourceTree = "<group>"; };
E0B5308024727ED600FFCC15 /* WareHourseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WareHourseModel.swift; sourceTree = "<group>"; };
E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopWarehouseListModel.swift; sourceTree = "<group>"; };
E0B5308524728FB600FFCC15 /* WarehouseInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarehouseInterface.swift; sourceTree = "<group>"; };
E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopWarehouseDetailModel.swift; sourceTree = "<group>"; };
E0B6036C244D376900A56B38 /* KuWeiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KuWeiCell.swift; sourceTree = "<group>"; };
E0B6036D244D376900A56B38 /* KuWeiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KuWeiCell.xib; sourceTree = "<group>"; };
E0B9461C24566B3100FBEC9A /* TitleAndTFAndBtnCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndTFAndBtnCell.swift; sourceTree = "<group>"; };
......@@ -1465,10 +1469,12 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0B5308224728D5600FFCC15 /* WarehouseManageModel */,
F956D5BE246A3649003FF510 /* OrderManageModel */,
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0B5308524728FB600FFCC15 /* WarehouseInterface.swift */,
F956D5BA246A359C003FF510 /* GoodsInterface.swift */,
F956D5B8246A33E2003FF510 /* OrderInterface.swift */,
E09B03AA2445B0A300211A51 /* LoginModel.swift */,
......@@ -1661,11 +1667,19 @@
children = (
E0A75488244A8F0F00A84B67 /* CheckWareHourseViewController.swift */,
E0A75489244A8F0F00A84B67 /* CheckWareHourseViewController.xib */,
E0B5308024727ED600FFCC15 /* WareHourseModel.swift */,
);
path = "新增、编辑（查看）仓库";
sourceTree = "<group>";
};
E0B5308224728D5600FFCC15 /* WarehouseManageModel */ = {
isa = PBXGroup;
children = (
E0B5308324728D7E00FFCC15 /* ShopWarehouseListModel.swift */,
E0B530872472917F00FFCC15 /* ShopWarehouseDetailModel.swift */,
);
path = WarehouseManageModel;
sourceTree = "<group>";
};
E0B94620245671AD00FBEC9A /* 代客下单（购物） */ = {
isa = PBXGroup;
children = (
......@@ -2742,6 +2756,7 @@
F961D27724503F51007FBE70 /* OrderSelectMoreView.swift in Sources */,
F933F6C62452C68B00189561 /* PKHUDAssets.swift in Sources */,
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */,
E0B5308624728FB600FFCC15 /* WarehouseInterface.swift in Sources */,
E02FD9EC2455627300E10E27 /* ChuKuViewController.swift in Sources */,
E07B1E6F245929060055BA3C /* GYSGLViewController.swift in Sources */,
E0D197BB2448431C002B080C /* BabyCallback.m in Sources */,
......@@ -2760,6 +2775,7 @@
E0C4F4A7244EC82A00CC7E2F /* TitleAndBtnCell.swift in Sources */,
E0A2E81A24552E3C00D6DB34 /* XinZengPinPaiViewController.swift in Sources */,
F956D5A8246A2D9C003FF510 /* LMNSpecialLine.m in Sources */,
E0B530882472917F00FFCC15 /* ShopWarehouseDetailModel.swift in Sources */,
E0273DDD24551D4500B3FCAE /* OnlyLabelCell.swift in Sources */,
F950FDD724518B9500C40530 /* FSCalendarCollectionView.m in Sources */,
E02C88262456B24F00925766 /* WuLiuGenZongViewController.swift in Sources */,
......@@ -2828,6 +2844,7 @@
E0337EF12464F69000952EF4 /* YingFuZKListViewController.swift in Sources */,
E099B588246BF8FA009F587F /* OrderDViewController.swift in Sources */,
F933F6CE2452C68B00189561 /* PKHUDSquareBaseView.swift in Sources */,
E0B5308424728D7E00FFCC15 /* ShopWarehouseListModel.swift in Sources */,
E06524F524580BB600CA22E2 /* BaoZhiQiCell.swift in Sources */,
E0BE8AA4245AA31400E80134 /* YingFuZhangKuanXQViewController.swift in Sources */,
F94A315324626D7800FEC38E /* WorkCViewController.swift in Sources */,
......@@ -2852,7 +2869,6 @@
F956D5B5246A2D9C003FF510 /* LMNStore.m in Sources */,
F956D5A7246A2D9C003FF510 /* LMNLineChain+Numbering.m in Sources */,
E0A7548A244A8F0F00A84B67 /* CheckWareHourseViewController.swift in Sources */,
E0B5308124727ED600FFCC15 /* WareHourseModel.swift in Sources */,
F9023F62244999F500DD5A63 /* WarehoseMangementCell.swift in Sources */,
F956D5B1246A2D9C003FF510 /* LMNFolder.m in Sources */,
E0A409D424640B8300CFF109 /* DZGLViewController.swift in Sources */,
......
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ e4cda593
......@@ -24,5 +24,21 @@
continueAfterRunningActions = "No">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B223F50A-4F5B-423B-9F6D-A967E5BFB36E"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "GeliBusinessPlatform/ViewController/&#x65b0;&#x589e;&#x89c4;&#x683c;/CreatNewSpecsViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "575"
endingLineNumber = "575"
landmarkName = "YuShouCellSwitchStatus(sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ e4cda593
......@@ -8,8 +8,7 @@
<string>Common/sendSmsCaptcha</string>
<key>验证短信验证码</key>
<string>Common/verifyMmsCaptcha</string>
<key>简单通用操作接口
</key>
<key>简单通用操作接口</key>
<string>Common/editField</string>
<key>图片(文件)上传</key>
<string>Common/saveFile</string>
......@@ -73,5 +72,15 @@
<string>Customer/cusListAll</string>
<key>获取商品信息</key>
<string>Adminorder/getGoodsInfo</string>
<key>商家仓库列表</key>
<string>Warehouse/shopWarehouseList</string>
<key>商家仓库添加</key>
<string>Warehouse/shopWarehouseAdd</string>
<key>商家仓库修改</key>
<string>Warehouse/shopWarehouseEdit</string>
<key>商家仓库删除</key>
<string>Warehouse/shopWarehouseDel</string>
<key>商家仓库详情</key>
<string>Warehouse/shopWarehouseDetail</string>
</dict>
</plist>
GeliBusinessPlatform/Model/UpDataModel.swift
View file @ e4cda593
......@@ -8,7 +8,8 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态)
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除
class UpDataModel: Mappable {
var code:Int?
var message : String?
......
GeliBusinessPlatform/Model/WarehouseInterface.swift 0 → 100644
View file @ e4cda593
//
// WarehouseInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK: --商家仓库列表
/**
params-key:
user_token(验证token)
keyword（关键字）
page(第几页)
*/
func warehouseList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) { NetworkRequest.sharedInstance.postRequest("商家仓库列表", params, { (rep:DataResponse<ShopWarehouseListModel>) in
}, success: { (data) in
success(data)
}) { (error) in
}
}
//MARK: -- 商家详情
/**
params-key:
user_token(验证token)
w_id(仓库id)
*/
func WarehouseDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商家仓库详情", params, { (rep:DataResponse<ShopWarehouseDetailDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MRAK: - 商家仓库添加
//params-key
/*
user_token
w_name 仓库名称
w_type 仓库类型，1常温、2冷藏、3冷冻
position_str 库位名，多库位用逗号拼接
w_address 仓库地址
volume 仓库容积
area 仓库面积
contact 联系人
contact_number 联系电话
mail 邮箱
is_default 是否默认，1是0非
*/
func ShopWarehouseAdd(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商家仓库添加", params, { (rep:DataResponse<UpDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MRAK: - 商家仓库修改
//params-key
/*
user_token
w_name 仓库名称
w_type 仓库类型，1常温、2冷藏、3冷冻
position_str 库位名，多库位用逗号拼接
w_address 仓库地址
volume 仓库容积
area 仓库面积
contact 联系人
contact_number 联系电话
mail 邮箱
is_default 是否默认，1是0非
warehouse_position 仓库库位信息，必须要有一个库位json字符串，字段见下表
*/
func ShopWarehouseEdit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商家仓库删除", params, { (rep:DataResponse<UpDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MRAK: - 商家仓库删除
//params-key
/*
user_token
w_id 仓库id，仓库中有库存则不可删除
*/
func ShopWarehouseDel(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("商家仓库修改", params, { (rep:DataResponse<UpDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseDetailModel.swift 0 → 100644
View file @ e4cda593
//
// ShopWarehouseDetail.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
class ShopWarehouseDetailModel: Mappable {
var code:Int?
var message : String?
var data : ShopWarehouseDetailDataModel?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class ShopWarehouseDetailDataModel: Mappable {
var warehouse_res : ShopWarehouseDetailDataBasicModel? //仓库基本信息
var position_res : Array<ShopWarehouseDetailDataPositionModel>? //库存总数商店id
required init?( map: Map) {
}
func mapping(map: Map) {
warehouse_res <- map["warehouse_res"]
position_res <- map["position_res"]
}
}
class ShopWarehouseDetailDataBasicModel: Mappable {
var w_id : Int? //仓库id
var shop_id :Int?
var w_name:String?//仓库名
var w_type:Int? //仓库类型，1常温、2冷藏、3冷冻
var w_address:String?//地址
var volume:Int?//容积
var area:Int?//面积
var contact:String?//联系人
var contact_number:String?//联系电话
var mail:String?//电子邮箱
var position_count:Int?
var is_default:Int?//是否默认
var inventory_count:Int?//库存总数
required init?( map: Map) {
}
func mapping(map: Map) {
w_id <- map["w_id"]
shop_id <- map["shop_id"]
w_name <- map["w_name"]
w_type <- map["w_type"]
w_address <- map["w_address"]
volume <- map["volume"]
area <- map["area"]
contact <- map["contact"]
contact_number <- map["contact_number"]
mail <- map["mail"]
position_count <- map["position_count"]
is_default <- map["is_default"]
inventory_count <- map["inventory_count"]
}
}
class ShopWarehouseDetailDataPositionModel: Mappable {
var p_id :Int?//库位id
var w_id :Int?//仓库id
var p_name:String?//库位名
var is_default:Int?//是否默认
var inventory_count:Int?//库存数
var status = 1//状态
required init?( map: Map) {
}
func mapping(map: Map) {
p_id <- map["p_id"]
w_id <- map["w_id"]
p_name <- map["p_name"]
is_default <- map["is_default"]
inventory_count <- map["inventory_count"]
status <- map["status"]
}
}
GeliBusinessPlatform/Model/WarehouseManageModel/ShopWarehouseListModel.swift 0 → 100644
View file @ e4cda593
//
// shopWarehouseListModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//仓库列表
class ShopWarehouseListModel: Mappable {
var code:Int?
var message : String?
var data : Array<ShopWarehouseListDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class ShopWarehouseListDataModel: Mappable {
var w_id : Int? //库存总数仓库id
var shop_id : Int? //库存总数商店id
var w_name : String? //库存总数仓库名
var w_type : Int? //库存总数仓库类型，1常温、2冷藏、3冷冻
var w_address : String? //库存总数仓库地址
var volume : Int? //容积，库存总数单位立方米
var area : Int? //面积，库存总数单位平方米
var contact : String? //库存总数联系人
var contact_number : String? //库存总数联系电话
var mail : String? //库存总数电子邮箱
var position_count : Int? //库存总数库位数量(统计用)
var is_default : Bool? //库存总数是否为默认
var inventory_count : Int? //库存总数
required init?( map: Map) {
}
func mapping(map: Map) {
w_id <- map["w_id"]
shop_id <- map["shop_id"]
w_name <- map["w_name"]
w_type <- map["w_type"]
w_address <- map["w_address"]
volume <- map["volume"]
area <- map["area"]
contact <- map["contact"]
contact_number <- map["contact_number"]
mail <- map["mail"]
position_count <- map["position_count"]
is_default <- map["is_default"]
inventory_count <- map["inventory_count"]
}
}
GeliBusinessPlatform/SceneDelegate.swift
View file @ e4cda593
......@@ -43,14 +43,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
//MARK:--loginVC
func addLoginVc (isAgain:Bool){
let vc = LoginViewController()
vc.delegate = self
let contentView = vc
//
// let vc = LoginViewController()
// vc.delegate = self
// let contentView = vc
// let vc = ProductDetailViewController()
// let contentView = vc
let vc = ProductDetailViewController()
//
let contentView = vc
if let windowScene = sceneC as? UIWindowScene {
......@@ -98,7 +99,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 1
let contentView = tabBarController
if let windowScene = sceneC as? UIWindowScene {
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
View file @ e4cda593
......@@ -68,7 +68,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库存位" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bj5-q9-e71">
<rect key="frame" x="15" y="40" width="250" height="14"/>
<rect key="frame" x="15" y="40" width="34" height="14"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
......@@ -89,7 +89,7 @@
<constraint firstItem="S67-Hn-Sjn" firstAttribute="centerY" secondItem="zy2-GT-oMd" secondAttribute="centerY" id="Ip0-ct-MLf"/>
<constraint firstAttribute="trailing" secondItem="KhW-Le-FMh" secondAttribute="trailing" id="KHe-n3-k0i"/>
<constraint firstAttribute="trailing" secondItem="TPl-73-La4" secondAttribute="trailing" constant="15" id="NbF-Ti-tGJ"/>
<constraint firstAttribute="trailing" secondItem="bj5-q9-e71" secondAttribute="trailing" constant="55" id="ONy-wx-sWh"/>
<constraint firstItem="bj5-q9-e71" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Rbn-Eo-Tkr"/>
<constraint firstItem="zy2-GT-oMd" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="TbK-iY-ppo">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
......@@ -100,7 +100,6 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="voP-B3-BGZ" firstAttribute="top" secondItem="bj5-q9-e71" secondAttribute="bottom" constant="10" id="WS7-0G-3Zw"/>
<constraint firstItem="zy2-GT-oMd" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="abd-R7-H83">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
......@@ -111,11 +110,6 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="bj5-q9-e71" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ft0-TZ-hKh">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstAttribute="trailing" secondItem="voP-B3-BGZ" secondAttribute="trailing" constant="30" id="gbP-D6-WcB"/>
<constraint firstItem="TPl-73-La4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="lmY-7S-KxB"/>
<constraint firstItem="KhW-Le-FMh" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="mM8-35-q0k">
......@@ -123,6 +117,7 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="bj5-q9-e71" firstAttribute="centerY" secondItem="TPl-73-La4" secondAttribute="centerY" id="r32-31-ctS"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
......
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift
View file @ e4cda593
......@@ -16,13 +16,13 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
tableV.reloadData()
}
func CheckWareHourseViewControllerEditAction(data: WareHourseModel, Idx: Int) {
func CheckWareHourseViewControllerEditAction(data: ShopWarehouseListDataModel, Idx: Int) {
warehourseArr.insert(data, at: Idx)
warehourseArr.remove(at: Idx+1)
tableV.reloadData()
}
func CheckWareHourseViewControllerSaveAction(data: WareHourseModel) {
func CheckWareHourseViewControllerSaveAction(data: ShopWarehouseListDataModel) {
warehourseArr.append(data)
tableV.reloadData()
}
......@@ -30,8 +30,9 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
weak var searchV: SearchBarView? = nil
@IBOutlet weak var contentView: UIView!
@IBOutlet weak var searchView: UIView!
var page : Int = 0
var isUpData = false
var keyWord = ""
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = UIColor.white
......@@ -49,8 +50,57 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
setTabv()
headerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadData))
self.tableV!.mj_header = headerMJ
//上拉加载相关设置
footerMJ.setRefreshingTarget(self, refreshingAction: #selector(loadMoreData))
self.tableV!.mj_footer = footerMJ
self.tableV?.mj_header?.beginRefreshing()
}
@objc func loadData(){
print("加载数据")
isUpData = true
page = 1
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let dict = ["user_token":UserToken as Any,"keyword":keyWord,"page":page]
warehouseList(dict, success: { (data) in
self.warehourseArr.removeAll()
let dataModel = data as! ShopWarehouseListModel
dataModel.data?.forEach({ (model) in
self.warehourseArr.append(model)
})
self.tableV.reloadData()
self.tableV?.mj_header?.endRefreshing()
self.page = 2
self.tableV.performBatchUpdates({
UIView.animate(views: self.tableV!.visibleCells,
animations: self.animations, completion: {
})
}, completion: nil)
}) { (error) in
self.tableV?.mj_header?.endRefreshing()
}
}
@objc func loadMoreData(){
print("加载更多数据")
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let dict = ["user_token":UserToken as Any,"keyword":keyWord,"page":page]
warehouseList(dict, success: { (data) in
self.page += 1
let dataModel = data as! ShopWarehouseListModel
dataModel.data?.forEach({ (model) in
self.warehourseArr.append(model)
})
self.tableV.reloadData()
self.tableV?.mj_header?.endRefreshing()
}) { (error) in
self.tableV?.mj_header?.endRefreshing()
}
}
//MARK:--搜索按钮代理
func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
print("点击搜索进行--")
......@@ -111,13 +161,13 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
self.navigationController?.pushViewController(vc, animated: false)
}
var warehourseArr:Array<WareHourseModel> = []//仓库数组
var warehourseArr:Array<ShopWarehouseListDataModel> = []//仓库数组
var tableV :UITableView!
var tableSearchV :UITableView! = nil
private let animations = [AnimationType.from(direction: .bottom, offset: 150*glscale)]
func setTabv() {
tableV = UITableView()
contentView.addSubview(tableV);
......@@ -136,15 +186,15 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
}, completion: nil)
}
let typeArr = ["冷冻","冷藏","常温"]
let typeArr = ["常温","冷藏","冷冻"]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "WarehoseMangementCell") as! WarehoseMangementCell
cell.delegate = self
let model = warehourseArr[indexPath.row]
cell.nameLbl.text = model.cangKuName
cell.statusLbl.text = typeArr[model.warehourseType!]
cell.adrLbl.text = model.cangKuAdr
cell.kuCunLbl.text = model.kuWeiName
let model = warehourseArr[indexPath.row]
cell.nameLbl.text = model.w_name
cell.statusLbl.text = typeArr[model.w_type!-1]
cell.adrLbl.text = model.w_address!
cell.kuCunLbl.text = "\(model.inventory_count!)"
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
......@@ -152,7 +202,8 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
let vc = CheckWareHourseViewController()
vc.delegate = self
vc.titleStr = "编辑仓库"
vc.dataModel = warehourseArr[indexPath.row]
let model = warehourseArr[indexPath.row]
vc.w_id = model.w_id
vc.editIdx = indexPath.row
self.navigationController?.pushViewController(vc, animated: false)
......@@ -185,9 +236,9 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
return [deleteAction,]
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if tableView == tableSearchV {
return 3
}
return warehourseArr.count
}
if tableView == tableSearchV {
return 3
}
return warehourseArr.count
}
}
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ e4cda593
......@@ -657,7 +657,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
vc.barTitle = "编辑规格"
vc.datasArr = guiGeArr
vc.danWeiArr = generalInfoModel?.data?.unit!
vc.isJieTiJiaSetting = true
let dataDict:GuiGeModel!
if selectIdx?.item != nil {
dataDict = guiGeArr[selectIdx!.item]
......@@ -670,16 +670,18 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
vc.weight = dataDict.weight
vc.wenDu = dataDict.wenDu
vc.danWei = dataDict.danWei
print("test == ",isYuShouShangPin!)
// vc.isNonYuShou = isYuShouShangPin!
vc.isJieTiOpen = dataDict.isJieTiOpen
vc.isYuShouSetting = isYuShouShangPin!
vc.yuShouPrice = dataDict.yuShouPrice
vc.specalArr = dataDict.specalArr
vc.jieTiArr = dataDict.jieTiArr
vc.isOpenYSSetting = dataDict.isOpenYSSetting
vc.selectIdx = selectIdx
vc.itemDanWeiSelect = dataDict.itemDanWeiSelect
vc.tempSelect = dataDict.tempSelect
vc.delegate = self
vc.DJBiLi = dataDict.DJBiLi
vc.ysKuCun = dataDict.ysKuCun
self.navigationController?.pushViewController(vc, animated: true)
}
// //MARK: - 删除规格
......
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/CheckWareHourseViewController.swift
View file @ e4cda593
......@@ -11,30 +11,18 @@ import LGButton
import IQKeyboardManagerSwift
protocol CheckWareHourseViewControllerDelegate {
func CheckWareHourseViewControllerSaveAction(data:WareHourseModel)
func CheckWareHourseViewControllerEditAction(data:WareHourseModel,Idx:Int)
func CheckWareHourseViewControllerSaveAction(data:ShopWarehouseListDataModel)
func CheckWareHourseViewControllerEditAction(data:ShopWarehouseListDataModel,Idx:Int)
func CheckWareHourseViewControllerDelAction(Idx:Int)
}
class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,GLAlertSelectViewDelegate,UITextFieldDelegate{
class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,WareHouseSpCellDelegate,GLAlertSelectViewDelegate,UITextFieldDelegate,GeliAlertViewDelegate{
var delegate:CheckWareHourseViewControllerDelegate?
var dataModel = WareHourseModel(){
didSet{
shiFouMoRen = dataModel.shiFouMoRen
lianXiRen = dataModel.lianXiRen
mianJi = dataModel.mianJi
rongJi = dataModel.rongJi
phone = dataModel.phone
cangKuAdr = dataModel.cangKuAdr
cangKuName = dataModel.cangKuName
kuWeiName = dataModel.kuWeiName
warehourseType = dataModel.warehourseType
kuWeiSelect = dataModel.kuWeiSelect
}
}
var dataModel:ShopWarehouseListDataModel?
var w_id:Int?//仓库id
var editIdx:Int?
@IBOutlet weak var btnTitleLbl: UILabel!
@IBOutlet weak var listView: UITableView!
......@@ -44,7 +32,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
var kuWeiArr:Array<Any>? = []
var listArray = ["冷冻","冷藏","常温"]
var listArray = ["常温","冷藏","冷冻"]
var glSelectView:GLAlertSelectView?
var btnArray:Array<UIButton> = []
var statusStr = ""
......@@ -79,8 +67,45 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
make.left.right.equalTo(0)
make.bottom.equalTo(btnTitleLbl.snp_top)
}
loadData()
// Do any additional setup after loading the view.
}
func loadData(){
//加载数据
if w_id != nil {
let UserToken = UserDefaults.standard.value(forKey: "user_token")
WarehouseDetail(["user_token":UserToken as Any,"w_id":w_id as Any], success: { (data) in
let dataModel = data as! ShopWarehouseDetailDataModel
print(dataModel.warehouse_res?.area)
// self.shiFouMoRen = false
// print(dataModel.warehouse_res!.is_default)
//// if dataModel.warehouse_res!.is_default! == 1 {
//// self.shiFouMoRen = true
//// }
//
//
//
// self.lianXiRen = dataModel.warehouse_res!.contact!
// self.mianJi = "\(dataModel.warehouse_res!.area!)"
// self.rongJi = "\(dataModel.warehouse_res!.volume!)"
// self.phone = dataModel.warehouse_res!.contact_number!
// let strArr = NSMutableArray()
// for item in dataModel.position_res! {
// strArr.add(item.p_name!)
// }
// self.kuWeiName = strArr.componentsJoined(by: ",")
// self.cangKuAdr = dataModel.warehouse_res!.w_address!
// self.cangKuName = dataModel.warehouse_res!.w_name!
// self.warehourseType = dataModel.warehouse_res!.w_type!
// self.listView.reloadData()
}) { (error) in
}
}
}
//MARK: - cell delegate
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
......@@ -131,6 +156,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
//cell ui 布局
self.setCellLayout(cell: cell, indexPath: indexPath)
}else{//默认仓库
cell.titleLbl.text = "默认仓库"
if btnTitleLbl.text == "编辑"{
cell.whSwitch.isUserInteractionEnabled = false
}else{
......@@ -184,31 +210,31 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
}
}
@IBAction func submitAction(_ sender: LGButton) {
dataModel.shiFouMoRen = shiFouMoRen
pdContent(sender: cangKuName, str: "请填写仓库名称")
dataModel.cangKuName = cangKuName
pdSelect(select: warehourseType, str: "请选择仓库类型")
dataModel.warehourseType = warehourseType
pdContent(sender: kuWeiName, str: "请选择库位")
dataModel.kuWeiName = kuWeiName
pdContent(sender: cangKuAdr, str: "请填写仓库地址")
dataModel.cangKuAdr = cangKuAdr
pdContent(sender: rongJi, str: "请填写仓库容积")
dataModel.rongJi = rongJi
pdContent(sender: mianJi, str: "请填写仓库面积")
dataModel.mianJi = mianJi
pdContent(sender: lianXiRen, str: "请填写联系人")
dataModel.lianXiRen = lianXiRen
pdContent(sender: phone, str: "请填写联系人电话")
dataModel.phone = phone
dataModel.kuWeiSelect = kuWeiSelect
// dataModel.shiFouMoRen = shiFouMoRen
// pdContent(sender: cangKuName, str: "请填写仓库名称")
// dataModel.cangKuName = cangKuName
// pdSelect(select: warehourseType, str: "请选择仓库类型")
// dataModel.warehourseType = warehourseType
// pdContent(sender: kuWeiName, str: "请选择库位")
// dataModel.kuWeiName = kuWeiName
// pdContent(sender: cangKuAdr, str: "请填写仓库地址")
// dataModel.cangKuAdr = cangKuAdr
// pdContent(sender: rongJi, str: "请填写仓库容积")
// dataModel.rongJi = rongJi
// pdContent(sender: mianJi, str: "请填写仓库面积")
// dataModel.mianJi = mianJi
// pdContent(sender: lianXiRen, str: "请填写联系人")
// dataModel.lianXiRen = lianXiRen
// pdContent(sender: phone, str: "请填写联系人电话")
// dataModel.phone = phone
//
// dataModel.kuWeiSelect = kuWeiSelect
if titleStr == "新增仓库" {
delegate?.CheckWareHourseViewControllerSaveAction(data: dataModel)
// delegate?.CheckWareHourseViewControllerSaveAction(data: dataModel)
self.navigationController?.popViewController(animated: true)
}else{
if btnTitleLbl.text == "保存" {
delegate?.CheckWareHourseViewControllerEditAction(data: dataModel, Idx: editIdx!)
// delegate?.CheckWareHourseViewControllerEditAction(data: dataModel, Idx: editIdx!)
self.navigationController?.popViewController(animated: true)
}else{
btnTitleLbl.text = "保存"
......@@ -246,10 +272,18 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
//MARK: - delegate
func rightBtnClick() {
print("删除")
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否确认删除订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
self.view.window?.addSubview(alertView)
}
func sureAction(sender: UIButton) {
delegate?.CheckWareHourseViewControllerDelAction(Idx: editIdx!)
self.navigationController?.popViewController(animated: true)
}
@objc func removeActin(sender:UIButton){
sender.superview?.removeFromSuperview()
......
GeliBusinessPlatform/ViewController/新增、编辑（查看）仓库/WareHourseModel.swift deleted 100644 → 0
View file @ b99ac8a6
//
// WareHourseModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/5/18.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
class WareHourseModel: NSObject {
///仓库类型
var warehourseType : Int?
///仓库名称
var cangKuName : String = ""
///库位名
var kuWeiName : String = ""
///仓库地址
var cangKuAdr : String = ""
///容积
var rongJi : String = ""
///面积
var mianJi : String = ""
///联系人
var lianXiRen : String = ""
///电话
var phone :String = ""
///是否默认
var shiFouMoRen : Bool = false
///库位选择
var kuWeiSelect:Int?
}
GeliBusinessPlatform/ViewController/新增规格/GuiGeModel.swift
View file @ e4cda593
......@@ -19,18 +19,24 @@ class GuiGeModel: NSObject {
var wenDu : String = ""
///单位
var danWei : String = ""
// ///是否预售
// var isNonYuShou : Bool = false
///是否打开预售设置
///是否打开预售设置
var isYuShouSetting : Bool = false
///预售价格
///预售价格
var yuShouPrice : String = ""
///普通阶梯价
///预售库存
var ysKuCun:String = ""
///定金比例
var DJBiLi:String = ""
///普通阶梯价
var jieTiArr : Array<Any> = []
///预售阶梯价
///预售阶梯价
var specalArr : Array<Any> = []
///单位select
var itemDanWeiSelect:Int?
///温度select
var tempSelect:Int?
///是否打开阶梯价
var isJieTiOpen:Bool = false
///是否打开预售设置
var isOpenYSSetting:Bool = false
}
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