Merge branch 'master' of https://git.oschina.net/gomore/Opple-iOS

Lighting/Class/ClientdetailsViewController.m

@@ -36,6 +36,17 @@
     self.ClientdetailsTableview.dataSource = self;
     
     //圆角
+    self.shoppingAndRecordBackview.layer.masksToBounds = YES;
+    self.shoppingAndRecordBackview.layer.cornerRadius = kCornerRadius;
+    self.shoppingBagButton.layer.masksToBounds = YES;
+    self.shoppingBagButton.layer.cornerRadius = kCornerRadius;
+    self.orderRecordButton.layer.masksToBounds = YES;
+    self.orderRecordButton.layer.cornerRadius = kCornerRadius;
+    
+    //默认选中购物袋
+    self.shoppingBagButton.selected = YES;
+    self.shoppingBagButton.backgroundColor = [UIColor whiteColor];
+    
     
 }
 
@@ -59,8 +70,6 @@
 
 
 
-
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -77,18 +86,21 @@
 #pragma mark -购物袋
 - (IBAction)ShoppingbagButtonClick:(UIButton *)sender {
     
-    sender.selected = !sender.selected;
-    sender.layer.masksToBounds = YES;
-    sender.layer.cornerRadius = 3;
-    sender.backgroundColor = [UIColor whiteColor];
     
+    sender.backgroundColor = [UIColor whiteColor];
+    sender.selected = YES;
+    self.orderRecordButton.selected = NO;
+    self.orderRecordButton.backgroundColor = kMainColor;
 }
 
 #pragma mark -订单记录
 - (IBAction)OrderrecordButtonClick:(UIButton *)sender {
     
-    sender.selected = !sender.selected;
+    
     sender.backgroundColor = [UIColor whiteColor];
+    sender.selected = YES;
+    self.shoppingBagButton.selected = NO;
+    self.shoppingBagButton.backgroundColor = kMainColor;
     
 }
 

Lighting/Class/InformationTableViewCell.h

@@ -10,4 +10,44 @@
 
 @interface InformationTableViewCell : UITableViewCell
 
+
+
+/**
+ *  用户头像
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *personHeader;
+
+/**
+ * 用户名称
+ */
+@property (weak, nonatomic) IBOutlet UILabel *personName;
+
+/**
+ *  联系电话
+ */
+@property (weak, nonatomic) IBOutlet UILabel *personPhoneNumber;
+
+/**
+ *  最近到访时间
+ */
+@property (weak, nonatomic) IBOutlet UILabel *recentTime;
+
+
+/**
+ *  服务导购
+ */
+@property (weak, nonatomic) IBOutlet UILabel *Guideservices;
+
+/**
+ *  客户地址
+ */
+@property (weak, nonatomic) IBOutlet UILabel *personLocation;
+
+/**
+ *  是否设置为当前客户
+ */
+@property (weak, nonatomic) IBOutlet UISwitch *selectedSwitch;
+
+
+
 @end

Lighting/Lighting/StoryboardwithCYX.storyboard

@@ -198,6 +198,15 @@
                                                     <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
                                                 </tableViewCellContentView>
                                                 <color key="backgroundColor" red="0.56470588239999997" green="0.75686274509999996" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
+                                                <connections>
+                                                    <outlet property="Guideservices" destination="gMQ-8Z-IHh" id="roV-8R-PjL"/>
+                                                    <outlet property="personHeader" destination="F66-vh-va3" id="3p3-Th-3as"/>
+                                                    <outlet property="personLocation" destination="UX9-mF-TLc" id="siN-0Z-13q"/>
+                                                    <outlet property="personName" destination="BFX-MF-Tjn" id="aCo-Hp-Ccs"/>
+                                                    <outlet property="personPhoneNumber" destination="b5n-Bd-piS" id="BVd-Oq-TJ7"/>
+                                                    <outlet property="recentTime" destination="3T5-Bf-6tT" id="65b-00-0m6"/>
+                                                    <outlet property="selectedSwitch" destination="sWi-BG-uGN" id="Ajo-VQ-DXc"/>
+                                                </connections>
                                             </tableViewCell>
                                         </prototypes>
                                     </tableView>

Lighting/Tools/PrefixHeader.pch

@@ -96,6 +96,10 @@
  */
 #define kMainColor [UIColor colorWithRed:89/255.0 green:172/255.0 blue:220/255.0 alpha:1.0]
 
+/**
+ *  默认圆角系数
+ */
+#define kCornerRadius 3