预售价格bug修复

GeliBusinessPlatform/SceneDelegate.swift

@@ -95,7 +95,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
         
         tabBarController.viewControllers = [v1, v2, v3, v4, v5]
 
-//        tabBarController.selectedIndex = 2
+        tabBarController.selectedIndex = 2
 
         
         

GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift

@@ -24,6 +24,7 @@ class AddGuiGeCell: UITableViewCell ,WKNavigationDelegate{
     @IBOutlet weak var webView: WKWebView!
     
     
+    @IBOutlet weak var act: UIActivityIndicatorView!
     
     @IBOutlet weak var imgBtn: UIButton!
     override func awakeFromNib() {
@@ -43,6 +44,7 @@ class AddGuiGeCell: UITableViewCell ,WKNavigationDelegate{
         webView.evaluateJavaScript("document.body.scrollHeight") { (result, error) in
             let h = result as! CGFloat
             print("webH = ",h)
+            self.act.stopAnimating()
             self.delegate?.AddGuiGeCellWebViewHeight?(height:h)
         }
         

GeliBusinessPlatform/View/Cell/AddGuiGeCell.xib

@@ -36,18 +36,24 @@
                             <wkPreferences key="preferences"/>
                         </wkWebViewConfiguration>
                     </wkWebView>
+                    <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="UFb-kH-fet">
+                        <rect key="frame" x="177.5" y="25" width="20" height="20"/>
+                    </activityIndicatorView>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="XTl-7k-tJ9" secondAttribute="trailing" id="0kl-1v-5pJ"/>
                     <constraint firstItem="FpT-RN-ad7" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="CTD-cA-1jp"/>
                     <constraint firstItem="XTl-7k-tJ9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Jzh-d3-hFu"/>
                     <constraint firstItem="XTl-7k-tJ9" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="XU0-dq-ExO"/>
+                    <constraint firstItem="UFb-kH-fet" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="25" id="g75-in-5W4"/>
                     <constraint firstAttribute="bottom" secondItem="FpT-RN-ad7" secondAttribute="bottom" constant="50" id="log-wz-xog"/>
+                    <constraint firstItem="UFb-kH-fet" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="oM9-6n-IZj"/>
                     <constraint firstAttribute="bottom" secondItem="XTl-7k-tJ9" secondAttribute="bottom" id="pGY-fa-sLW"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="act" destination="UFb-kH-fet" id="9uF-2j-KAd"/>
                 <outlet property="btmH" destination="log-wz-xog" id="axu-Jf-zWN"/>
                 <outlet property="imgBtn" destination="FpT-RN-ad7" id="DdI-mW-7wW"/>
                 <outlet property="webView" destination="XTl-7k-tJ9" id="fPC-E0-nGO"/>

GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.swift

@@ -10,7 +10,7 @@ import UIKit
 @objc protocol XuanZeShangPinCellDelegate {
     @objc optional func XuanZeShangPinCellBtnClick(index:IndexPath)
     @objc optional func XuanZeShangPinCellTextChange(index:IndexPath,sender:XuanZeShangPinCell,senderTF:UITextField)
-    
+    @objc optional func XuanZeShangPinCellCountChange(sender:XuanZeShangPinCell,senderTF:UITextField)
 }
 class XuanZeShangPinCell: UITableViewCell{
     var imgUrlPath:String?
@@ -46,6 +46,7 @@ class XuanZeShangPinCell: UITableViewCell{
                 countTF.text = "\(str.integerValue - 1)"
             }
         }
+        delegate?.XuanZeShangPinCellCountChange?(sender: self, senderTF: countTF)
     }
     @IBOutlet weak var priceTF: UITextField!
     @IBOutlet weak var countTF: UITextField!

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

@@ -31,6 +31,8 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
         //        }
         
         if barTitle == "修改价格"{
+            let item = selectArr.first
+            print(item?.target_Count)
             delegate?.XuanZeShangPinViewControllerEdit(selectArr:selectArr)
         }else{
             if isYuShou {
@@ -116,29 +118,79 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
     }
     //MARK: - textfield编辑结束
     func textFieldDidEndEditing(_ textField: UITextField) {
+        
+        if barTitle == "修改价格"{
+            let model = selectArr[textField.tag]
             let idx = IndexPath(row: textField.tag, section: 0)
             let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
-        let num = textField.text as! NSString
-        if textField == cell.countTF {
-            if num.integerValue < 1 {
-                HUD.flash(.label("数量不得低于1"),delay: 1.2)
-                cell.countTF.text = "1"
+            if textField == cell.countTF{//数量
+                if isPurnInt(string: textField.text!){
+                    if Int(textField.text!)! > cell.maxNum! {
+                        HUD.flash(.label("超出最大数量\(cell.maxNum!)"), delay: 1.2)
+                        model.target_Count = cell.maxNum!
+                        textField.text = "\(cell.maxNum!)"
+                    }else if Int(textField.text!) == 0{
+                        HUD.flash(.label("数量不小于1"), delay: 1.2)
+                        model.target_Count = 1
+                        textField.text = "1"
+                    }else{
+                        textField.text = formatShowNumber(value: textField.text!)
+                        model.target_Count = Int(textField.text!)
                     }
-            if isPurnInt(string: textField.text!) == false{
+                }else{
                     HUD.flash(.label("请输入正确的数量"), delay: 1.2)
-                textField.text = StringByInt(number: (cell.model?.origin_number!)!)
+                    textField.text = StringByInt(number: (model.origin_number!))
+                    model.target_Count = model.origin_number!
+                }
+            }else{//价格
+                if isPurnNumber(str: textField.text!){
+                    model.target_Price = formatShowNumber(value: textField.text!)
+                }else{
+                    HUD.flash(.label("请输入正确的价格"), delay: 1.2)
+                    textField.text = model.price!
+                    model.target_Price = model.price!
                 }
+            }
+            
+        }else{
             
+            let idx = IndexPath(row: textField.tag, section: 0)
+            let cell = listView.cellForRow(at: idx) as! XuanZeShangPinCell
+            if textField == cell.countTF{//数量
+                if isPurnInt(string: textField.text!){
+                    if Int(textField.text!)! > cell.maxNum! {
+                        HUD.flash(.label("超出最大数量\(cell.maxNum!)"), delay: 1.2)
+                        cell.model!.target_Count = cell.maxNum!
+                        textField.text = "\(cell.maxNum!)"
+                    }else if Int(textField.text!) == 0{
+                        HUD.flash(.label("数量不小于1"), delay: 1.2)
+                        cell.model!.target_Count = 1
+                        textField.text = "1"
+                    }else{
+                        textField.text = formatShowNumber(value: textField.text!)
+                        cell.model?.target_Count = Int(textField.text!)
                     }
-        if textField == cell.priceTF {
-            if num.floatValue <= 0 {
-                HUD.flash(.label("请输入商品单价"),delay: 1.2)
+                }else{
+                    HUD.flash(.label("请输入正确的数量"), delay: 1.2)
+                    textField.text = StringByInt(number: (cell.model?.origin_number!)!)
+                    cell.model?.target_Count = cell.model?.origin_number!
                 }
-            if isPurnNumber(str: textField.text!) == false{
+            }else{//价格
+                if isPurnNumber(str: textField.text!){
+                    cell.model?.target_Price = formatShowNumber(value: textField.text!)
+                }else{
                     HUD.flash(.label("请输入正确的价格"), delay: 1.2)
-                textField.text = cell.model?.price
+                    textField.text = cell.model?.price!
+                    cell.model?.target_Price = cell.model?.price!
+                }
             }
         }
+    }
+    
+    func XuanZeShangPinCellTextChange(index: IndexPath,sender:XuanZeShangPinCell,senderTF:UITextField) {
+        
+        
+        
     }
     
     //MARK: - 阶梯价
@@ -186,8 +238,8 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
     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
@@ -267,36 +319,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
     }
     
     
-    func XuanZeShangPinCellTextChange(index: IndexPath,sender:XuanZeShangPinCell,senderTF:UITextField) {
-        print("count === ",selectArr.count)
-        let model = sender.cellModel
-        let valueStr = senderTF.text as! NSString
-        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
-            }
-        }
     
-    }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if barTitle == "修改价格"{
@@ -358,6 +381,48 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
         }
         listView.reloadData()
     }
+    func XuanZeShangPinCellCountChange(sender: XuanZeShangPinCell, senderTF: UITextField) {
+        if barTitle == "修改价格"{
+            let model = selectArr[sender.tag]
+            if isPurnInt(string: senderTF.text!){
+                if Int(senderTF.text!)! > sender.maxNum! {
+                    HUD.flash(.label("超出最大数量\(sender.maxNum!)"), delay: 1.2)
+                    model.target_Count = sender.maxNum!
+                    senderTF.text = "\(sender.maxNum!)"
+                }else if Int(senderTF.text!) == 0{
+                    HUD.flash(.label("数量不小于1"), delay: 1.2)
+                    model.target_Count = 1
+                    senderTF.text = "1"
+                }else{
+                    senderTF.text = formatShowNumber(value: senderTF.text!)
+                    model.target_Count = Int(senderTF.text!)
+                }
+            }else{
+                HUD.flash(.label("请输入正确的数量"), delay: 1.2)
+                senderTF.text = StringByInt(number: (model.origin_number!))
+                model.target_Count = model.origin_number!
+            }
+        }else{
+            if isPurnInt(string: senderTF.text!){
+                if Int(senderTF.text!)! > sender.maxNum! {
+                    HUD.flash(.label("超出最大数量\(sender.maxNum!)"), delay: 1.2)
+                    sender.model!.target_Count = sender.maxNum!
+                    senderTF.text = "\(sender.maxNum!)"
+                }else if Int(senderTF.text!) == 0{
+                    HUD.flash(.label("数量不小于1"), delay: 1.2)
+                    sender.model!.target_Count = 1
+                    senderTF.text = "1"
+                }else{
+                    senderTF.text = formatShowNumber(value: senderTF.text!)
+                    sender.model?.target_Count = Int(senderTF.text!)
+                }
+            }else{
+                HUD.flash(.label("请输入正确的数量"), delay: 1.2)
+                senderTF.text = StringByInt(number: (sender.model?.origin_number!)!)
+                sender.model?.target_Count = sender.model?.origin_number!
+            }
+        }
+    }
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if barTitle == "修改价格"{

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

@@ -398,6 +398,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             cell.imgBtn.addTarget(self, action: #selector(addGuiGe), for: .touchUpInside)
             cell.imgBtn.setImage(UIImage(named: "xinzeng"), for: .normal)
             cell.webView.isHidden = true
+            cell.act.isHidden = true
             return cell
         case 3:
             if indexPath.row == 0 {
@@ -457,7 +458,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             cell.delegate = self
             cell.imgBtn.tag = indexPath.row
             if goodsDesc.count > 0 {
-                
+                cell.act.startAnimating()
                 cell.webView.isHidden = false
                 
                 let headerString : String = "<header><meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'><style>img{max-width:100%}</style></header>"