调整产品要求

GeliBusinessPlatform/ViewController/应付账款/YingFuZKListViewController.xib

@@ -57,7 +57,7 @@
                             <color key="textColor" name="灰色字体颜色"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥-594153" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nKi-IO-Opl">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nKi-IO-Opl">
                             <rect key="frame" x="148" y="1" width="266" height="47"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="textColor" name="#F57575"/>

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift

@@ -51,10 +51,11 @@ class YingFuZhangKuanXQCell: UITableViewCell {
                 priceLbl2.text = data?.money
             }
             submitBtn.isUserInteractionEnabled = true
+//            print("abc === ",data?.type,data?.status)
             if data?.type == 2 && data?.status == 0 {
                 submitBtn.backgroundColor = UIColor.clear
                 submitBtn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
-                submitBtn.setTitle("未收", for: .normal)
+                submitBtn.setTitle("设置未收款", for: .normal)
                 submitBtn.layer.borderWidth = 1
             }else if data?.type == 1 && data?.status == 1 {
                 submitBtn.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")
@@ -81,7 +82,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
             priceLbl3.text = model?.payable_money
             submitBtn.backgroundColor = UIColor.clear
             submitBtn.setTitleColor(UIColor(named: "灰色字体颜色"), for: .normal)
-            submitBtn.setTitle("设置未收款", for: .normal)
+            submitBtn.setTitle("设置未付款", for: .normal)
             submitBtn.layer.borderWidth = 1
             if model?.status == 1 {
                 submitBtn.backgroundColor = UIColor(named: "按钮渐变色下,字体颜色")

GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift

@@ -47,7 +47,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.listView.mj_header?.beginRefreshing()
             }) { (err) in}
             break
-        case "设置未收款":
+        case "设置未付款":
             let model = dataArr[cellTag]
             dict["po_id"] = model.po_id
             dict["pay_type"] = 0
@@ -264,7 +264,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.view.addSubview(view)
             }
             break
-        case "设置未收款":
+        case "设置未付款":
             if glSelectView == nil {
                 view.titleLbl.text = "请选择付款状态"
                 view.selectNum = 0
@@ -281,7 +281,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                 self.view.addSubview(view)
             }
             break
-        case "未收":
+        case "设置未收款":
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -376,8 +376,14 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
                     self.datas.append(item)
                 })
                 self.first = model.data?.arrears_money! as! String
+                self.second = "0.00"
+                if model.data!.jf != nil {
                     self.second = "\(model.data!.jf!)"
+                }
+                self.third = "0.00"
+                if model.data!.df != nil {
                     self.third = "\(model.data!.df!)"
+                }
                 
                 self.listView.reloadData()
                 self.listView.mj_header?.endRefreshing()

GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.swift

@@ -125,6 +125,10 @@ class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITa
             let cell = tableView.dequeueReusableCell(withIdentifier: "TilteAndTextView") as! TilteAndTextViewCell
             cell.titleLbl.text = titleArr[indexPath.row]
             cell.holderLbl.text = "简述品牌体征。"
+            cell.holderLbl.isHidden = false
+            if commend.count > 0 {
+                cell.holderLbl.isHidden = true
+            }
             cell.textView.text = commend
             cell.delegate = self
             if (navTitle?.contains("详情"))!{