Browse Source

Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

学丽 5 years ago
parent
commit
965679af38

BIN
KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 0
KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -67,6 +67,7 @@
67 67
     tipLabel.layer.cornerRadius = 11;
68 68
     tipLabel.textAlignment=NSTextAlignmentCenter;
69 69
     tipLabel.layer.masksToBounds = YES;
70
+    tipLabel.textAlignment = NSTextAlignmentCenter;
70 71
     tipLabel.text = @"目前只统计直播期间该商品订单数哦";
71 72
     tipLabel.centerX = self.view.centerX;
72 73
     [self.view addSubview:tipLabel];

+ 2 - 1
KuDianProject/SupplyGood/View/KDPSupplyGoodCollectionViewCell.m

@@ -84,7 +84,8 @@
84 84
     self.profitLabel = [[UILabel alloc] init];
85 85
     self.profitLabel.textColor = [UIColor whiteColor];
86 86
     self.profitLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size: 16];
87
-    self.profitLabel.textAlignment = NSTextAlignmentCenter;
87
+    self.profitLabel.adjustsFontSizeToFitWidth = YES;
88
+    self.profitLabel.textAlignment = NSTextAlignmentLeft;
88 89
     [self.contenAView addSubview:self.profitLabel];
89 90
 }
90 91
 

+ 1 - 2
KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -87,12 +87,11 @@
87 87
             [self.dataSource addObjectsFromArray:list];
88 88
             [self.tableView.mj_footer endRefreshing];
89 89
             [self.tableView.mj_header endRefreshing];
90
-            self.clearBtn.hidden = NO;
91 90
         }else {
92
-            self.clearBtn.hidden = YES;
93 91
             [self.tableView.mj_header endRefreshing];
94 92
             [self.tableView.mj_footer endRefreshingWithNoMoreData];
95 93
         }
94
+        self.clearBtn.hidden = self.dataSource.count ? NO : YES;
96 95
         
97 96
         [LoadingView dismiss];
98 97
         [self.tableView reloadData];

+ 1 - 0
KuDianProject/TOP/Drawer/View/KDPMessageTableViewCell.m

@@ -110,6 +110,7 @@
110 110
     _timeLabel.text = noticeModel.push_at;
111 111
     [_iconImageView sd_setImageWithURL:[NSURL URLWithString:noticeModel.image_url]placeholderImage:[UIImage imageNamed:placholderImg]];
112 112
     _contentLabel.text = noticeModel.message;
113
+    _isView.hidden = [noticeModel.is_view isEqualToString:@"1"] ? YES : NO;
113 114
     [self setLineSpace:5.0f withText:noticeModel.message inLabel:_contentLabel];
114 115
 }
115 116