Skip to content

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

修改新增规格输入判断

parent 3673f555
Hide whitespace changes
Inline Side-by-side
Showing with 418 additions and 227 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ a65824ce
......@@ -3197,6 +3197,31 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/高德地图",
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Realm/Realm.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers\"",
/usr/include/libxml2,
);
INFOPLIST_FILE = GeliBusinessPlatform/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
......@@ -3207,6 +3232,71 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"c++\"",
"-l\"z\"",
"-framework",
"\"Alamofire\"",
"-framework",
"\"CFNetwork\"",
"-framework",
"\"CoreGraphics\"",
"-framework",
"\"CoreTelephony\"",
"-framework",
"\"CryptoSwift\"",
"-framework",
"\"Dollar\"",
"-framework",
"\"ESTabBarController_swift\"",
"-framework",
"\"Foundation\"",
"-framework",
"\"Hue\"",
"-framework",
"\"IQKeyboardManagerSwift\"",
"-framework",
"\"Kingfisher\"",
"-framework",
"\"LGButton\"",
"-framework",
"\"MJRefresh\"",
"-framework",
"\"ObjectMapper\"",
"-framework",
"\"QuartzCore\"",
"-framework",
"\"Reachability\"",
"-framework",
"\"Realm\"",
"-framework",
"\"RealmSwift\"",
"-framework",
"\"SVProgressHUD\"",
"-framework",
"\"Security\"",
"-framework",
"\"SkeletonView\"",
"-framework",
"\"SnapKit\"",
"-framework",
"\"SwiftDate\"",
"-framework",
"\"SwifterSwift\"",
"-framework",
"\"SwiftyJSON\"",
"-framework",
"\"SystemConfiguration\"",
"-framework",
"\"UIKit\"",
"-framework",
"\"ViewAnimator\"",
"-framework",
"\"WYAutoLayout\"",
"-lxml2",
);
PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform;
PRODUCT_MODULE_NAME = TestClass;
PRODUCT_NAME = "$(TARGET_NAME)";
......@@ -3235,6 +3325,31 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/高德地图",
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Dollar/Dollar.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ESTabBarController-swift/ESTabBarController_swift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Kingfisher/Kingfisher.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/LGButton/LGButton.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ObjectMapper/ObjectMapper.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Realm/Realm.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmSwift/RealmSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SkeletonView/SkeletonView.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftDate/SwiftDate.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwifterSwift/SwifterSwift.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON/SwiftyJSON.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ViewAnimator/ViewAnimator.framework/Headers\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/WYAutoLayout/WYAutoLayout.framework/Headers\"",
/usr/include/libxml2,
);
INFOPLIST_FILE = GeliBusinessPlatform/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
......@@ -3245,6 +3360,71 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"c++\"",
"-l\"z\"",
"-framework",
"\"Alamofire\"",
"-framework",
"\"CFNetwork\"",
"-framework",
"\"CoreGraphics\"",
"-framework",
"\"CoreTelephony\"",
"-framework",
"\"CryptoSwift\"",
"-framework",
"\"Dollar\"",
"-framework",
"\"ESTabBarController_swift\"",
"-framework",
"\"Foundation\"",
"-framework",
"\"Hue\"",
"-framework",
"\"IQKeyboardManagerSwift\"",
"-framework",
"\"Kingfisher\"",
"-framework",
"\"LGButton\"",
"-framework",
"\"MJRefresh\"",
"-framework",
"\"ObjectMapper\"",
"-framework",
"\"QuartzCore\"",
"-framework",
"\"Reachability\"",
"-framework",
"\"Realm\"",
"-framework",
"\"RealmSwift\"",
"-framework",
"\"SVProgressHUD\"",
"-framework",
"\"Security\"",
"-framework",
"\"SkeletonView\"",
"-framework",
"\"SnapKit\"",
"-framework",
"\"SwiftDate\"",
"-framework",
"\"SwifterSwift\"",
"-framework",
"\"SwiftyJSON\"",
"-framework",
"\"SystemConfiguration\"",
"-framework",
"\"UIKit\"",
"-framework",
"\"ViewAnimator\"",
"-framework",
"\"WYAutoLayout\"",
"-lxml2",
);
PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform;
PRODUCT_MODULE_NAME = TestClass;
PRODUCT_NAME = "$(TARGET_NAME)";
......
GeliBusinessPlatform/Define/Define.swift
View file @ a65824ce
......@@ -231,7 +231,19 @@ func dayByDouble (sender : Double ) -> String {
dformatter.dateFormat = "yyyy.MM.dd"
return dformatter.string(from: data)
}
//MARK: -- 格式化数字
func formatShowNumber(value:String) -> String {
if value.isEmpty {
return "0.00"
}
//保留位数
let interceptValue = String(format: "%.2f", (value as NSString).doubleValue)
//添加分隔符
let format = NumberFormatter()
format.numberStyle = .decimal
let formatValue = format.string(from: NSNumber(value: (interceptValue as NSString).doubleValue))
return formatValue!
}
//MARK:--数组转字符串
func dataChangeString(sender:Array<Any>) -> String{
var str = ""
......
GeliBusinessPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift
View file @ a65824ce
......@@ -42,6 +42,10 @@ class GetGoodsInfoDataModel: Mappable {
var price:String?//售价
var tiered_pri:String?//阶梯价
var adsale_tiered_pri:String?//预售阶梯价
var target_Count:Int?//目标数量
var target_Price:String?//目标价格
required init?( map: Map) {
}
......@@ -62,6 +66,8 @@ class GetGoodsInfoDataModel: Mappable {
price <- map["price"]
tiered_pri <- map["tiered_pri"]
adsale_tiered_pri <- map["adsale_tiered_pri"]
target_Count <- map["target_Count"]
target_Price <- map["target_Price"]
}
}
GeliBusinessPlatform/SceneDelegate.swift
View file @ a65824ce
......@@ -95,7 +95,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 1
tabBarController.selectedIndex = 2
......
GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.swift
View file @ a65824ce
......@@ -9,7 +9,7 @@
import UIKit
@objc protocol XuanZeShangPinCellDelegate {
@objc optional func XuanZeShangPinCellBtnClick(index:IndexPath)
@objc optional func XuanZeShangPinCellTextChange(index:IndexPath,sender:XuanZeShangPinCell)
@objc optional func XuanZeShangPinCellTextChange(index:IndexPath,sender:XuanZeShangPinCell,senderTF:UITextField)
}
class XuanZeShangPinCell: UITableViewCell{
......@@ -63,7 +63,7 @@ class XuanZeShangPinCell: UITableViewCell{
self.selectionStyle = .none
priceTF.addTarget(self, action: #selector(textChange(sender:)), for: .allEditingEvents)
countTF.addTarget(self, action: #selector(textChange(sender:)), for: .allEditingEvents)
// Initialization code
}
......@@ -79,8 +79,9 @@ class XuanZeShangPinCell: UITableViewCell{
}
}
delegate?.XuanZeShangPinCellTextChange?(index: idx!,sender:self)
delegate?.XuanZeShangPinCellTextChange?(index: idx!,sender:self,senderTF:sender)
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ a65824ce
......@@ -26,7 +26,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
var zhiFuWay = 0//普通支付方式 & 尾款支付方式
var tiHuoWay = 0//提货方式选择
var chuHuoWay = 0//出货方式选择
var cellDataArr:Array<XuanZeShangPinCell> = []//回调选择记录
var cellDataArr:Array<GetGoodsInfoDataModel> = []//回调选择记录
var dj_payStatus = 0//定金支付状态
var dj_payWay = 0//定金支付方式
var logistics_price = ""//运费
......@@ -165,20 +165,21 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
cell.tag = indexPath.row
cell.delegate = self
let cellData = cellDataArr[indexPath.row]
cell.imgView.sd_setImage(with: URL(string: cellData.imgUrlPath!))
cell.titleLbl.text = cellData.nameLbl.text
cell.detailLbl.text = cellData.detailLbl.text
let priceStr = cellData.priceTF.text! as! NSString
print(cellData.countTF)
let countStr = cellData.countTF.text! as! NSString
cell.detailLbl2.text = "¥\(priceStr.floatValue)x\(countStr.integerValue)"
cell.imgView.sd_setImage(with: URL(string:SERVERCE_ImageHost + cellData.goods_img!))
cell.titleLbl.text = cellData.goods_name
cell.detailLbl.text = "\(cellData.spec_str!)/\(cellData.unit!)"
cell.detailLbl2.text = "￥" + cellData.target_Price! + "x\(cellData.target_Count!)"
let priceStr = cellData.target_Price as! NSString
let totalP = priceStr.floatValue * Float(cellData.target_Count!)
cell.totalPriceLbl.text = "\(totalP)"
if orderType == 1 {
cell.diLbl.isHidden = false
cell.diLbl.text = "定金:￥" + djTFstr
cell.totalPriceLbl.text = "尾款:￥" + wkTFstr
}else {
cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)"
// cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)"
cell.diLbl.isHidden = true
}
......@@ -406,9 +407,8 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
vc.djTFstr = djTFstr
vc.wkTFstr = wkTFstr
let item = cellDataArr[0];
let price = item.priceTF.text as! NSString
let count = item.countTF.text as! NSString
let tp = price.floatValue * count.floatValue
let price = item.target_Price as! NSString
let tp = price.floatValue * Float(item.target_Count!)
vc.totalPrice = tp
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
......@@ -416,7 +416,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
let vc = XuanZeShangPinViewController()
vc.delegate = self
vc.barTitle = "修改价格"
vc.inputData = cellDataArr
vc.selectArr = cellDataArr
self.navigationController?.pushViewController(vc, animated: true)
}
}
......@@ -428,13 +428,15 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
//MARK: - 商品选择（普通）
func XuanZeShangPinViewControllerSubmitAction(inputData: Array<XuanZeShangPinCell>) {
cellDataArr = inputData
func XuanZeShangPinViewControllerSubmitAction(selectArr: Array<GetGoodsInfoDataModel>) {
for item in selectArr{
cellDataArr.append(item)
}
listView.reloadData()
}
//MARK: - 修改数据（普通）
func XuanZeShangPinViewControllerEdit(inputData: Array<XuanZeShangPinCell>) {
cellDataArr = inputData
func XuanZeShangPinViewControllerEdit(selectArr: Array<GetGoodsInfoDataModel>) {
cellDataArr = selectArr
listView.reloadData()
}
//MARK:-- 修改价格（预售）回调
......@@ -523,7 +525,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
listView.reloadData()
}
//MARK: - 商品选择（预售）
func XuanZeShangPinViewControllerYuShou(YuShouData:Array<XuanZeShangPinCell>) {
func XuanZeShangPinViewControllerYuShou(YuShouData:Array<GetGoodsInfoDataModel>) {
cellDataArr.removeAll()
cellDataArr = YuShouData
print(cellDataArr.count)
......@@ -545,7 +547,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
vc.delegate = self
vc.barTitle = "选择商品"
vc.is_adsale = orderType
vc.inputData = cellDataArr
// vc.selectArr = cellDataArr
if orderType == 1 {
vc.isYuShou = true
}
......@@ -558,21 +560,24 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
if section == 1{//220 142
let view = DaiKeXiaDanFooterView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 220))
view.topView.isHidden = false
view.countLbl.text = "\(cellDataArr.count)"
var pArr:Array<CGFloat> = []
var totalC:Int = 0
for item in cellDataArr{
let price = item.priceTF.text as! NSString
let count = item.countTF.text as! NSString
let tp = price.floatValue * count.floatValue
let price = item.target_Price as! NSString
let tp = price.floatValue * Float(item.target_Count!)
pArr.append(CGFloat(tp))
totalC = totalC + item.target_Count!
}
var tp:CGFloat = 0
for item in pArr {
tp = tp + item
}
let tpStr = String(format: "%.2f", tp)
view.countLbl.text = "\(totalC)"
let tpStr = String(format: "%.2f", tp)
view.totalPriceLbl.text = "¥" + tpStr
if cellDataArr.count == 0 {
view.topView.isHidden = true
view.topViewHeight.constant = 0.01
......@@ -707,42 +712,40 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
var goodsInfo:String = ""
var goodsArr : Array<Any> = []
if orderType == 1{
cellDataArr.forEach { (cell) in
let priceStr = cell.priceTF.text! as NSString
let countStr = cell.countTF.text! as NSString
let subtoal = priceStr.floatValue * countStr.floatValue
let goods = ["goods_name":cell.cellModel?.goods_name as Any, //商品名称
cellDataArr.forEach { (item) in
let priceStr = item.target_Price! as NSString
let subtoal = priceStr.floatValue * Float(item.target_Count!)
let goods = ["goods_name":item.goods_name as Any, //商品名称
"dj_amount":djTFstr as Any,// 定金金额【预售订单才传
"wk_amount":wkTFstr as Any,//尾款金额【预售订单才传】
"sku_attr":cell.cellModel?.sku_attr as Any,//规格
"adsale_inventory":cell.cellModel?.adsale_inventory as Any,//库存【预售订单才传】
"number":cell.countTF.text as Any,//购买数量
"unit":cell.cellModel?.unit as Any,//单位
"price":cell.cellModel?.price as Any,//价格
"r_price":cell.priceTF.text as Any,//售价
"sku_attr":item.sku_attr as Any,//规格
"adsale_inventory":item.adsale_inventory as Any,//库存【预售订单才传】
"number":item.target_Count as Any,//购买数量
"unit":item.unit as Any,//单位
"price":item.price as Any,//价格
"r_price":item.target_Price as Any,//售价
"is_gift":0,//是否搭赠，1是0非，现版本固定0
"subtotal":subtoal,//总价
"goods_id":cell.cellModel?.goods_id as Any,//商品ID
"sku_id":cell.cellModel?.sku_id as Any] as [String : Any]
"goods_id":item.goods_id as Any,//商品ID
"sku_id":item.sku_id as Any] as [String : Any]
goodsArr.append(goods)
}
}else{
cellDataArr.forEach { (cell) in
cellDataArr.forEach { (item) in
let priceStr = cell.priceTF.text! as NSString
let countStr = cell.countTF.text! as NSString
let subtoal = priceStr.floatValue * countStr.floatValue
let goods = ["goods_name":cell.cellModel?.goods_name as Any,
"sku_attr":cell.cellModel?.sku_attr as Any,
"inventory":cell.cellModel?.inventory as Any,//库存【普通订单才传】
"number":cell.countTF.text as Any,
"unit":cell.cellModel?.unit as Any,
"price":cell.cellModel?.price as Any,
"r_price":cell.priceTF.text as Any,
let priceStr = item.target_Price! as NSString
let subtoal = priceStr.floatValue * Float(item.target_Count!)
let goods = ["goods_name":item.goods_name as Any,
"sku_attr":item.sku_attr as Any,
"inventory":item.inventory as Any,//库存【普通订单才传】
"number":item.target_Count as Any,
"unit":item.unit as Any,
"price":item.price as Any,
"r_price":item.target_Price as Any,
"is_gift":0,
"subtotal":subtoal,
"goods_id":cell.cellModel?.goods_id as Any,
"sku_id":cell.cellModel?.sku_id as Any] as [String : Any]
"goods_id":item.goods_id as Any,
"sku_id":item.sku_id as Any] as [String : Any]
goodsArr.append(goods)
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift
View file @ a65824ce
......@@ -9,10 +9,9 @@
import UIKit
protocol XuanZeShangPinViewControllerDelegate {
func XuanZeShangPinViewControllerSubmitAction(inputData:Array<XuanZeShangPinCell>)
func XuanZeShangPinViewControllerYuShou(YuShouData:Array<XuanZeShangPinCell>)
func XuanZeShangPinViewControllerEdit(inputData:Array<XuanZeShangPinCell>)
func XuanZeShangPinViewControllerSubmitAction(selectArr:Array<GetGoodsInfoDataModel>)
func XuanZeShangPinViewControllerYuShou(YuShouData:Array<GetGoodsInfoDataModel>)
func XuanZeShangPinViewControllerEdit(selectArr:Array<GetGoodsInfoDataModel>)
}
class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,XuanZeShangPinCellDelegate,UISearchBarDelegate,SearchBarViewDelegate,UITextFieldDelegate{
......@@ -24,20 +23,20 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
@IBAction func submitAction(_ sender: Any) {
print("submit")
for item in inputData{
if item.priceTF.text!.count == 0 {
HUD.flash(.label("请输入商品单价"),delay: 1.2)
return
}
}
// for item in selectArr{
// if item.priceTF.text!.count == 0 {
// HUD.flash(.label("请输入商品单价"),delay: 1.2)
// return
// }
// }
if barTitle == "修改价格"{
delegate?.XuanZeShangPinViewControllerEdit(inputData:inputData)
delegate?.XuanZeShangPinViewControllerEdit(selectArr:selectArr)
}else{
if isYuShou {
delegate?.XuanZeShangPinViewControllerYuShou(YuShouData: inputData)
delegate?.XuanZeShangPinViewControllerYuShou(YuShouData: selectArr)
}else{
delegate?.XuanZeShangPinViewControllerSubmitAction(inputData: inputData)
delegate?.XuanZeShangPinViewControllerSubmitAction(selectArr: selectArr)
}
}
self.navigationController?.popViewController(animated: true)
......@@ -54,7 +53,6 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
var datas:Array<GetGoodsInfoDataModel> = []//数据
var selectArr:Array<GetGoodsInfoDataModel> = []
var selectIdxArr:Array<IndexPath> = []
var inputData:Array<XuanZeShangPinCell> = []
var isSearch:Bool = false
var seacrchArr:Array<GetGoodsInfoDataModel> = [] //搜索数据
override func viewDidLoad() {
......@@ -66,21 +64,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
if barTitle != "修改价格"{
getGoodsInfo(["user_token":UserToken,"is_adsale":is_adsale], success: { (data) in
let model = data as! GetGoodsInfoModel
if self.inputData.count > 0 {
for item in self.inputData{
for mD in model.data! {
if mD.sku_id == item.model?.sku_id {
let idx = model.data?.firstIndex(where: { (m) -> Bool in
return (m.sku_id == item.model?.sku_id)
})
model.data?.remove(at: idx!)
}
}
}
self.datas = model.data!
}else{
self.datas = model.data!
}
self.datas = model.data!
self.listView.reloadData()
}) { (error) in
......@@ -117,10 +101,10 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
isSearch = true
getSearch(sender: searchBar.text!)
listView.reloadData()
searchBar.resignFirstResponder()
}
func getSearch(sender:String) {
seacrchArr.removeAll()
......@@ -140,79 +124,70 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
HUD.flash(.label("数量不得低于1"),delay: 1.2)
cell.countTF.text = "1"
}
if isPurnInt(string: textField.text!) == false{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
textField.text = StringByInt(number: (cell.model?.origin_number!)!)
}
}
if textField == cell.priceTF {
if num.floatValue <= 0 {
HUD.flash(.label("请输入商品单价"),delay: 1.2)
}
}
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
textField.resignFirstResponder()
if barTitle == "修改价格"{
let idx = IndexPath(row: textField.tag, section: 0)
let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
let data = inputData[textField.tag]
if data.model?.tiered_pri! != nil && data.model!.tiered_pri!.count > 0 {
let dict = getDictionaryFromJSONString(jsonString: (data.model?.tiered_pri!)!)
let arr = dict.allKeys
var strArr:Array<Int>? = []
for item in arr {
let str = item as! NSString
strArr?.append(str.integerValue)
}
let new = strArr?.sorted(by: { (num1, num2) -> Bool in
return num1 > num2 ? true : false
})
let countStr = cell.countTF.text as! NSString
for i in 0 ..< new!.count{
if countStr.integerValue > new![i]{
cell.priceTF.text = dict["\(new![i])"] as! String
break
}else{
cell.priceTF.text = data.model!.price
}
}
}
}else{
let idx = IndexPath(row: textField.tag, section: 0)
let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
let data = datas[textField.tag]
if cell.priceTF.text != "0" {
if data.tiered_pri! != nil && data.tiered_pri!.count > 0 {
let dict = getDictionaryFromJSONString(jsonString: data.tiered_pri!)
let arr = dict.allKeys
var strArr:Array<Int>? = []
for item in arr {
let str = item as! NSString
strArr?.append(str.integerValue)
}
let new = strArr?.sorted(by: { (num1, num2) -> Bool in
return num1 > num2 ? true : false
})
let countStr = cell.countTF.text as! NSString
for i in 0 ..< new!.count{
if countStr.integerValue > new![i]{
cell.priceTF.text = dict["\(new![i])"] as! String
break
}else{
cell.priceTF.text = data.price
}
}
}
if isPurnNumber(str: textField.text!) == false{
HUD.flash(.label("请输入正确的价格"), delay: 1.2)
textField.text = cell.model?.price
}
}
return true
}
//MARK: - 阶梯价
// func textFieldShouldReturn(_ textField: UITextField) -> Bool {
// textField.resignFirstResponder()
// if barTitle == "修改价格"{
// let idx = IndexPath(row: textField.tag, section: 0)
// let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
// let data = selectArr[textField.tag]
//
//
// }else{
// let idx = IndexPath(row: textField.tag, section: 0)
// let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
//
// let data = datas[textField.tag]
// if cell.priceTF.text != "0" {
// if data.tiered_pri! != nil && data.tiered_pri!.count > 0 {
// let dict = getDictionaryFromJSONString(jsonString: data.tiered_pri!)
// let arr = dict.allKeys
// var strArr:Array<Int>? = []
// for item in arr {
// let str = item as! NSString
// strArr?.append(str.integerValue)
// }
// let new = strArr?.sorted(by: { (num1, num2) -> Bool in
// return num1 > num2 ? true : false
// })
// let countStr = cell.countTF.text as! NSString
// for i in 0 ..< new!.count{
// if countStr.integerValue > new![i]{
// cell.priceTF.text = dict["\(new![i])"] as! String
// break
// }else{
// cell.priceTF.text = data.price
// }
// }
// }
// }
// }
//
// return true
// }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
cell.delegate = self
cell.priceTF.delegate = self
cell.countTF.delegate = self
// cell.priceTF.delegate = self
// cell.countTF.delegate = self
cell.idx = indexPath
cell.countTF.tag = indexPath.row
cell.priceTF.tag = indexPath.row
......@@ -222,19 +197,20 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
cell.countTF.returnKeyType = .done
if barTitle == "修改价格"{
let cell1 = inputData[indexPath.row]
cell.sku_id = cell1.sku_id
cell.nameLbl.text = cell1.nameLbl.text
cell.detailLbl.text = cell1.detailLbl.text
cell.detailLbl2.text = cell1.detailLbl2.text
cell.iconImg.sd_setImage(with: URL(string: cell1.imgUrlPath!))
cell.imgUrlPath = cell1.imgUrlPath
cell.countTF.text = cell1.countTF.text
cell.priceTF.text = cell1.priceTF.text
cell.model = cell1.model
let model = selectArr[indexPath.row]
cell.sku_id = model.sku_id
cell.nameLbl.text = model.goods_name
cell.cellModel = model
cell.detailLbl.text = "\(model.spec_str!)/\(model.unit!)"
cell.detailLbl2.text = "库存：\(model.inventory!)"
cell.iconImg.sd_setImage(with: URL(string: SERVERCE_ImageHost + model.goods_img!))
cell.countTF.text = "\(model.target_Count!)"
cell.priceTF.text = model.target_Price
cell.maxNum = model.inventory
cell.selectBtn.isHidden = true
cell.btmView.isHidden = false
cell.btmViewHeight.constant = 89
}else{
cell.idx = indexPath
let model = datas[indexPath.row]
......@@ -249,7 +225,8 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
cell.countTF.text = StringByInt(number: model.origin_number!)
cell.priceTF.text = model.price!
model.target_Count = model.origin_number!
model.target_Price = model.price
if isYuShou {//预售
cell.maxNum = model.adsale_inventory
......@@ -274,38 +251,35 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
cell.selectBtn.isSelected = false
cell.btmView.isHidden = true
cell.btmViewHeight.constant = 0
var isSelectByData = false
selectArr.forEach { (md) in
if md.sku_id == model.sku_id {
isSelectByData = true
}
}
var isSelectByData = false
selectArr.forEach { (md) in
if md.sku_id == model.sku_id {
isSelectByData = true
}
}
if isSelectByData {
cell.selectBtn.isSelected = true
cell.btmView.isHidden = false
cell.btmViewHeight.constant = 89
}
}
}
return cell
}
func XuanZeShangPinCellTextChange(index: IndexPath,sender:XuanZeShangPinCell) {
func XuanZeShangPinCellTextChange(index: IndexPath,sender:XuanZeShangPinCell,senderTF:UITextField) {
for i in 0 ..< inputData.count{
let item = inputData[i]
if sender.sku_id == item.sku_id{
inputData.insert(sender, at: i)
inputData.remove(at: i+1)
}
let model = selectArr[index.row]
let valueStr = senderTF.text as! NSString
if senderTF == sender.priceTF {
model.target_Price = formatShowNumber(value: senderTF.text!)
}else{
model.target_Count = valueStr.integerValue
}
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if barTitle == "修改价格"{
return 210
......@@ -327,18 +301,16 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
func XuanZeShangPinCellBtnClick(index:IndexPath) {
let cell = listView.cellForRow(at: index) as! XuanZeShangPinCell
let model = datas[index.row]
if isYuShou{//预售
let model = datas[index.row]
if model.adsale_inventory == 0 {
HUD.flash(.label("库存为0，无法下单"),delay: 1.2)
return
}
idx = index
inputData.removeAll()
inputData.append(cell)
selectArr.removeAll()
selectArr.append(model)
}else{//非预售
let data = datas[index.row]
if data.inventory == 0 {
......@@ -354,14 +326,11 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
}else{
selectArr.append(data)
}
//
if selectIdxArr.contains(index){
let idx = selectIdxArr.index(of: index)
selectIdxArr.remove(at: idx!)
inputData.remove(at: idx!)
}else{
selectIdxArr.append(index)
inputData.append(cell)
}
}
listView.reloadData()
......@@ -369,16 +338,16 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
//MARK: - cell delegate
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if barTitle == "修改价格"{
return inputData.count
return selectArr.count
}
if isSearch {
return seacrchArr.count
}
return datas.count
}
}
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ a65824ce
......@@ -474,6 +474,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
data.sku_id = dataSource.sku_id!//sku_id
let arr = dataSource.spec_str?.components(separatedBy: ":")
data.guiGe = (arr?.last)!//规格
print("dict == ",dataSource.pack_attr!)
let dict = getDictionaryFromJSONString(jsonString: dataSource.pack_attr!)
data.weight = dict["wg"] as! String//重量
data.wenDu = dataSource.refrigerate!//温藏
......@@ -677,8 +678,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
cell.tag = indexPath.row
if isAllEditing == false {
cell.contentRight.constant = 15
cell.imgView.isHidden = true
}else{
cell.contentRight.constant = 32
cell.imgView.isHidden = false
}
cell.delegate = self
return cell
......@@ -796,8 +799,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
cell.contentLbl.text = tishixxArr1[indexPath.row] as! String
if isAllEditing{
cell.contentRight.constant = 32
cell.imgView.isHidden = false
}else{
cell.contentRight.constant = 15
cell.imgView.isHidden = true
}
cell.delegate = self
return cell
......@@ -1384,27 +1389,30 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}
btn.addTarget(self, action: #selector(editHtml), for: .touchUpInside)
}
if section == 2 && guiGeArr.count > 0 && isAllEditing{
let btn = UIButton()
btn.setTitle(" 新增", for: .normal)
btn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
btn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
btn.setImage(UIImage(named: "jiahaoXG"), for: .normal)
view.addSubview(btn)
btn.sizeToFit()
btn.snp.makeConstraints { (make) in
make.centerY.equalTo(lbl.snp_centerY)
make.right.equalTo(-15)
make.height.equalTo(btn.frame.size.height)
make.width.equalTo(btn.frame.size.width)
}
let btn2 = UIButton()
view.addSubview(btn2)
btn2.snp.makeConstraints { (make) in
make.top.right.bottom.equalTo(0)
make.width.equalTo(80)
if section == 2 && guiGeArr.count > 0{
if isAllEditing {
let btn = UIButton()
btn.setTitle(" 新增", for: .normal)
btn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
btn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
btn.setImage(UIImage(named: "jiahaoXG"), for: .normal)
view.addSubview(btn)
btn.sizeToFit()
btn.snp.makeConstraints { (make) in
make.centerY.equalTo(lbl.snp_centerY)
make.right.equalTo(-15)
make.height.equalTo(btn.frame.size.height)
make.width.equalTo(btn.frame.size.width)
}
let btn2 = UIButton()
view.addSubview(btn2)
btn2.snp.makeConstraints { (make) in
make.top.right.bottom.equalTo(0)
make.width.equalTo(80)
}
btn2.addTarget(self, action: #selector(addGuiGe(sender:)), for: .touchUpInside)
print("guigear == ",guiGeArr.count)
}
btn2.addTarget(self, action: #selector(addGuiGe(sender:)), for: .touchUpInside)
if guiGeArr.count > 1 {
view.frame = CGRect(x: 0, y: 0, width: fullScreenWidth, height: 80)
let collectionView = UICollectionView(frame: CGRect(x: 0, y: 0, width: 0, height: 0), collectionViewLayout: layout)
......@@ -1661,9 +1669,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}
func getNewPicDictsArray()->String{
print("源数据")
print(goods_banner)
......
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @ a65824ce
......@@ -137,10 +137,15 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
@IBAction func saveAction(_ sender: Any) {
print("save")
print("open = ",isJieTiOpen)
if price.count == 0 {
HUD.flash(.label("请输入售价"), delay: 1.2)
return
}
if isPurnNumber(str: price) == false {
HUD.flash(.label("请输入正确的售价"), delay: 1.2)
return
}
if guiGe.count == 0 {
HUD.flash(.label("请输入规格"), delay: 1.2)
return
......@@ -149,6 +154,10 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
HUD.flash(.label("请输入重量"), delay: 1.2)
return
}
if isPurnNumber(str: weight) == false {
HUD.flash(.label("请输入正确的重量"), delay: 1.2)
return
}
if wenDu.count == 0 {
HUD.flash(.label("请选择温藏"), delay: 1.2)
return
......@@ -161,7 +170,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
if isPurnNumber(str: yuShouPrice) == false{
HUD.flash(.label("请输入正确的预售价格"), delay: 1.2)
return
}
if isPurnNumber(str: ysKuCun) == false {
HUD.flash(.label("请输入正确的库存"), delay: 1.2)
......@@ -227,16 +235,12 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
self.navigationController?.popViewController(animated: true)
}
//MARK: - TEXTFIELD DELEGATE
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
IQKeyboardManager.shared.resignFirstResponder()
print(textField.text,textField.tag)
func textFieldDidEndEditing(_ textField: UITextField) {
textField.text = formatShowNumber(value: textField.text!)
switch textField.tag {
case 0:
price = textField.text!
break
case 1:
guiGe = textField.text!
break
case 2:
weight = textField.text!
......@@ -244,6 +248,15 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
default:
break
}
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
switch textField.tag {
case 1:
guiGe = textField.text!
break
default:
break
}
// delegate?.ChangeGoodsPriceVCKeyboardDone(str: textField.text!)
return true
}
......
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
View file @ a65824ce
......@@ -40,6 +40,8 @@ var delegate:YuShouCellDelegate?
}
@objc func textTfValueChange(sender:UITextField){
sender.text = formatShowNumber(value: sender.text!)
if sender == inputTF3{
let str = sender.text as! NSString
if str.floatValue > 20{
......
GeliBusinessPlatform/ViewController/订单管理/预售价格修改/XiuGaiYuShouJiaViewController.swift
View file @ a65824ce
......@@ -16,7 +16,7 @@ class XiuGaiYuShouJiaViewController: BaseViewController, UITextFieldDelegate {
var dataModel : OrderDetailDataModel?
var orderID:Int? = 0
var delegate : XiuGaiYuShouJiaViewControllerDelegate?
var inputData:Array<XuanZeShangPinCell> = []
var inputData:Array<GetGoodsInfoDataModel> = []
var djTFstr:String = "";
var wkTFstr:String = "";
var totalPrice: Float? = 0
......@@ -57,9 +57,9 @@ class XiuGaiYuShouJiaViewController: BaseViewController, UITextFieldDelegate {
if inputData.count > 0 {
let cell1 = inputData[0]
titleLbl.text = cell1.nameLbl.text
detailLbl.text = cell1.detailLbl.text
icomImg.sd_setImage(with: URL(string: cell1.imgUrlPath!))
// titleLbl.text = cell1.nameLbl.text
// detailLbl.text = cell1.detailLbl.text
// icomImg.sd_setImage(with: URL(string: cell1.imgUrlPath!))
countLbl.isHidden = true
dingJinTF.text = djTFstr
weiKuanTF.text = wkTFstr
......
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