Skip to content

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

修改新增规格输入判断

parent 3673f555
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 40 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/商品详情/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