修改规格完成

GeliBusinessPlatform/Define/Define.swift

@@ -246,6 +246,17 @@ func dataChangeString(sender:Array<Any>) -> String{
     
     return str
 }
+//MARK:--字符串转字典
+func getDictionaryFromJSONString(jsonString:String) ->NSDictionary{
+       
+       let jsonData:Data = jsonString.data(using: .utf8)!
+       
+       let dict = try? JSONSerialization.jsonObject(with: jsonData, options: .mutableContainers)
+       if dict != nil {
+           return dict as! NSDictionary
+       }
+       return NSDictionary()
+   }
 //MARK:--字典转字符串
 func dictChangeString(sender:Dictionary<String, String>) -> String{
     var str = ""

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -408,7 +408,9 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
     }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         print("选中===\(indexPath)")
+        let item = collection?.cellForItem(at: indexPath) as! GoodsCollectionViewCell
         let vc = EPViewController()
+        vc.titleStrArr = [item.leftBtn.titleLabel!.text!,item.rightBtn.titleLabel!.text!]
         let data = items[indexPath.row]
         vc.goods_id = data.goods_id
         self.navigationController?.pushViewController(vc, animated: true)

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

@@ -84,10 +84,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     var shiFouSH = false //是否审核
     var faHuoTime = ""//发货时间
     //预售时间段
-    var dj_time_start:Int? = 0
-    var dj_time_end:Int? = 0
-    var wk_time_start:Int? = 0
-    var wk_time_end:Int? = 0
+    var dj_time_start:Double? = 0
+    var dj_time_end:Double? = 0
+    var wk_time_start:Double? = 0
+    var wk_time_end:Double? = 0
     
     
     var isAllEditing = false
@@ -224,7 +224,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     need_check = 1
                 }
             }else{
-//                faHuoTime = ""
+                //                faHuoTime = ""
                 dj_time_start = 0
                 dj_time_end = 0
                 wk_time_start = 0
@@ -287,7 +287,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 self.isAllEditing = false
                 self.listTbv.reloadData()
             }) { (error) in
-
+                
             }
             break
         case "入库":
@@ -342,7 +342,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             if model.data?.goods_res!.is_adsale == 0{
                 self.itemTypeArr = [99,99,99,99]
             }else{
-                self.itemTypeArr = [1,99,99,99]
+                self.itemTypeArr = [0,99,99,99]
             }
             if (model.data?.goods_res!.goods_type)! == 1 || (model.data?.goods_res!.goods_type)! == 2 {
                 self.itemTypeArr?.insert(1, at: 1)
@@ -392,7 +392,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             //是否有封面图
             self.singleImgArr = [ (model.data?.goods_res!.original_img)!]//单张图
             self.original_img = (model.data?.goods_res!.original_img)!
-           
+            
             
             //商品规格
             if (model.data?.sku_res?.count)! > 0{
@@ -405,7 +405,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     data.sku_id = dataSource.sku_id!//sku_id
                     let arr = dataSource.spec_str?.components(separatedBy: ":")
                     data.guiGe = (arr?.last)!//规格
-                    data.weight = dataSource.pack_attr!//重量
+                    let dict = getDictionaryFromJSONString(jsonString: dataSource.pack_attr!)
+                    data.weight = dict["wg"] as! String//重量
                     data.wenDu = dataSource.refrigerate!//温藏
                     //预售设置
                     data.isOpenYSSetting = false
@@ -442,17 +443,34 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     if dataSource.adsale_tiered_pri!.count > 0 {
                         data.specalArr = self.getResponseArr(str:dataSource.adsale_tiered_pri!)
                     }
-                    print("data P = ",data.price)
                     self.guiGeArr.append(data)
                 }
             }
+            //是否审核
+            self.shiFouSH = false
+            if model.data?.goods_res?.need_check == 1 {
+                self.shiFouSH = true
+            }
+            //预设预付定金时间段
+            let begin = dayByDouble(sender: (model.data?.goods_res!.dj_time_start)!) + "-" + dayByDouble(sender: (model.data?.goods_res!.dj_time_end)!)
+            self.dj_time_start = (model.data?.goods_res!.dj_time_start)
+            self.dj_time_end = (model.data?.goods_res!.dj_time_end)
+            self.ysszHolder.insert(begin, at: 1)
+            self.ysszHolder.remove(at: 2)
+            //预设预付尾款时间段
+            let end = dayByDouble(sender: (model.data?.goods_res!.wk_time_start)!) + "-" + dayByDouble(sender: (model.data?.goods_res!.wk_time_end)!)
+            self.wk_time_start = (model.data?.goods_res!.wk_time_start)
+            self.wk_time_end = (model.data?.goods_res!.wk_time_end)
+            self.ysszHolder.insert(end, at: 2)
+            self.ysszHolder.remove(at: 3)
             //发货时间
-            self.faHuoTime = "\(String(describing: model.data?.goods_res?.set_time))"
-            print("==== ",model.data?.goods_res?.set_time,self.faHuoTime)
+            if model.data?.goods_res?.set_time != nil {
+                self.faHuoTime = "\(model.data!.goods_res!.set_time!)"
+            }
             //商品主图
-           for item in model.data!.banner_res! {
-               self.maxFiveImgsArr.append(item.img_original!)
-           }
+            for item in model.data!.banner_res! {
+                self.maxFiveImgsArr.append(item.img_original!)
+            }
             //商品附图
             let imgArr = model.data?.banner_res!
             if imgArr!.count > 0 {
@@ -471,7 +489,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             self.tishixxArr1.insert(self.countryArr[self.countrySelect!], at: 2)
             self.tishixxArr1.remove(at: 3)
             //商品状态
-            self.shangPinStatus = (model.data?.goods_res?.gs_id)!
+            self.shangPinStatus = (model.data?.goods_res?.gs_id)!-1
             self.tishixxArr1.insert((model.data?.goods_res!.gs_name)!, at: 3)
             self.tishixxArr1.remove(at: 4)
             //运输方式
@@ -602,7 +620,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 
                 cell.tempLbl.text = "冷藏：\(dict.wenDu)℃"
                 cell.weightLbl.text = "重量（kg）：\(dict.weight)kg"
-                cell.guiGeLbl.text = "规格：\(dict.guiGe)kg/件"
+                cell.guiGeLbl.text = "规格：\(dict.guiGe)"
                 cell.danWeiLbl.text = "单位：\(dict.danWei)"
                 cell.sellPriceLbl.text = "售价：¥\(dict.price)"
                 
@@ -686,7 +704,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     //MARK: - 底部广告软文跳转
     func AddGuiGeCellClick(cell: AddGuiGeCell) {
         print("底部广告软文跳转")
- 
+        
     }
     //MARK: -- 点击按钮事件，跳转或者展示选择界面
     func btnClick(content: String, cell: TitleAndBtnCell) {
@@ -799,13 +817,13 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         if isWeiTime {
             ysszHolder.insert(timeStr, at: 2)
             ysszHolder.remove(at: 3)
-            wk_time_start = Int(timeInterval)
-            wk_time_end = Int(timeIntervalEnd)
+            wk_time_start = Double(timeInterval)
+            wk_time_end = Double(timeIntervalEnd)
         }else{
             ysszHolder.insert(timeStr, at: 1)
             ysszHolder.remove(at: 2)
-            dj_time_start = Int(timeInterval)
-            dj_time_end = Int(timeIntervalEnd)
+            dj_time_start = Double(timeInterval)
+            dj_time_end = Double(timeIntervalEnd)
         }
         listTbv.reloadData()
         
@@ -864,7 +882,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                         //                    print("上传图片==\(image)")
                         //                        self.maxFiveImgsArr.append(image!)
                         //                        let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
-                        self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count)
+                        self.maxFiveImgsArr.append("insert")
+                        self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count-1)
                         
                     })
                 }
@@ -1285,7 +1304,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     var shop_price: Float = 0.0
     var goods_unit = ""
     var sku_info = ""
-//    var is_del = 0
+    //    var is_del = 0
     func getUpSkuInfoEditByData(dataArr:Array<GuiGeModel>) {
         
         var price: Float = 0.0
@@ -1333,8 +1352,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     
                 }
             }
-           
-            //            //预售价
+            
+            //预售价
             var is_adsale_tiered = 0
             var adsale_tiered_pri:Dictionary<String, String>  = [:]
             if item.isOpenYSSetting {
@@ -1370,7 +1389,8 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             }
             
             let pack_attr = ["l":"0","w":"0","h":"0","wg":item.weight,"v":"0"]
-            
+            let packAttrStr = dictChangeString(sender: pack_attr)
+
             var is_open_adsale = 0
             var adsale_pri = ""
             var adsale_inventory = ""
@@ -1382,14 +1402,14 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 adsale_inventory = item.ysKuCun
                 pct = item.DJBiLi
             }
-
+            
             var sku = ["sku_sn":"",
                        "sku_id":item.sku_id,
                        "goods_id":goods_id,
                        "is_del":0,
                        "spec_id":"1",
                        "attr":item.guiGe,
-                       "pack_attr":pack_attr,
+                       "pack_attr":packAttrStr,
                        "refrigerate":item.wenDu,
                        "unit":item.danWei,
                        "price":item.price,
@@ -1405,11 +1425,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 sku.updateValue(tieredPriStr, forKey: "tiered_pri")
             }else{
                 sku.updateValue("", forKey: "tiered_pri")
-
+                
             }
             if adsale_tiered_pri.keys.count > 0 {
                 let adsaletieredPriStr = dictChangeString(sender: adsale_tiered_pri)
-
+                
                 sku.updateValue(adsaletieredPriStr, forKey: "adsale_tiered_pri")
             }else{
                 sku.updateValue("", forKey: "adsale_tiered_pri")
@@ -1502,7 +1522,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         var data2:Array<Dictionary<String, Any>> = []
         for item in tempArr {
             if item.count > 0 {
-            var data:Dictionary<String, Any> = [:]
+                var data:Dictionary<String, Any> = [:]
                 data.updateValue(goods_id, forKey: "goods_id")
                 data.updateValue(0, forKey: "img_id")
                 data.updateValue(item, forKey: "banner_img")
@@ -1533,10 +1553,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         }
         var data4 = data3 + data2 + data1
         return dataChangeString(sender:data4)
-
+        
     }
+    
    
-
+    
 }
 
 

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

@@ -75,10 +75,10 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     var shiFouSH = false //是否审核
     var faHuoTime = ""//发货时间
     //预售时间段
-    var dj_time_start:Int? = 0
-    var dj_time_end:Int? = 0
-    var wk_time_start:Int? = 0
-    var wk_time_end:Int? = 0
+    var dj_time_start:Double? = 0
+    var dj_time_end:Double? = 0
+    var wk_time_start:Double? = 0
+    var wk_time_end:Double? = 0
  
     //MARK:--保存按钮
     @IBAction func submitAction(_ sender: Any) {
@@ -590,13 +590,13 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         if isWeiTime {
             ysszHolder.insert(timeStr, at: 2)
             ysszHolder.remove(at: 3)
-            wk_time_start = Int(timeInterval)
-            wk_time_end = Int(timeIntervalEnd)
+            wk_time_start = Double(timeInterval)
+            wk_time_end = Double(timeIntervalEnd)
         }else{
             ysszHolder.insert(timeStr, at: 1)
             ysszHolder.remove(at: 2)
-            dj_time_start = Int(timeInterval)
-            dj_time_end = Int(timeIntervalEnd)
+            dj_time_start = Double(timeInterval)
+            dj_time_end = Double(timeIntervalEnd)
         }
         listTbv.reloadData()
 
@@ -653,7 +653,8 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                         //                    print("上传图片==\(image)")
 //                        self.maxFiveImgsArr.append(image!)
 //                        let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
-                        self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count)
+                        self.maxFiveImgsArr.append("insert")
+                        self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count-1)
 
                     })
                 }

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

@@ -44,6 +44,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     var selectIdx:IndexPath?
     var isYuShouSetting = false//打开预售
     
+    @IBOutlet weak var btmLblH: NSLayoutConstraint!
     var isJieTiOpen = false//控制阶梯价是否打开
     var isYsJieTiOpen = false//控制预售阶梯是否打开
     
@@ -90,6 +91,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             isAllEditing = false
             bottomBtn.isHidden = true
             btmLbl.isHidden = true
+            btmLblH.constant = 0
         }
         if datasArr.count > 1 && barTitle!.contains("编辑") == true {//展示topbar
             
@@ -422,7 +424,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             if isYsJieTiOpen && selectYuShou {
                 return 49
             }
-                return 0.001
+            return 0.001
             
         }
         return 49
@@ -467,15 +469,17 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     //footer
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         if section == 2 {
-            if isJieTiOpen && selectYuShou == false{
-                let view = NewCreateFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
-                view.delegate = self
-                return view
-            }
-            if isYsJieTiOpen && selectYuShou{
-                let view = NewCreateFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
-                view.delegate = self
-                return view
+            if barTitle?.contains("查看") == false {
+                if isJieTiOpen && selectYuShou == false{
+                    let view = NewCreateFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
+                    view.delegate = self
+                    return view
+                }
+                if isYsJieTiOpen && selectYuShou{
+                    let view = NewCreateFooter(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
+                    view.delegate = self
+                    return view
+                }
             }
         }
         let view = UIView()

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

@@ -8,10 +8,11 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CreatNewSpecsViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CreatNewSpecsViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="bottomBtn" destination="Y0N-V9-rbQ" id="cyL-aV-aEN"/>
                 <outlet property="btmLbl" destination="cfi-M7-imX" id="nul-AS-3bD"/>
+                <outlet property="btmLblH" destination="vek-sO-irU" id="oFb-8u-5yE"/>
                 <outlet property="listTbv" destination="bSh-mx-Kzg" id="xwd-1s-qv3"/>
                 <outlet property="topBarView" destination="58G-5f-0zb" id="HDH-SB-fbX"/>
                 <outlet property="topBarViewH" destination="BMm-7O-bZv" id="ygO-Sq-gGh"/>