修改部分UIbug

张旭
1 parent dedcbc4f
Showing 6 changed files with 78 additions and 77 deletions
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveCreateShopClassifyViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/Model/GoodsDetail/CNLiveShopGoodsDetailsModel.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift
@@ -31,7 +31,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
     let kCNLiveShopClassilyIconTableViewCellID = "kCNLiveShopClassilyIconTableViewCellID"
     /// 编辑状态
-    var isEdite:Bool?
+    var isEdite:Bool = false
     /// 编辑的数据
     var shopClassifyModel:CNLiveShopClassifyModel?
     /// 表
@@ -150,7 +150,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
                 return cell
             }
             self.titleField = cell.textFiled
-            if self.isEdite!{
+            if self.isEdite == true{
                 cell.textFiled.text = self.shopClassifyModel?.title
             }
             return cell
@@ -164,7 +164,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
             cell.uploadImageSuceessBlock = {imageUrl in
                 self.shopClassifyModel?.simg = imageUrl
             }
-            if self.isEdite!{
+            if self.isEdite{
                 if self.shopClassifyModel?.simg?.count ?? 0 > 0{
                     cell.selectUploadImageView?.networkImageArr = [self.shopClassifyModel?.simg ?? ""]
                 }
@@ -25,9 +25,9 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     // MARK: - 属性
     //开始输入前的文本
-    var firCategoryId:String?
-    var secCategoryId:String?
-    var thiCategoryId:String?
+    var firCategoryId:Int = 0
+    var secCategoryId:Int = 0
+    var thiCategoryId:Int = 0
     var firCategoryName:String?
     var secCategoryName:String?
     var thiCategoryName:String?
@@ -116,7 +116,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if (_temp_selectFirCategoryModel?.id!.count)! > 0{
+            if _temp_selectFirCategoryModel?.id ?? 0 > 0{
                 self.firCategoryBtn?.setTitle(_temp_selectFirCategoryModel?.title, for: .normal)
             }else{
                 self.firCategoryBtn?.setTitle("请选择", for: .normal)
@@ -135,7 +135,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if (_temp_selectSecCategoryModel?.id?.count)! > 0{
+            if _temp_selectSecCategoryModel?.id ?? 0 > 0{
                 self.secCategoryBtn?.setTitle(_temp_selectSecCategoryModel?.title, for: .normal)
                 self.secCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
             }else{
@@ -160,7 +160,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if _temp_selectThiCategoryModel!.id!.count > 0{
+            if _temp_selectThiCategoryModel!.id > 0{
                 self.thiCategoryBtn?.setTitle(_temp_selectThiCategoryModel?.title, for: .normal)
                 self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
             }else{
@@ -180,18 +180,18 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         self.view.backgroundColor = .clear
         self.topNavView.removeFromSuperview()
         self.initUI()
-        if self.firCategoryId == "0" || self.firCategoryId?.count == 0{
-            self.secCategoryId = "0"
-            self.thiCategoryId = "0"
-        }else if self.secCategoryId == "0" || self.secCategoryId?.count == 0{
-            self.thiCategoryId = "0"
+        if self.firCategoryId == 0{
+            self.secCategoryId = 0
+            self.thiCategoryId = 0
+        }else if self.secCategoryId == 0 || self.secCategoryId == 0{
+            self.thiCategoryId = 0
         }
         if self.categoryType == .goods{
             self.postDataWithPid(pid: "0", level: 1) {
-                if self.secCategoryId?.count ?? 0 > 0 && self.secCategoryId != "0"{
-                    self.postDataWithPid(pid: self.firCategoryId ?? "", level: 2) {
-                        if self.thiCategoryId?.count ?? 0 > 0 && self.thiCategoryId != "0"{
-                            self.postDataWithPid(pid: self.secCategoryId ?? "", level: 3) {
+                if self.secCategoryId > 0{
+                    self.postDataWithPid(pid:String(format: "%d", self.firCategoryId), level: 2) {
+                        if self.thiCategoryId > 0{
+                            self.postDataWithPid(pid:String(format: "%d",self.secCategoryId), level: 3) {
                             }
                         }
                     }
@@ -353,14 +353,14 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         if self.categoryType == .goods{
             if self.displayLevel == 1{
                 let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                self.postDataWithPid(pid: model.id!, level: 2) {
+                self.postDataWithPid(pid: String(format: "%d", model.id), level: 2) {
                     self.temp_selectFirCategoryModel = model
                     self.temp_selectSecCategoryModel = nil
                     self.temp_selectThiCategoryModel = nil
                 }
             }else if (self.displayLevel == 2) {
                 let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                self.postDataWithPid(pid: model.id!, level: 3) {
+                self.postDataWithPid(pid: String(format: "%d", model.id), level: 3) {
                     self.temp_selectSecCategoryModel = model
                     self.temp_selectThiCategoryModel = nil
                 }
@@ -373,7 +373,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             if (self.displayLevel == 1) {
                 let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
                 let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
-                tempFirMdl.id = model.id
+                tempFirMdl.id = Int(model.id ?? "0")!
                 tempFirMdl.title = model.title
                 self.temp_selectFirCategoryModel = tempFirMdl
                 self.temp_selectSecCategoryModel = nil
@@ -387,7 +387,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else if (self.displayLevel == 2){
                 let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
                 let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
-                tempFirMdl.id = model.id
+                tempFirMdl.id = Int(model.id ?? "0")!
                 tempFirMdl.title = model.title
                 self.temp_selectSecCategoryModel = tempFirMdl
                 self.tableView.reloadData()
@@ -420,11 +420,11 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }
         }
-        self.firCategoryId = self.temp_selectFirCategoryModel?.id
+        self.firCategoryId = self.temp_selectFirCategoryModel?.id ?? 0
         self.firCategoryName = self.temp_selectFirCategoryModel?.title
-        self.secCategoryId = self.temp_selectSecCategoryModel?.id
+        self.secCategoryId = self.temp_selectSecCategoryModel?.id ?? 0
         self.secCategoryName = self.temp_selectSecCategoryModel?.title
-        self.thiCategoryId = self.temp_selectThiCategoryModel?.id
+        self.thiCategoryId = self.temp_selectThiCategoryModel?.id ?? 0
         self.thiCategoryName = self.temp_selectThiCategoryModel?.title
         self.finishBlock!()
         self.hide()
@@ -509,7 +509,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                     self.temp_selectThiCategoryModel = nil
                     self.secCategoryDataArr.removeAllObjects()
                     self.thiCategoryDataArr.removeAllObjects()
-                    if self.firCategoryId?.count ?? 0 > 0 && self.firCategoryId != "0"{
+                    if self.firCategoryId > 0{
                         let tempDataArr = Array(self.firCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
@@ -525,7 +525,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                     self.temp_selectSecCategoryModel = nil
                     self.temp_selectThiCategoryModel = nil
                     self.thiCategoryDataArr.removeAllObjects()
-                    if self.secCategoryId?.count ?? 0 > 0 && self.secCategoryId != "0"{
+                    if self.secCategoryId > 0{
                         let tempDataArr = Array(self.thiCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
                             let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
@@ -540,7 +540,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                 }else if (level == 3) {
                     self.thiCategoryDataArr = NSMutableArray(array: dataArr)
                     self.temp_selectThiCategoryModel = nil
-                    if self.thiCategoryId?.count ?? 0 > 0 && self.thiCategoryId != "0"{
+                    if self.thiCategoryId > 0{
                         let tempDataArr = Array(self.thiCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
                             let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
@@ -280,6 +280,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             self.addChild(vc)
             vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
             vc.didMove(toParent: self)
+            self.view.addSubview(vc.view)
             self.selectCategoryVC = vc
         }
         self.selectCategoryVC?.display()
@@ -369,13 +370,13 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请选择商品详情图")
             return
         }
-        else if (self.selectShopClassifyVC.firCategoryId!.count == 0) {
+        else if (self.selectShopClassifyVC.firCategoryId == 0) {
             showMessage(message: "请选择店铺分类")
             return
         }
         let goodsDetailsModel = CNLiveShopGoodsDetailsModel()
-        var bannerImage = NSMutableArray()
+        let bannerImage = NSMutableArray()
         for imageUrl in bannersSelectImageUrls {
             let model = CNLiveShopGoodsDetailsModel()
             model.simg = imageUrl
@@ -396,19 +397,19 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         goodsDetailsModel.prices = singleView8.contentTextField.text
         goodsDetailsModel.category_id = self.selectShopClassifyVC.firCategoryId
         goodsDetailsModel.category_id2 = self.selectShopClassifyVC.secCategoryId
-        var contentDetailsImage = NSMutableArray()
+        let contentDetailsImage = NSMutableArray()
         for imageUrl in contentDetailsSelectImageUrls{
             let model = CNLiveGoodsDetailsContentModel()
             model.simg = imageUrl
             contentDetailsImage.add(model)
         }
         goodsDetailsModel.detail_img = Array(contentDetailsImage) as! [CNLiveGoodsDetailsContentModel]
-        var kvArray = NSMutableArray()
+        let kvArray = NSMutableArray()
         kvArray.add(["k":"品名","v":singleView18.contentTextField.text])
         kvArray.add(["k":"规格","v":singleView19.contentTextField.text])
         kvArray.add(["k":"寄送区域","v":singleView20.contentTextField.text])
         kvArray.add(["k":"发货时效","v":singleView21.contentTextField.text])
-        var tempArray = NSMutableArray(array: self.bgScrollView.subviews)
+        let tempArray = NSMutableArray(array: self.bgScrollView.subviews)
         let subArr = tempArray.subarray(with: NSRange(location: 0, length: tempArray.index(of: singleView19)))
         tempArray.removeObjects(in: subArr)
@@ -464,7 +465,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
         let bannersSelectImageUrls = singleView4.uploadImageView.getCurrentSelectImageUrls()
-        var bannerImage = NSMutableArray()
+        let bannerImage = NSMutableArray()
         for imageUrl in bannersSelectImageUrls{
             bannerImage.add(["img":imageUrl,"ord":"99"])
         }
@@ -480,7 +481,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let bannerSelectVideoUrl = singleView4.uploadImageView.getCurrentSelectVideoUrl()
         let contentDetailsSelectImageUrls = singleView13.uploadImageView.getCurrentSelectImageUrls()
-        var contentDetailsImage = NSMutableArray()
+        let contentDetailsImage = NSMutableArray()
         for imageUrl in contentDetailsSelectImageUrls{
             contentDetailsImage.add(["img":imageUrl,"ord":"99"])
         }
@@ -493,10 +494,10 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: "\\", with: "")
             contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: " ", with: "")
         } catch _ {}
-        if self.type == .add && self.selectCategoryVC?.thiCategoryId?.count == 0{
+        if self.type == .add && self.selectCategoryVC?.thiCategoryId == 0{
             showMessage(message: "请选择商品分类")
             return
-        }else if self.selectShopClassifyVC.firCategoryId == nil || self.selectShopClassifyVC.firCategoryId?.count == 0 || self.selectShopClassifyVC.firCategoryId == "0"{
+        }else if self.selectShopClassifyVC.firCategoryId == 0{
             showMessage(message: "请选择店铺分类")
             return
         }else if bannersSelectImageUrls.count == 0 && bannerSelectVideoUrl.count == 0{
@@ -542,7 +543,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请输入发货时效")
             return
         }
-        var kvArray = NSMutableArray()
+        let kvArray = NSMutableArray()
         kvArray.add(["k":"品名","v":singleView18.contentTextField.text])
         kvArray.add(["k":"规格","v":singleView19.contentTextField.text])
         kvArray.add(["k":"寄送区域","v":singleView20.contentTextView.text])
@@ -563,7 +564,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             if i == 11 || i == 16{
                 continue
             }
-            var singleView = self.bgScrollView.viewWithTag(i) as! CNLiveShopAddGoodsSingleView
+            let singleView = self.bgScrollView.viewWithTag(i) as! CNLiveShopAddGoodsSingleView
             let content = (singleView.contentTextField.text?.isEmpty == true ? singleView.contentTextField.text : singleView.contentTextView.text) ?? ""
             if self.stringContainsEmoji(string: content){
                 showMessage(message: "参数不能添加表情")
@@ -582,15 +583,15 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 return
             }
         }
-        var category_id = ""
-        if self.selectShopClassifyVC.secCategoryId?.isEmpty == false {
-            category_id = self.selectShopClassifyVC.secCategoryId!
+        var category_id = 0
+        if self.selectShopClassifyVC.secCategoryId != 0 {
+            category_id = self.selectShopClassifyVC.secCategoryId
         }else{
-            category_id = self.selectShopClassifyVC.firCategoryId!
+            category_id = self.selectShopClassifyVC.firCategoryId
         }
         showLoading(message: "")
         if self.type == .add{
-            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId ?? "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text, price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage:self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: category_id) { result, status in
+            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId != 0 ? String(format: "%d", self.selectCategoryVC?.thiCategoryId ?? 0) : "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text, price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage:self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
                 hiddenLoading()
                 if status == .failed{
                     showMessage(message: "发布失败")
@@ -600,7 +601,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     showMessage(message: "发布成功")
                     NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageAddNotification, object: nil)
                     for i in 0..<self.dataModel.list.count{
-                        var singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
                         if singleView.addEditGoodsListModel?.style == "3"{
                             singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
                         }
@@ -609,7 +610,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 }
             }
         }else{
-            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId ?? "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text ?? "", price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage: self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: category_id) { result, status in
+            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3:self.selectCategoryVC?.thiCategoryId != 0 ? String(format: "%d", self.selectCategoryVC?.thiCategoryId ?? 0) : ""   , bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text ?? "", price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage: self.dicArrayToJson(kvArray as! [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
                 hiddenLoading()
                 if status == .failed{
                     showMessage(message: "修改失败")
@@ -619,7 +620,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     showMessage(message: "修改成功")
                     NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil, userInfo: (result as! Dictionary))
                     for i in 0..<self.dataModel.list.count{
-                        var singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
+                        let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
                         if singleView.addEditGoodsListModel?.style == "3"{
                             singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
                         }
@@ -681,43 +682,43 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 let model = result as! CNLiveShopGoodsDetailsModel
                 self.shopGoodsDetailsModel = model
                 //商品分类
-                var singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
                 //店铺分类
-                var singleView2 = self.bgScrollView.viewWithTag(2) as! CNLiveShopAddGoodsSingleView
+                let singleView2 = self.bgScrollView.viewWithTag(2) as! CNLiveShopAddGoodsSingleView
                 //商品轮播
-                var singleView4 = self.bgScrollView.viewWithTag(4) as! CNLiveShopAddGoodsSingleView
+                let singleView4 = self.bgScrollView.viewWithTag(4) as! CNLiveShopAddGoodsSingleView
                 //商品名称
-                var singleView5 = self.bgScrollView.viewWithTag(5) as! CNLiveShopAddGoodsSingleView
+                let singleView5 = self.bgScrollView.viewWithTag(5) as! CNLiveShopAddGoodsSingleView
                 //商品副标题
-                var singleView6 = self.bgScrollView.viewWithTag(6) as! CNLiveShopAddGoodsSingleView
+                let singleView6 = self.bgScrollView.viewWithTag(6) as! CNLiveShopAddGoodsSingleView
                 //本店售价
-                var singleView7 = self.bgScrollView.viewWithTag(7) as! CNLiveShopAddGoodsSingleView
+                let singleView7 = self.bgScrollView.viewWithTag(7) as! CNLiveShopAddGoodsSingleView
                 //市场售价
-                var singleView8 = self.bgScrollView.viewWithTag(8) as! CNLiveShopAddGoodsSingleView
+                let singleView8 = self.bgScrollView.viewWithTag(8) as! CNLiveShopAddGoodsSingleView
                 //商品重量
-                var singleView9 = self.bgScrollView.viewWithTag(9) as! CNLiveShopAddGoodsSingleView
+                let singleView9 = self.bgScrollView.viewWithTag(9) as! CNLiveShopAddGoodsSingleView
                 //最低起售
-                var singleView10 = self.bgScrollView.viewWithTag(10) as! CNLiveShopAddGoodsSingleView
+                let singleView10 = self.bgScrollView.viewWithTag(10) as! CNLiveShopAddGoodsSingleView
                 //上架
-                var singleView11 = self.bgScrollView.viewWithTag(11) as! CNLiveShopAddGoodsSingleView
+                let singleView11 = self.bgScrollView.viewWithTag(11) as! CNLiveShopAddGoodsSingleView
                 //商品详情图
-                var singleView13 = self.bgScrollView.viewWithTag(13) as! CNLiveShopAddGoodsSingleView
+                let singleView13 = self.bgScrollView.viewWithTag(13) as! CNLiveShopAddGoodsSingleView
                 //商品运费
-                var singleView14 = self.bgScrollView.viewWithTag(14) as! CNLiveShopAddGoodsSingleView
+                let singleView14 = self.bgScrollView.viewWithTag(14) as! CNLiveShopAddGoodsSingleView
                 //是否支持退货
-                var singleView15 = self.bgScrollView.viewWithTag(15) as! CNLiveShopAddGoodsSingleView
+                let singleView15 = self.bgScrollView.viewWithTag(15) as! CNLiveShopAddGoodsSingleView
                 //商品单位
-                var singleView16 = self.bgScrollView.viewWithTag(16) as! CNLiveShopAddGoodsSingleView
+                let singleView16 = self.bgScrollView.viewWithTag(16) as! CNLiveShopAddGoodsSingleView
                 //品名
-                var singleView18 = self.bgScrollView.viewWithTag(18) as! CNLiveShopAddGoodsSingleView
+                let singleView18 = self.bgScrollView.viewWithTag(18) as! CNLiveShopAddGoodsSingleView
                 //规格
-                var singleView19 = self.bgScrollView.viewWithTag(19) as! CNLiveShopAddGoodsSingleView
+                let singleView19 = self.bgScrollView.viewWithTag(19) as! CNLiveShopAddGoodsSingleView
                 //寄送区域
-                var singleView20 = self.bgScrollView.viewWithTag(20) as! CNLiveShopAddGoodsSingleView
+                let singleView20 = self.bgScrollView.viewWithTag(20) as! CNLiveShopAddGoodsSingleView
                 //发货时效
-                var singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
+                let singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
-                var tempArray = NSMutableArray(array: self.shopGoodsDetailsModel.storageArray)
+                let tempArray = NSMutableArray(array: self.shopGoodsDetailsModel.storageArray)
                 for dic in self.shopGoodsDetailsModel.storageArray{
                     let dict = dic as NSDictionary
                     if dict.object(forKey: "k") as! String == "品名"{
@@ -747,7 +748,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 singleView2.contentTextField.text = self.shopGoodsDetailsModel.cate_name
                 singleView2.layoutSubviews()
-                var bannerImageUrls = NSMutableArray()
+                let bannerImageUrls = NSMutableArray()
                 for model in self.shopGoodsDetailsModel.image{
                     bannerImageUrls.add(model.simg ?? "")
                 }
@@ -765,9 +766,9 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 singleView11.contentSwitch.isOn = self.shopGoodsDetailsModel.state == 2 ? true : false
                 singleView10.subtractBtn.setImage(UIImage(named: Int(self.shopGoodsDetailsModel.min_buy_num ?? "0")! > 1 ? "DS_main_unadd_count" : "DS_main_unadd_count_n"), for: .normal)
-                var contentDetailsImageUrls = NSMutableArray()
+                let contentDetailsImageUrls = NSMutableArray()
                 for model in self.shopGoodsDetailsModel.detail_img{
-                    contentDetailsImageUrls.add(model.simg)
+                    contentDetailsImageUrls.add(model.simg as Any)
                 }
                 singleView13.uploadImageView.networkImageArr = contentDetailsImageUrls as! Array<String>
                 if let array = contentDetailsImageUrls as? [String] {
@@ -779,7 +780,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 singleView4.uploadImageView.deleteImage = UIImage.imageWithColor(color: .clear, size: singleView4.uploadImageView.size)
                 singleView13.uploadImageView.deleteImage = UIImage.imageWithColor(color: .clear, size: singleView13.uploadImageView.size)
                 if tempArray.count > 0{
-                    var array = NSMutableArray(array: self.dataModel.list)
+                    let array = NSMutableArray(array: self.dataModel.list)
                     for i in 0..<tempArray.count{
                         let dict = tempArray.object(at: i) as! NSDictionary
                         let paramDict = ["style":1,"isHaveTo":false,"title":dict.object(forKey: "k"),"contentTextFieldkeyboardType":1,"isDisplayLine":true,"contentType":1,"isDelect":true,"content":dict.object(forKey: "v")]
@@ -354,7 +354,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
     @objc func textDidChange(sender:UITextField) {
         if (sender == self.countTF) {
-            if (self.countTF.text?.count ?? 0 > 0 &&  (self.countTF.text?.isPurnInt() == false)) {
+            if (self.countTF.text?.count ?? 0 > 0 &&  (self.countTF.text?.isPurnInt() == true)) {
                 let count:Int = (self.countTF.text! as NSString).integerValue
                 if (count <= 1) {
                     self.subtractBtn.setImage(UIImage(named: "DS_main_unadd_count_n"), for: .normal)
@@ -114,11 +114,11 @@ class CNLiveShopGoodsDetailsModel:BaseModel{
     /**
      店铺商品分类id,一级分类id
      */
-    var category_id:String?
+    var category_id:Int = 0
     /**
      店铺商品分类id,二级分类id
      */
-    var category_id2:String?
+    var category_id2:Int = 0
     /**
      店铺商品分类名
      */
@@ -126,15 +126,15 @@ class CNLiveShopGoodsDetailsModel:BaseModel{
     /**
      平台分类id 1级
      */
-    var groupid:String?
+    var groupid:Int = 0
     /**
      平台分类id 2级
      */
-    var groupid2:String?
+    var groupid2:Int = 0
     /**
      平台分类id 3级
      */
-    var groupid3:String?
+    var groupid3:Int = 0
     /**
      1/2/3级分类名称合并
      */
@@ -9,7 +9,7 @@ import Foundation
 class CNLiveShopGoodsManageDetailsGoodsCategoryModel:BaseModel{
     /// 分类id
-    var id: String?
+    var id: Int = 0
     /// 分类名称
     var title: String?
 }