2 Commits 5803655416 ... 0ea0440fac

Author SHA1 Message Date
  学丽 0ea0440fac Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject 5 years ago
  学丽 de5939d368 线上 5 years ago

+ 3 - 3
KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

30
             ignoreCount = "0"
30
             ignoreCount = "0"
31
             continueAfterRunningActions = "No"
31
             continueAfterRunningActions = "No"
32
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
32
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
33
-            timestampString = "584958791.075596"
33
+            timestampString = "584959169.538148"
34
             startingColumnNumber = "9223372036854775807"
34
             startingColumnNumber = "9223372036854775807"
35
             endingColumnNumber = "9223372036854775807"
35
             endingColumnNumber = "9223372036854775807"
36
             startingLineNumber = "106"
36
             startingLineNumber = "106"
46
             ignoreCount = "0"
46
             ignoreCount = "0"
47
             continueAfterRunningActions = "No"
47
             continueAfterRunningActions = "No"
48
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
48
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
49
-            timestampString = "584958791.076447"
49
+            timestampString = "584959169.538582"
50
             startingColumnNumber = "9223372036854775807"
50
             startingColumnNumber = "9223372036854775807"
51
             endingColumnNumber = "9223372036854775807"
51
             endingColumnNumber = "9223372036854775807"
52
             startingLineNumber = "246"
52
             startingLineNumber = "246"
62
             ignoreCount = "0"
62
             ignoreCount = "0"
63
             continueAfterRunningActions = "No"
63
             continueAfterRunningActions = "No"
64
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
64
             filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
65
-            timestampString = "584958791.07686"
65
+            timestampString = "584959169.538712"
66
             startingColumnNumber = "9223372036854775807"
66
             startingColumnNumber = "9223372036854775807"
67
             endingColumnNumber = "9223372036854775807"
67
             endingColumnNumber = "9223372036854775807"
68
             startingLineNumber = "260"
68
             startingLineNumber = "260"

+ 1 - 1
KuDianProject/TOP/Controller/KDPTodayListViewController.m

125
         if (self.is_new.integerValue == 1) {
125
         if (self.is_new.integerValue == 1) {
126
              numLabel.text=[NSString stringWithFormat:@"共%@单",json[@"order_count"]];
126
              numLabel.text=[NSString stringWithFormat:@"共%@单",json[@"order_count"]];
127
         }
127
         }
128
-        
128
+        [self.dataArray removeAllObjects];
129
         NSArray *array =[NSArray yy_modelArrayWithClass:[KDPGoodsModel class] json:json[@"order_list"]];
129
         NSArray *array =[NSArray yy_modelArrayWithClass:[KDPGoodsModel class] json:json[@"order_list"]];
130
         [self.dataArray addObjectsFromArray:array];
130
         [self.dataArray addObjectsFromArray:array];
131
         
131
         

+ 1 - 1
KuDianProject/TOP/View/KDPTodayListCell.m

155
     NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
155
     NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
156
     // 赋值
156
     // 赋值
157
     self.oldPriceL.attributedText = attribtStr;
157
     self.oldPriceL.attributedText = attribtStr;
158
-    
158
+    self.numL.text=[NSString stringWithFormat:@"  %@人下单  ",model.order_count];
159
     //计算下单时间
159
     //计算下单时间
160
     NSString *imter= [KDPublicMethod CalculateCurrentDate:model.create_at];
160
     NSString *imter= [KDPublicMethod CalculateCurrentDate:model.create_at];
161
     NSString *timetitle= [NSString stringWithFormat:@"%@前下单",imter];
161
     NSString *timetitle= [NSString stringWithFormat:@"%@前下单",imter];