新增商品修改商品状态默认值

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

@@ -61,7 +61,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     var titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
     let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
     var tishixxArr = ["请输入商品名称","请选择商品类型","请选择商品分类","请选择品牌","请输入起卖数量"]
-    var tishixxArr1 = ["请输入关键字","请输入物流费用","请选择国家","请选择商品状态","请选择运输方式"]
+    var tishixxArr1 = ["请输入关键字","请输入物流费用","请选择国家","热销","请选择运输方式"]
     let sptpArr = ["商品封面图(限一张)","商品主图(限五张)"]
     let qtxxArr = ["关键字","物流费用","国家","商品状态","运输方式"]
     let ysszArr = ["用户付款是否需要审核","预设预付定金时间段","预设预付尾款时间段","预设预付尾款发货时间"]
@@ -79,7 +79,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
     
     var itemTypeArr:Array<Int>? = []//多选
     
-    var shangPinStatus:Int? = 0//商品状态
+    var shangPinStatus:Int? = 1//商品状态
     var yunShuType:Int? = 0//运输类型
     var maxFiveImgsArr:Array<String> = []//多图
     var singleImgArr:Array<String> = []//单张图

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

@@ -42,7 +42,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     let titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
     let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
     var tishixxArr = ["请输入商品名称","普通","请选择商品分类","请选择品牌","请输入起卖数量"]
-    var tishixxArr1 = ["请输入关键字","请输入物流费用","中国","请选择商品状态","请选择运输方式"] //国家默认值
+    var tishixxArr1 = ["请输入关键字","请输入物流费用","中国","热销","请选择运输方式"] //国家默认值
     let sptpArr = ["商品封面图(限一张)","商品主图(限五张)"]
     let qtxxArr = ["关键字","物流费用","国家","商品状态","运输方式"]
     let ysszArr = ["用户付款是否需要审核","预设预付定金时间段","预设预付尾款时间段","预设预付尾款发货时间"]
@@ -59,7 +59,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     var isYuShouShangPin:Bool?//是否为预售商品
     var webH:CGFloat = 250
     var itemTypeArr:Array<Int>? = []//多选
-    var shangPinStatus:Int? = 0//商品状态
+    var shangPinStatus:Int? = 1//商品状态
     var yunShuType:Int? = 0//运输类型
     var maxFiveImgsArr:Array<String> = []//多图
     var singleImgArr:Array<String> = []//单张图

GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift

@@ -17,9 +17,8 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         listView.mj_header?.beginRefreshing()
     }
     
- 
+    
     func sureGeliAlertViewAction(sender: UIButton) {
-        
         let model  = adrArrs[sender.tag]
         AddressDel(["user_token":UserToken as Any,"address_id":model.address_id as Any], success: { (data) in
             self.listView.mj_header?.beginRefreshing()
@@ -30,7 +29,6 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
     
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     
-    
     //MARK:--搜索模块
     //MAKR:--调起搜索后添加个蒙版本
     var blackBtnView:UIButton! = nil
@@ -111,10 +109,12 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         navbar.title = "地址管理"
         self.view.addSubview(navbar)
         if isSelectlogAddress {
+            navbar.title = "地址选择"
             HUD.flash(.progress)
             searchBgH.constant = 0
             getAddr(["user_token":UserToken as Any], success: { (data) in
                 self.adrInfo = (data as! GetAddrsInfoModel)
+                
                 self.listView.reloadData()
                 HUD.hide()
             }) { (error) in
@@ -190,6 +190,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
             model.data?.forEach({ (item) in
                 self.adrArrs.append(item)
             })
+            print("adrs == ",self.adrArrs.count)
             self.listView.reloadData()
             
             self.listView.mj_header?.endRefreshing()
@@ -208,8 +209,8 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if isSelectlogAddress{
             if adrInfo != nil {
-                   return (adrInfo?.data!.count)!
-               }
+                return (adrInfo?.data!.count)!
+            }
         }
         if cus_id != nil {
             if adrInfo != nil {
@@ -228,7 +229,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
             cell.phoneLbl.text = model?.mobile
             cell.adrLbl.text = model?.addr_name
             cell.btn.isSelected = false
-
+            
             if isSelectMotion == false {
                 cell.btnH.constant = 0
                 cell.xValue.constant = 0
@@ -347,7 +348,9 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
         return tableView.rowHeight
     }
     func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath, for orientation: SwipeActionsOrientation) -> [SwipeAction]? {
-        
+        if isSelectlogAddress {
+            return nil
+        }
         let tag = indexPath.row
         //创建“删除”事件按钮
         let deleteAction = SwipeAction(style: .destructive, title: nil) {

GeliBusinessPlatform/ViewController/货拉拉/取消订单/HuolalaCancelViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import LGButton
 
-class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource,OtherInfoTextViewTableViewCellDelegate{
+class HuolalaCancelViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,OtherInfoTextViewTableViewCellDelegate{
     
     @IBOutlet weak var bottomLbl: UILabel!
     var lwbno = ""
@@ -18,8 +18,8 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
     var reason_id = 0
     var reason = ""
     var reasonStr = ""
-
     @IBOutlet weak var listView: UITableView!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "取消订单"
@@ -29,11 +29,9 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
         listView.register(UINib(nibName: "FirstCell", bundle: nil), forCellReuseIdentifier: "FirstCell")
         listView.register(UINib(nibName: "SecondCell", bundle: nil), forCellReuseIdentifier: "SecondCell")
         listView.register(UINib(nibName: "OtherInfoTextViewTableViewCell", bundle: nil), forCellReuseIdentifier: "OtherInfoTextViewTableViewCell")
-
         loadData()
-   
-
     }
+    
     @IBAction func cancelAction(_ sender: LGButton) {
         if selectID == 81338860 {
             HUD.flash(.label("请选择取消原因"),delay: 1.2)
@@ -45,9 +43,9 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
                 return
             }
         }
-        
         orderCancelOrder()
     }
+    
     //请求取消原因
     var reasonArr:Array<orderCancelReasonDataModel> = []
     func loadData(){

GeliBusinessPlatform/ViewController/货拉拉/调整地址/TestViewController.swift

@@ -10,28 +10,22 @@ import UIKit
 
 class TestViewController: BaseViewController,UITableViewDelegate,
 UITableViewDataSource,UIGestureRecognizerDelegate {
-    
     var tableView:UITableView?
-    
     var ctrlnames:[String] = ["UILabel 标签","UIButton 按钮","UIDatePiker 日期选择器",
                               "UITableView 表格视图","UIButton 按钮","UIDatePiker 日期选择器",
                               "UITableView 表格视图"]
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
         //创建表视图
-        self.tableView = UITableView(frame: self.view.frame,
-                                     style:.plain)
+        self.tableView = UITableView(frame: self.view.frame,style:.plain)
         self.tableView!.delegate = self
         self.tableView!.dataSource = self
         //创建一个重用的单元格
         self.tableView!.register(UINib(nibName: "ToFormChangeTableViewCell", bundle: nil), forCellReuseIdentifier: "ToFormChangeTableViewCell")
         self.view.addSubview(self.tableView!)
-        
         self.tableView!.setEditing(true, animated:true)
         self.tableView!.separatorStyle = .none
-
     }
     
     //在本例中，只有一个分区

GeliBusinessPlatform/ViewController/货拉拉/调整地址/ToFormChangeTableViewCell.swift

@@ -10,7 +10,6 @@ import UIKit
 
 class ToFormChangeTableViewCell: UITableViewCell {
     @IBOutlet weak var titleLbl: UILabel!
-    
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none
@@ -18,7 +17,6 @@ class ToFormChangeTableViewCell: UITableViewCell {
 
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
-
         // Configure the view for the selected state
     }