编辑显示数据异常问题

张旭
1 parent 371cf857
Showing 6 changed files with 28 additions and 17 deletions
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/Model/GoodsDetail/CNLiveShopGoodsDetailsModel.swift
@@ -147,12 +147,15 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     func initBgScrollViewContentView(){
+        
+        self.dataModel.initDataSource()
         if self.type == .edit{
-            var tempArray = Array(self.dataModel.list)
-            tempArray.removeSubrange(self.dataModel.list.count - 3..<3)
-            self.dataModel.list = tempArray
+            if self.dataModel.list.count > 3{
+                var tempArray = Array(self.dataModel.list)
+                tempArray.removeSubrange(Range(NSRange(location: self.dataModel.list.count - 3, length: 3))!)
+                self.dataModel.list = tempArray
+            }
         }
-        self.dataModel.initDataSource()
         for i in 0..<self.dataModel.list.count {
             let model = self.dataModel.list[i]
             let singleView = CNLiveShopAddGoodsSingleView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50), model: model)
@@ -542,7 +545,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             showMessage(message: "请输入发货时效")
             return
         }
-        var kvArray = Array<Dictionary<String, String>>()// NSMutableArray()
+        var kvArray = Array<Dictionary<String, String>>()
         kvArray.append(["k":"品名","v":singleView18.contentTextField.text!])
         kvArray.append(["k":"规格","v":singleView19.contentTextField.text!])
         kvArray.append(["k":"寄送区域","v":singleView20.contentTextView.text!])
@@ -590,7 +593,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         }
         showLoading(message: "")
         if self.type == .add{
-            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
+            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: "发布失败")
@@ -609,7 +612,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 }
             }
         }else{
-            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
+            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: "修改失败")
@@ -717,7 +720,13 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 //发货时效
                 let singleView21 = self.bgScrollView.viewWithTag(21) as! CNLiveShopAddGoodsSingleView
-                let tempArray = NSMutableArray(array: self.shopGoodsDetailsModel.storageArray)
+                let tempArray = NSMutableArray()
+                for mdl in self.shopGoodsDetailsModel.storage_arr{
+                    let dic = modelToDictionary(mdl)
+                    tempArray.add(dic)
+                }
+                                
+                self.shopGoodsDetailsModel.storageArray = tempArray as! [Dictionary<String, Any>]
                 for dic in self.shopGoodsDetailsModel.storageArray{
                     let dict = dic as NSDictionary
                     if dict.object(forKey: "k") as! String == "品名"{
@@ -779,15 +788,16 @@ 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{
-                    let array = NSMutableArray(array: self.dataModel.list)
+                    var array = 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")]
                         let listModel = newDictionaryToModel(paramDict as [String : Any], CNLiveShopAddEditGoodsListModel.self) as! CNLiveShopAddEditGoodsListModel
-                        array.add(listModel)
+                        array.append(listModel)
                         self.reloadBgScrollViewContentViewModel(model: listModel, index: self.dataModel.list.count+1+i, isScrollToBottom: false)
                         if tempArray.count-1 == i{
-                            self.dataModel.list = array as! [CNLiveShopAddEditGoodsListModel]
+                            self.dataModel.list = array 
                             self.viewWillLayoutSubviews()
                         }
                     }
@@ -170,7 +170,7 @@ class CNFrontMainView : UIView{
                 frontCardContentView.isHidden = true
                 //显示textview 添加身份
                 frontDescContentView.isHidden = false
-                textView.text = newValue!.description
+                textView.text = newValue!.descriptions
                 addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
                 textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }
@@ -364,7 +364,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      不上传了 删除(云中)新上传的视频
      */
     func deleteUploadVideoUrl(){
-        if self.networkVideoUrl != self.uploadVideoModel?.videoUrl{
+        if self.uploadVideoModel?.videoUrl != nil && self.networkVideoUrl != "" && self.networkVideoUrl != nil && self.networkVideoUrl != self.uploadVideoModel?.videoUrl{
             UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: (self.uploadVideoModel?.videoUrl)!) { result, status in
             }
@@ -118,8 +118,9 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/goodsInfo", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
-                let resp = result as! NSDictionary
-                let model = newDictionaryToModel(resp as! [String : Any], CNLiveShopGoodsDetailsModel.self)
+                let respDic = result as! NSDictionary
+                let resp = respDic["data"] as! NSDictionary
+                let model =  newDictionaryToModel(resp as! [String : Any], CNLiveShopGoodsDetailsModel.self) as! CNLiveShopGoodsDetailsModel
                 resultBlock(model,.success)
             }else{
                 resultBlock(NSNull(),.failed)
@@ -143,7 +143,7 @@ final class StandListModel: BaseModel {//, TableCodable {
     var backgroundImg: String = ""//首页背景图-
     var backgroundColor: String = ""//添加身份按钮背景色-
     var backgroundColour: String = ""//-
-    var description: String = ""//首页身份说明描述-
+    var descriptions: String = ""//首页身份说明描述-
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图-
     var cardBackgroundImg: String = ""//首页卡片背景图
@@ -202,7 +202,7 @@ class CNLiveShopGoodsDetailsModel:BaseModel{
     /**
      规格
      */
-    var storage_arr:String?
+    var storage_arr = [CNLiveGoodsDetailsAttrModel]()
     /**
      最小购买数
      */