修改输入限制

GeliBusinessPlatform/SceneDelegate.swift

@@ -47,7 +47,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         vc.delegate = self
         let contentView = vc
 //
-//        let vc = EPViewController()
+//        let vc = PersonCenterViewController()
 //        let contentView = vc
         
         if let windowScene = sceneC as? UIWindowScene {

GeliBusinessPlatform/View/Cell/PersonCenterCell.xib

@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="PersonCenterCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="PersonCenterCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -42,7 +42,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
         super.viewDidLoad()
         topImgBg.snp.makeConstraints { (make) in
             make.top.left.right.equalTo(0)
-            make.height.equalTo(227)
+            make.height.equalTo(227*glscale)
         }
         topBgImg.snp.makeConstraints { (make) in
             make.bottom.equalTo(topImgBg.snp_top)
@@ -106,7 +106,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
+        return 50*glscale
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return listArray.count

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.xib

@@ -127,12 +127,12 @@
                     </connections>
                 </button>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="5jU-Ew-dGr">
-                    <rect key="frame" x="15" y="175" width="345" height="150"/>
+                    <rect key="frame" x="15" y="175" width="345" height="148"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="150" id="sgr-YH-MQe">
+                        <constraint firstAttribute="height" constant="148" id="sgr-YH-MQe">
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="NO"/>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
                             </userDefinedRuntimeAttributes>
                         </constraint>
                     </constraints>

GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift

@@ -271,10 +271,29 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
         print("count === ",selectArr.count)
         let model = sender.cellModel
         let valueStr = senderTF.text as! NSString
-        if senderTF == sender.priceTF {
-            model!.target_Price = formatShowNumber(value: senderTF.text!)
-        }else{
-            model!.target_Count = valueStr.integerValue
+        if senderTF == sender.priceTF {//价格
+            let str = formatShowNumber(value: senderTF.text!) as! NSString
+            if str.floatValue <= 0 {
+                HUD.flash(.label("请输入正确的价格"), delay: 1.2)
+                model!.target_Price = sender.model?.price
+                senderTF.text = sender.model?.price
+            }else{
+                model!.target_Price = str as String
+                senderTF.text = str as String
+            }
+        }else{//数量
+            if valueStr.integerValue > sender.maxNum! {
+                HUD.flash(.label("超出最大数量\(sender.maxNum!)"), delay: 1.2)
+                model!.target_Count = sender.maxNum!
+                senderTF.text = "\(sender.maxNum!)"
+            }else if valueStr.integerValue == 0 {
+                HUD.flash(.label("数量不小于1"), delay: 1.2)
+                model!.target_Count = 1
+                senderTF.text = "1"
+            }else{
+                model!.target_Count = valueStr.integerValue
+                senderTF.text = valueStr as String
+            }
         }
         
     }

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -103,7 +103,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 HUD.hide(animated: true)
                 self.generalInfoModel = (data as! GeneralInfoModel)
                 self.shangPinStatusArr = (self.generalInfoModel?.data!.gs)!
-                sender.setTitle("保存", for: .normal)
+                self.editBtn!.setTitle("保存", for: .normal)
                 self.isAllEditing = true
                 self.listTbv.reloadData()
             }) { (error) in
@@ -209,7 +209,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             //MARK:--修改商品接口
             goodsEdit(dic, success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交修改成功"), delay: 1.2)
-                sender.setTitle("编辑", for: .normal)
+                self.editBtn!.setTitle("编辑", for: .normal)
                 self.isAllEditing = false
                 self.listTbv.reloadData()
             }) { (error) in
@@ -253,10 +253,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         }
     }
     
+    var editBtn:UIButton?
     @objc func btmBtnClick(sender:UIButton){
         switch sender.titleLabel!.text {
         case "编辑":
-            
+            editBtn = sender
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -678,10 +679,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             cell.tag = indexPath.row
             if isAllEditing == false {
                 cell.contentRight.constant = 15
-                cell.imgView.isHidden = true
+                cell.arrowImg.isHidden = true
             }else{
                 cell.contentRight.constant = 32
-                cell.imgView.isHidden = false
+                cell.arrowImg.isHidden = false
             }
             cell.delegate = self
             return cell
@@ -801,10 +802,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 cell.contentLbl.text = tishixxArr1[indexPath.row] as! String
                 if isAllEditing{
                     cell.contentRight.constant = 32
-                    cell.imgView.isHidden = false
+                    cell.arrowImg.isHidden = false
                 }else{
                     cell.contentRight.constant = 15
-                    cell.imgView.isHidden = true
+                    cell.arrowImg.isHidden = true
                 }
                 cell.delegate = self
                 return cell