详情预售修正

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

@@ -612,13 +612,13 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                 titles.add(contentArr[num])
             }
         }
-        for title in titles {
-            let str = title as! String
+        
+        if titles.componentsJoined(by: ",").contains("预售") {
+            isYuShouShangPin = true
+        }else{
             isYuShouShangPin = false
-            if str == "预售"{
-                isYuShouShangPin = true
-            }
         }
+        print("isYuShouShangPin == ",isYuShouShangPin)
         tishixxArr.insert(titles.componentsJoined(by: ","), at: view.tag)
         tishixxArr.remove(at: view.tag+1)
         if itemTypeArr == [99,99,99,99] {
@@ -670,8 +670,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         vc.weight = dataDict.weight
         vc.wenDu = dataDict.wenDu
         vc.danWei = dataDict.danWei
-        vc.isNonYuShou = dataDict.isNonYuShou
-        vc.isYuShouSetting = dataDict.isYuShouSetting
+        print("test == ",isYuShouShangPin!)
+//        vc.isNonYuShou = isYuShouShangPin!
+        vc.isYuShouSetting = isYuShouShangPin!
         vc.yuShouPrice = dataDict.yuShouPrice
         vc.specalArr = dataDict.specalArr
         vc.jieTiArr = dataDict.jieTiArr
@@ -695,14 +696,13 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         vc.barTitle = "新增规格"
         vc.delegate = self
         vc.danWeiArr = generalInfoModel?.data!.unit
-        vc.isYuShouSetting = isYuShou
-        vc.isNonYuShou = isYuShou
+        vc.isYuShouSetting = isYuShouShangPin!
         vc.datasArr = guiGeArr
         vc.selectIdx = selectIdx
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
-    //MARK: - 新增、编辑规格
+    //MARK: - 新增、编辑规格数据返回
     func CreatNewSpecsViewControllerSaveAction(datas: Array<GuiGeModel>,selectIdx:IndexPath) {
         guiGeArr = datas
         self.selectIdx = selectIdx

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

@@ -43,7 +43,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     
     var selectYuShou:Bool = false//是否选择设置预售价格
     
-    var isNonYuShou:Bool = false //是否选择预售价格
+//    var isNonYuShou:Bool = false //是否选择预售价格
     
     var yuShouPrice:String = ""//预售设置数据记录
     //选择页面
@@ -182,7 +182,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         dataModel.danWei = danWei
         dataModel.jieTiArr = jieTiArr as! Array<Any>
         dataModel.specalArr = specalArr as! Array<Any>
-        dataModel.isNonYuShou = isNonYuShou
+//        dataModel.isNonYuShou = isNonYuShou
         dataModel.isYuShouSetting = isYuShouSetting
         dataModel.yuShouPrice = yuShouPrice
         dataModel.itemDanWeiSelect = itemDanWeiSelect
@@ -317,7 +317,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             cell.namelbl.text = "预售设置"
             cell.infoSw.isOn = isYuShouSetting
             cell.tag = 5
-            if isNonYuShou  == false{
+            if isYuShouSetting  == false{
                 cell.namelbl.alpha = 0.45
                 cell.isUserInteractionEnabled = false
             }
@@ -626,8 +626,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         weight = dataDict.weight
         wenDu = dataDict.wenDu
         danWei = dataDict.danWei
-        isNonYuShou = dataDict.isNonYuShou
-        isYuShouSetting = dataDict.isYuShouSetting
         yuShouPrice = dataDict.yuShouPrice
         specalArr = dataDict.specalArr
         jieTiArr = dataDict.jieTiArr

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

@@ -19,8 +19,8 @@ class GuiGeModel: NSObject {
     var wenDu : String = ""
     ///单位
     var danWei : String = ""
-     ///是否预售
-    var isNonYuShou : Bool = false
+//     ///是否预售
+//    var isNonYuShou : Bool = false
      ///是否打开预售设置
     var isYuShouSetting : Bool = false
      ///预售价格