bug修复

GeliBusinessPlatform/Define/Define.swift

@@ -128,6 +128,7 @@ func isPurnInt(string: String) -> Bool {
 func isPurnNumber(str:String)-> Bool{
 //    let expression = "^[0-9]*((\\.|,)[0-9]{0,2})?$"
 
+
     if str.count > 0 {
         var predicateStr:String!
         var currObject:String!
@@ -257,7 +258,7 @@ func dayByDouble (sender : Double ) -> String {
 //MARK: -- 格式化数字
 func formatShowNumber(value:String) -> String {
        if value.isEmpty {
-           return "0.00"
+           return "0"
        }
        //保留位数
        let interceptValue = String(format: "%.2f", (value as NSString).doubleValue)

GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift

@@ -20,12 +20,11 @@ class AddGuiGeCell: UITableViewCell ,WKNavigationDelegate{
         delegate?.AddGuiGeCellClick?(cell: self)
     }
     
+    @IBOutlet weak var actp: UIActivityIndicatorView!
     
     @IBOutlet weak var webView: WKWebView!
     
     
-    @IBOutlet weak var act: UIActivityIndicatorView!
-    
     @IBOutlet weak var imgBtn: UIButton!
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -44,8 +43,10 @@ class AddGuiGeCell: UITableViewCell ,WKNavigationDelegate{
         webView.evaluateJavaScript("document.body.scrollHeight") { (result, error) in
             let h = result as! CGFloat
             print("webH = ",h)
-            self.act.stopAnimating()
+            self.actp.stopAnimating()
+            self.actp.isHidden = true
             self.delegate?.AddGuiGeCellWebViewHeight?(height:h)
+            
         }
         
     }

GeliBusinessPlatform/View/Cell/AddGuiGeCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -36,8 +36,8 @@
                             <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 opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="JgJ-dw-PQI">
+                        <rect key="frame" x="177.5" y="21" width="20" height="20"/>
                     </activityIndicatorView>
                 </subviews>
                 <constraints>
@@ -45,15 +45,15 @@
                     <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 firstItem="JgJ-dw-PQI" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="21" id="ieQ-ug-Q5p"/>
                     <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"/>
+                    <constraint firstItem="JgJ-dw-PQI" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="s0c-yJ-d3I"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
-                <outlet property="act" destination="UFb-kH-fet" id="9uF-2j-KAd"/>
+                <outlet property="actp" destination="JgJ-dw-PQI" id="Oa9-y4-cNF"/>
                 <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/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import IQKeyboardManagerSwift
 
-class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,DZGLViewControllerDelegate,XuanZeShangPinViewControllerDelegate,DaiKeXiaDanGouWuCellDelegate,GuanLianKehuVCDelegate,XiuGaiYuShouJiaViewControllerDelegate,TitleAndTFCellDelegate, GeliAlertViewDelegate{
+class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,DZGLViewControllerDelegate,XuanZeShangPinViewControllerDelegate,DaiKeXiaDanGouWuCellDelegate,GuanLianKehuVCDelegate,XiuGaiYuShouJiaViewControllerDelegate,TitleAndTFCellDelegate, GeliAlertViewDelegate,UITextFieldDelegate{
     
     let ddTypeArr = ["普通订单","预售下单"]
     let zfTypeArr = ["未付款","欠款","月结","已付款"]
@@ -258,15 +258,21 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
             cell.textTF.placeholder = "请输入费用"
             cell.textTF.keyboardType = .decimalPad
             cell.textTF.textColor = UIColor(named: "蓝色字体颜色")
+            cell.textTF.tag = 1002
+
             if indexPath.row == 5 {
                 cell.textTF.placeholder = "请输入运费"
+                cell.textTF.tag = 1001
             }
             cell.textTF.textAlignment = .center
             cell.delegate = self
+            cell.textTF.delegate = self
+
             return cell
         }
     }
     
+    
     //MARK: - didselectRow
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if orderType == nil  && indexPath.section != 0{
@@ -845,12 +851,23 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
     }
     //MARK:--运费 & 其他费用
     func textFieldContent(content: String, cell: TitleAndTFCell) {
+   
         if cell.nameLbl.text == "运费"  {
             logistics_price = content
-            print(logistics_price)
         }else if cell.nameLbl.text == "其他费用" {
             other_price = content
-            print(other_price)
+        }
+        
+    }
+    //运费费用金额格式化
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        let content = formatShowNumber(value: textField.text!)
+        if textField.tag == 1001 {
+            logistics_price = content
+            textField.text = content
+        }else if textField.tag == 1002 {
+            other_price = content
+            textField.text = content
         }
     }
 }

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

@@ -145,6 +145,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
             }else{//价格
                 if isPurnNumber(str: textField.text!){
                     model.target_Price = formatShowNumber(value: textField.text!)
+                    textField.text = formatShowNumber(value: textField.text!)
                 }else{
                     HUD.flash(.label("请输入正确的价格"), delay: 1.2)
                     textField.text = model.price!
@@ -178,6 +179,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
             }else{//价格
                 if isPurnNumber(str: textField.text!){
                     cell.model?.target_Price = formatShowNumber(value: textField.text!)
+                    textField.text = formatShowNumber(value: textField.text!)
                 }else{
                     HUD.flash(.label("请输入正确的价格"), delay: 1.2)
                     textField.text = cell.model?.price!

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

@@ -754,6 +754,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             cell.imgBtn.isUserInteractionEnabled = isAllEditing
             cell.imgBtn.setImage(UIImage(named: "xinzeng"), for: .normal)
             cell.webView.isHidden = true
+            cell.actp.isHidden = true
+
             return cell
         case 3:
             if indexPath.row == 0 {
@@ -831,7 +833,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             
             cell.imgBtn.isUserInteractionEnabled = isAllEditing
             cell.tag = indexPath.section
+            cell.actp.isHidden = true
             if goodsDesc.count > 0 {
+                cell.actp.isHidden = false
+                cell.actp.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>"
                 
@@ -851,7 +856,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     //MARK: - 底部广告软文跳转 && 编辑
     @objc func editHtml(){
         print("编辑软文")
-        webH = 0
         let vc = LMNoteViewController()
         
         vc.htmlStr = goodsDesc;
@@ -861,7 +865,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     func AddGuiGeCellClick(cell: AddGuiGeCell) {
         
         if cell.tag == 5 {
-            webH = 0
             let vc = LMNoteViewController()
             vc.htmlStr = goodsDesc;
             vc.delegatedata = self
@@ -1779,16 +1782,21 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         return dataChangeString(sender:data4)
         
     }
+    var isWebH:Bool = false
     func AddGuiGeCellWebViewHeight(height: CGFloat) {
         
         webH = height
+        if !isWebH {
+            listTbv.reloadData()
+            isWebH = true
+        }
         
     }
     
     var goodsDesc = ""
     func getHTMLByVc(_ model: String!) {
         goodsDesc = model
-        
+        isWebH = false
         listTbv.reloadData()
     }
     

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

@@ -398,7 +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
+            cell.actp.isHidden = true
             return cell
         case 3:
             if indexPath.row == 0 {
@@ -457,8 +457,10 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             cell.imgBtn.setImage(UIImage(named: "XiaYunDanViewController"), for: .normal)
             cell.delegate = self
             cell.imgBtn.tag = indexPath.row
+            cell.actp.isHidden = true
             if goodsDesc.count > 0 {
-                cell.act.startAnimating()
+                cell.actp.isHidden = false
+                cell.actp.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>"
@@ -470,6 +472,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             cell.imgBtn.setImage(UIImage(named: "tjxq"), for: .normal)
             cell.btmH.constant = 25
  
+            
             return cell
         }
     }
@@ -483,7 +486,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     //MARK: - 底部广告软文跳转 && 编辑
     @objc func editHtml(){
         print("编辑软文")
-        webH = 0
         let vc = LMNoteViewController()
         
         vc.htmlStr = goodsDesc;
@@ -492,7 +494,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     }
     func AddGuiGeCellClick(cell: AddGuiGeCell) {
         let vc = LMNoteViewController()
-        webH = 0
         vc.htmlStr = goodsDesc;
         vc.delegatedata = self
         self.navigationController?.pushViewController(vc, animated: true)
@@ -1259,13 +1260,21 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         
     }
     
+    var isWebH:Bool = false
     func AddGuiGeCellWebViewHeight(height: CGFloat) {
+        
         webH = height
+        if !isWebH {
+            listTbv.reloadData()
+            isWebH = true
         }
-    //MARK:---商品详情回调的数据
+        
+    }
+    
     var goodsDesc = ""
     func getHTMLByVc(_ model: String!) {
         goodsDesc = model
+        isWebH = false
         listTbv.reloadData()
     }
     

GeliBusinessPlatform/ViewController/订单管理/普通商品修改价格/ChangeGoodsPriceVC.swift

@@ -64,7 +64,7 @@ class ChangeGoodsPriceVC: BaseViewController  , UITableViewDelegate, UITableView
             if i == textField.tag {
                 let md = dataArr![i]
                 if isPurnNumber(str: textField.text!) {
-                    md.goods_price = textField.text
+                    md.goods_price = formatShowNumber(value: textField.text!)
                     //记录哪个更改了
                     md.is_edit = 1
                 }
@@ -73,19 +73,7 @@ class ChangeGoodsPriceVC: BaseViewController  , UITableViewDelegate, UITableView
         
         self.tableV.reloadData()
     }
-//    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
-////        IQKeyboardManager.shared.resignFirstResponder()
-//        //MARK:--输入点确定后，修改数据
-//        for i in 0..<dataArr!.count {
-//            if i == textField.tag {
-//                let md = dataArr![i]
-//                md.goods_price = textField.text
-//                //记录哪个更改了
-//                md.is_edit = 1
-//            }
-//        }
-//        return true
-//    }
+ 
     
     var tableV :UITableView!
     

GeliBusinessPlatform/ViewController/订单管理/预售价格修改/XiuGaiYuShouJiaViewController.swift

@@ -49,6 +49,8 @@ class XiuGaiYuShouJiaViewController: BaseViewController, UITextFieldDelegate {
                 countLbl.isHidden = true
                 dingJinTF.text = dataModel?.order_res?.sale_res?.dj_amount
                 weiKuanTF.text = dataModel?.order_res?.sale_res?.wk_amount
+                countLbl.text = "￥" +  (dataModel?.order_res?.goods_amount)!
+
             }
         }else{
             //MARK:--代客下单流程