sell flower order

CAISHEN/Money/我的/controller/KXMoneyMineViewController.m

@@ -209,17 +209,29 @@
     switch (indexPath.row) {
         case 0:
         {
-            KXSFMineOrderViewController *orderVC = [[KXSFMineOrderViewController alloc] init];
-            [self.navigationController pushViewController:orderVC animated:YES];
+            if ([[KXLoginManager shareInstance] isLogin]) {
+                KXSFMineOrderViewController *orderVC = [[KXSFMineOrderViewController alloc] init];
+                [self.navigationController pushViewController:orderVC animated:YES];
+            } else {
+                [self pushToLoginVC];
+            }
         }
             break;
         case 1:
         {
-            KXSFAreaViewController *areaVC = [[KXSFAreaViewController alloc] init];
-            [self.navigationController pushViewController:areaVC animated:YES];
+            if ([[KXLoginManager shareInstance] isLogin]) {
+                KXSFAreaViewController *areaVC = [[KXSFAreaViewController alloc] init];
+                [self.navigationController pushViewController:areaVC animated:YES];
+            } else {
+                [self pushToLoginVC];
+            }
         }
             break;
         case 2:
+        {
+            KXAboutUsViewController *aboutVC = [[KXAboutUsViewController alloc] init];
+            [self.navigationController pushViewController:aboutVC animated:YES];
+        }
             break;
         case 3:
             if ([[KXLoginManager shareInstance] isLogin]) {
@@ -231,18 +243,17 @@
             break;
         case 4:
         {
-            KXAboutUsViewController *aboutVC = [[KXAboutUsViewController alloc] init];
-            [self.navigationController pushViewController:aboutVC animated:YES];
-        }
-            break;
-        case 5:
-        {
             KXCustomWebViewController *webVC = [[KXCustomWebViewController alloc] init];
             webVC.webStr = [NSString stringWithFormat:@"http://m.henhaojie.com/agreement-bnd.html?name=%@",[NSString getAppName]];
             webVC.title = @"隐私政策";
             [self.navigationController pushViewController:webVC animated:YES];
         }
             break;
+        case 5:
+        {
+            
+        }
+            break;
         default:
             break;
     }

CAISHEN/SellFlowers/Main/controllers/KXSFSubmitOrderViewController.swift

@@ -17,6 +17,7 @@ class KXSFSubmitOrderViewController: KXBaseViewController ,UITableViewDataSource
     var isSelectAddress = false
     var goodDetailData : NSMutableArray = NSMutableArray.init()
     var addressId = ""
+    let kSFSaveAreaDataPath = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.documentDirectory, FileManager.SearchPathDomainMask.userDomainMask, true)[0] + "/SFSaveAreaData.plst"
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -42,13 +43,27 @@ class KXSFSubmitOrderViewController: KXBaseViewController ,UITableViewDataSource
     }
     
     lazy var tableView : UITableView = {
-        var table : UITableView = UITableView.init(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: SCREEN_HEIGHT - NavHeight - 50), style: .grouped)
+        var table : UITableView = UITableView.init(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: SCREEN_HEIGHT - NavHeight - 50 - safeBottomHeight), style: .grouped)
         table.delegate = self
         table.dataSource = self
         table.separatorColor = .none
         table.register(KXSFSubmitTableVIewCell.classForCoder(), forCellReuseIdentifier: otherCellID)
         table.register(KXSFBuySubmitOrderTableCell.classForCoder(), forCellReuseIdentifier: goodCellID)
         var headerView : KXSFSubmitTableViewHeader = KXSFSubmitTableViewHeader.init(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 100))
+        let data : NSMutableArray = NSKeyedUnarchiver.unarchiveObject(withFile: kSFSaveAreaDataPath) as? NSMutableArray ?? NSMutableArray.init()
+        for model : KXSFMineAreaModel in data as! [KXSFMineAreaModel] {
+            if model.isNormal == true{
+                headerView.addBtn.removeFromSuperview()
+                addressId = model.id!
+                isSelectAddress = true
+                headerView.nameLabel.isHidden = false
+                headerView.addressLabel.isHidden = false
+                headerView.arrImage.isHidden = false
+                headerView.nameLabel.text = "收货人：" + model.consignee!
+                headerView.addressLabel.text = model.address!
+                footView.button.backgroundColor = UIColor.base()
+            }
+        }
         weak var weakSelf = self
         headerView.bk_(whenTapped: {
             let vc : KXSFAreaViewController = KXSFAreaViewController()
@@ -73,7 +88,7 @@ class KXSFSubmitOrderViewController: KXBaseViewController ,UITableViewDataSource
     }()
     
     lazy var footView : KXSFSubmitOrderFootView = {
-        var footVIew = KXSFSubmitOrderFootView.init(frame: CGRect(x: 0, y: SCREEN_HEIGHT-50-TabbarHeight-safeBottomHeight, width: SCREEN_WIDTH, height: 50))
+        var footVIew = KXSFSubmitOrderFootView.init(frame: CGRect(x: 0, y: SCREEN_HEIGHT-50-NavHeight-safeBottomHeight, width: SCREEN_WIDTH, height: 50))
         footVIew.backgroundColor = UIColor.white
         footVIew.delegate = self
         return footVIew

CAISHEN/SellFlowers/Mine/controllers/KXSFAreaViewController.swift

@@ -88,6 +88,12 @@ extension KXSFAreaViewController{
         let cell : KXSFMIneAreaTableViewCell = tableView.dequeueReusableCell(withIdentifier: kTableViewCellId) as! KXSFMIneAreaTableViewCell
         let model : KXSFMineAreaModel = dataSource[indexPath.row] as! KXSFMineAreaModel
         cell.configTableViewCell(model: model , indexPath: indexPath as NSIndexPath)
+        if isOrderPush {
+            cell.configHiddenEditLabel(hidden: true)
+        } else {
+            cell.configHiddenEditLabel(hidden: false)
+        }
+        
         return cell
     }
     

CAISHEN/SellFlowers/Mine/view/KXSFMineOrderTableViewCell.swift

@@ -95,6 +95,10 @@ class KXSFMIneAreaTableViewCell: UITableViewCell {
         areaLabel?.text = addModel.area! + addModel.address!
     }
     
+    func configHiddenEditLabel(hidden: Bool) {
+        editLabel?.isHidden = hidden
+    }
+    
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }