单预售情况

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

@@ -444,9 +444,9 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             self.goods_unit = (model.data?.goods_res!.goods_unit)!
             //商品类型
             if model.data?.goods_res!.is_adsale == 0{
-                self.itemTypeArr = [99,99,99,99]
+                self.itemTypeArr = [99,99,99,99,99]
             }else{
-                self.itemTypeArr = [0,99,99,99]
+                self.itemTypeArr = [0,99,99,99,99]
             }
             if (model.data?.goods_res!.goods_type)! == 1 || (model.data?.goods_res!.goods_type)! == 2 {
                 self.itemTypeArr?.insert(1, at: 1)
@@ -480,6 +480,9 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             for num in self.itemTypeArr! {
                 if num != 99{
                     if num > 1 {
+                        if num == 5 {
+                            break
+                        }
                         titles.add(contentArr[num-1])
                     }else{
                         titles.add(contentArr[num])
@@ -556,6 +559,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                         data.isYsJieTiOpen = true
                     }
                     //预售价格
+                    print(dataSource.adsale_pri)
                     data.yuShouPrice = dataSource.adsale_pri!
                     //预售库存
                     data.ysKuCun = StringByInt(number: dataSource.adsale_inventory!)
@@ -1274,7 +1278,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         let titles = NSMutableArray()
         titles.removeAllObjects()
         for num in itemTypeArr! {
-            if num != 99{
+            if num != 99 && num != 5{
                 titles.add(contentArr[num])
             }
         }
@@ -1342,10 +1346,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         vc.danWei = dataDict.danWei
         vc.isJieTiOpen = dataDict.isJieTiOpen
         vc.isYuShouSetting = isYuShouShangPin!
+        
         vc.yuShouPrice = dataDict.yuShouPrice
         vc.specalArr = dataDict.specalArr
         vc.jieTiArr = dataDict.jieTiArr
-        vc.isOpenYSSetting = dataDict.isOpenYSSetting
+        //        vc.isOpenYSSetting = dataDict.isOpenYSSetting
         vc.selectIdx = selectIdx
         vc.itemDanWeiSelect = dataDict.itemDanWeiSelect
         if dataDict.tempSelect != nil {
@@ -1589,7 +1594,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             if goodsDesc.count > 0 {//有内容
                 return webH
             }else{//无内容
-                if isAllEditing {//非编辑
+                if isAllEditing == false {//非编辑
                     return 0.001
                 }else{//编辑
                     return 98

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

@@ -923,7 +923,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         vc.yuShouPrice = dataDict.yuShouPrice
         vc.specalArr = dataDict.specalArr
         vc.jieTiArr = dataDict.jieTiArr
-        vc.isOpenYSSetting = dataDict.isOpenYSSetting
+//        vc.isOpenYSSetting = dataDict.isOpenYSSetting
         vc.selectIdx = selectIdx
         vc.itemDanWeiSelect = dataDict.itemDanWeiSelect
         vc.tempSelect = dataDict.tempSelect!

GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift

@@ -48,7 +48,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     var isJieTiOpen = false//控制阶梯价是否打开
     var isYsJieTiOpen = false//控制预售阶梯是否打开
     
-    var isOpenYSSetting = false//是否打开预售设置
+//    var isOpenYSSetting = false//是否打开预售设置
     var selectYuShou = false//是否选择设置预售价格
     
     
@@ -200,7 +200,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         dataModel.itemDanWeiSelect = itemDanWeiSelect
         dataModel.tempSelect = tempSelect
         dataModel.isJieTiOpen = isJieTiOpen
-        dataModel.isOpenYSSetting = isOpenYSSetting
+//        dataModel.isOpenYSSetting = isOpenYSSetting
         if DJBiLi.count == 0 {
             DJBiLi = "0"
         }
@@ -360,11 +360,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         if indexPath.section == 1{
             cell.namelbl.text = "预售设置"
             if isYuShouSetting  == false{
-                isOpenYSSetting = isYuShouSetting
                 cell.namelbl.alpha = 0.45
                 cell.isUserInteractionEnabled = false
-            }else{
-                cell.infoSw.isOn = isOpenYSSetting
             }
             cell.tag = 5
             
@@ -373,13 +370,14 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         if indexPath.section == 1 {
             if isYuShouSetting == true {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "YuShou") as! YuShouCell
+                cell.infoSw.isHidden = true
                 cell.inputTF1.isUserInteractionEnabled = isAllEditing
                 cell.inputTF2.isUserInteractionEnabled = isAllEditing
                 cell.inputTF2.keyboardType = .numberPad
                 cell.inputTF3.isUserInteractionEnabled = isAllEditing
                 cell.tag = indexPath.row
                 cell.infoSw.isUserInteractionEnabled = isAllEditing
-                cell.infoSw.isOn = isOpenYSSetting
+//                cell.infoSw.isOn = isOpenYSSetting
                 cell.delegate = self
                 cell.inputTF1.text = yuShouPrice
                 cell.inputTF2.text = ysKuCun
@@ -444,10 +442,12 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         if indexPath.section == 1 {
             if isYuShouSetting == false{
                 return 0.001
-            }
-            if isOpenYSSetting {
+            }else{
                  return 184.5
             }
+//            if isOpenYSSetting {
+//
+//            }
         }
         if indexPath.section == 2 {
             if isJieTiOpen && selectYuShou == false {
@@ -642,7 +642,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         //控制
         if cell.tag == 5{
             let idxPath = IndexPath(row: 0, section: 1)
-            if isYuShouSetting && isOpenYSSetting  {//单独点击预售设置
+            if isYuShouSetting   {//单独点击预售设置
                 listTbv.reloadData()
             }else{//单独打开预售设置
                 listTbv.reloadRows(at: [idxPath], with: .none)
@@ -672,7 +672,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     func YuShouCellSwitchStatus(sender: UISwitch) {
         //控制
         //        isYuShouSetting = sender.isOn
-        isOpenYSSetting = sender.isOn
+//        isOpenYSSetting = sender.isOn
         listTbv.reloadData()
     }
     func PuTongJieTiDelAction(sender: PuTongJieTiCell) {
@@ -740,7 +740,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         specalArr = dataDict.specalArr
         jieTiArr = dataDict.jieTiArr
         isJieTiOpen = dataDict.isJieTiOpen
-        isOpenYSSetting = dataDict.isOpenYSSetting
+//        isOpenYSSetting = dataDict.isOpenYSSetting
         DJBiLi = dataDict.DJBiLi
         isYsJieTiOpen = dataDict.isYsJieTiOpen
         ysKuCun = dataDict.ysKuCun