下拉代码

CAISHEN/AppDelegate/KXHomeViewController.m

@@ -140,11 +140,11 @@
 //    KXHomeNavgationController *buyCar = [self navigationControllerWithClassName:@"CAISHEN.KXSFBuyCarViewController" title:@"购物车" imageName:@"tab_buyCar"];
 
     // 回收模板第二版
-    KXHomeNavgationController *bill = [self navigationControllerWithClassName:@"KXSPHomeViewController" title:@"首页" imageName:@"tab_main"];
+    KXHomeNavgationController *bill = [self navigationControllerWithClassName:@"KXSPHomeViewController" title:@"首页" imageName:@"icon_check_tab_home"];
     
-    KXHomeNavgationController *friend = [self navigationControllerWithClassName:@"CAISHEN.KXSPOrderViewController" title:@"订单" imageName:@"tab_flower"];
+    KXHomeNavgationController *friend = [self navigationControllerWithClassName:@"CAISHEN.KXSPOrderViewController" title:@"订单" imageName:@"icon_check_tab_order"];
 //    KXHomeNavgationController *mine = [self navigationControllerWithClassName:@"KXMoneyMineViewController" title:@"我的" imageName:@"tab_mine"];
-    KXHomeNavgationController *mine = [self navigationControllerWithClassName:@"CAISHEN.KXSPMineViewController" title:@"我的" imageName:@"tab_mine"];
+    KXHomeNavgationController *mine = [self navigationControllerWithClassName:@"CAISHEN.KXSPMineViewController" title:@"我的" imageName:@"icon_check_tab_mine"];
     
     // 电子借条
 //    KXHomeNavgationController *home = [self navigationControllerWithClassName:@"KXElectronicHomeViewController" title:@"首页" imageName:@"tab_main"];
@@ -197,7 +197,7 @@
     
     KXBaseViewController *viewController = [[cls alloc] init];
     viewController.tabBarItem.title = title;
-    [viewController.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor baseColor]} forState:UIControlStateSelected];
+    [viewController.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor newPhoneBaseColor]} forState:UIControlStateSelected];
     viewController.tabBarItem.image = [[UIImage imageNamed:imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     viewController.tabBarItem.selectedImage = [[UIImage imageNamed:[NSString stringWithFormat:@"%@_selected",imageName]] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_mine_address.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_mine_address.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_mine_address@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_mine_address@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_order_computer.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_computer.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_computer@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_computer@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_order_pad.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_pad.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_pad@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_pad@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_order_phone.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_phone.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_phone@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_order_phone@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_home.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_home_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home_selected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home_selected@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_home_selected@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_mine.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_mine_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine_selected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine_selected@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_mine_selected@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_order.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_tab_order_selected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order_selected.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order_selected@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_tab_order_selected@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/KXHeader.h

@@ -33,7 +33,7 @@
 //还需要改plist中小米push的两个值
 
 
-#define UMAPP_KEY @"5be8e87db465f5c24b0001e7"
+#define UMAPP_KEY @"5bf4d0abb465f54465000025"
 
 #define KXCOMPANY @"这个公司"
 
@@ -41,7 +41,7 @@
 
 #define KXCOMPANY_ENGLISH @"这个公司english"
 
-#define KXCHANNEL_ID @"20132"
+#define KXCHANNEL_ID @"20133"
 
 #define KXAPPSTORE_ADDRESS    [NSString stringWithFormat:@"itms-apps://itunes.apple.com/cn/app//id%@?mt=8",@"1271312320"]
 

CAISHEN/Main/MainPage/View/KXPrivacyView.m

@@ -80,7 +80,7 @@
     NSString *contengString = [NSString stringWithFormat:@"欢迎使用“%@”！我们非常重视您的个人信息和隐私保护。在您使用“%@”服务之前，请仔细阅读《%@隐私政策》，我们将严格按照经您同意的各项条款使用您的个人信息，以便为您提供更好的服务。",[NSString getAppName],[NSString getAppName],[NSString getAppName]];
     NSMutableAttributedString *attibuteString = [[NSMutableAttributedString alloc] initWithString:contengString attributes:@{NSForegroundColorAttributeName:[UIColor KXColorWithHex:0x666666],NSFontAttributeName:FONT_SYS(14)}];
     NSUInteger appNameLenth = [NSString getAppName].length;
-    [attibuteString addAttributes:@{NSForegroundColorAttributeName:[UIColor baseColor],NSFontAttributeName:FONT_SYS(13)} range:NSMakeRange(41+appNameLenth*2, appNameLenth+6)];
+    [attibuteString addAttributes:@{NSForegroundColorAttributeName:[UIColor newPhoneBaseColor],NSFontAttributeName:FONT_SYS(13)} range:NSMakeRange(41+appNameLenth*2, appNameLenth+6)];
     contentLabel.userInteractionEnabled = YES;
     [contentLabel setAttributedText:attibuteString];
     // 点击方法
@@ -117,7 +117,7 @@
     [self.whiteView addSubview:noAgreeBtn];
     
     UIButton *agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    agreeBtn.backgroundColor = [UIColor baseColor];
+    agreeBtn.backgroundColor = [UIColor newPhoneBaseColor];
     [agreeBtn setTitle:@"同意" forState:UIControlStateNormal];
     [agreeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     agreeBtn.tag = KXPrivacyViewButtonStyleFirstAgree;
@@ -182,7 +182,7 @@
     [self.whiteView addSubview:noAgreeBtn];
     
     UIButton *agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    agreeBtn.backgroundColor = [UIColor baseColor];
+    agreeBtn.backgroundColor = [UIColor newPhoneBaseColor];
     [agreeBtn setTitle:@"再想想" forState:UIControlStateNormal];
     [agreeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     agreeBtn.tag = KXPrivacyViewButtonStyleNextNoAgree;

CAISHEN/SellPhone2/Home/HomePage/Controller/KXSPHomeViewController.m

@@ -96,8 +96,8 @@ static NSString *cellID = @"cellID";
         NSArray *tempArray = @[
                                @[
                                    @{@"headerImage" : @"icon_check_phone_iPhone8", @"type" : @"iPhone 8", @"memory" : @"内存: 64G", @"amount" : @"4400"},
-                                   @{@"headerImage" : @"icon_check_phone_mi8", @"type" : @"华为P20", @"memory" : @"内存: 128G", @"amount" : @"2272"},
-                                   @{@"headerImage" : @"icon_check_phone_M5", @"type" : @"小米8", @"memory" : @"内存: 128G", @"amount" : @"2057"}
+                                   @{@"headerImage" : @"icon_check_phone_HuaweiP20", @"type" : @"华为P20", @"memory" : @"内存: 128G", @"amount" : @"2272"},
+                                   @{@"headerImage" : @"icon_check_phone_mi8", @"type" : @"小米8", @"memory" : @"内存: 128G", @"amount" : @"2057"}
                                    ],
                                @[
                                    @{@"headerImage" : @"icon_check_ computer_MacPro", @"type" : @"MacBook Pro", @"memory" : @"硬盘: 1T", @"amount" : @"10777"},

CAISHEN/SellPhone2/Mine/Controller/KXSPAddressViewController.swift

@@ -42,6 +42,7 @@ class KXSPAddressViewController: KXBaseViewController, UITableViewDelegate, UITa
     lazy var header: UIView = {
         let header: UIView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: SCREEN_WIDTH-24, height: Fitesize(215)))
         let imageView: UIImageView = UIImageView.init(frame: CGRect.init(x: header.width/2-Fitesize(171)/2, y: Fitesize(44), width: Fitesize(171), height: Fitesize(171)))
+        imageView.image = UIImage(named: "icon_check_mine_address")
         header.addSubview(imageView)
         return header
     }()
@@ -53,7 +54,7 @@ class KXSPAddressViewController: KXBaseViewController, UITableViewDelegate, UITa
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell: UITableViewCell = tableView.dequeueReusableCell(withIdentifier: "cell") ?? UITableViewCell.init(style: .default, reuseIdentifier: "cell")
         cell.selectionStyle = .none
-        let arr:NSArray = ["邮寄地址：背景市朝阳区XXXXXX","联系人：XXXX","电系电话：123435"]
+        let arr:NSArray = ["邮寄地址：北京市朝阳区嘉泰大厦B座2001","联系人：小花猪","电系电话：17611170182"]
         cell.textLabel?.text = arr[indexPath.row] as? String
         cell.textLabel?.font = UIFont.init(name: "PingFangSC-Regular", size: Fitesize(17))
         cell.textLabel?.textColor = UIColor.title()

CAISHEN/SellPhone2/Order/Controller/KXSPOrderViewController.swift

@@ -138,6 +138,9 @@ class KXSPOrderViewController: KXBaseViewController, UITableViewDelegate, UITabl
                 self.tableView.mj_footer.endRefreshing()
                 self.tableView.reloadData()
             }
+        } else {
+            self.tableView.mj_header.endRefreshing()
+            self.tableView.mj_footer.endRefreshing()
         }
         
     }
@@ -260,6 +263,15 @@ class KXSPOrderTableViewCell: UITableViewCell {
     override func configTableViewCell(model: AnyObject, indexPath: NSIndexPath) {
         let mo: KXSPOrderCombineModel = model as! KXSPOrderCombineModel
         iconImageView.image = UIImage(named: "icon_check_" + mo.module + "_" + mo.content.type)
+        
+        if mo.module == "phone" {
+            iconImageView.image = UIImage(named: "icon_check_order_phone")
+        } else if mo.module == "pad" {
+            iconImageView.image = UIImage(named: "icon_check_order_pad")
+        } else {
+            iconImageView.image = UIImage(named: "icon_check_order_computer")
+        }
+        
         nameLabel.text = mo.content.type
         let att: NSMutableAttributedString = NSMutableAttributedString()
         att.append(NSAttributedString(string: "预估计：", attributes: [NSAttributedString.Key.foregroundColor: UIColor.kxColor(withHex: 0x666666), NSAttributedString.Key.font: UIFont(name: "PingFangSC-Regular", size: Fitesize(14))!]))