...

vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.h

@@ -27,6 +27,7 @@
 AS_MODEL( VankeStatementListModel, model )
 AS_OUTLET( BeeUIScrollView,     list )
 AS_OUTLET( VankeStatementDetailMonthCell_iPhone, settlementBar)
+AS_OUTLET( BeeUIImageView, imgState)
 
 @property (nonatomic, strong) StatementShop *data;
 

vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m

@@ -42,6 +42,7 @@ SUPPORT_RESOURCE_LOADING( YES )
 DEF_MODEL( VankeStatementListModel, model )
 DEF_OUTLET( BeeUIScrollView,     list )
 DEF_OUTLET( VankeStatementDetailMonthCell_iPhone, settlementBar)
+DEF_OUTLET( BeeUIImageView, imgState)
 
 - (void)load
 {
@@ -127,6 +128,7 @@ ON_CREATE_VIEWS( signal )
 //    self.model.nameLike = _projectNameLike;
 //    self.model.salesDateEquals = _salesDate;
 //    _searchBar.text = _projectNameLike;
+    //TODO 这里要求重新查询明细
     _model.settleEquals = [NSDate date];
 }
 
@@ -188,6 +190,7 @@ ON_SIGNAL3( VankeStatementListModel, RELOADED, signal )
     self.list.footerMore = self.model.more;
     [self.list reloadData];
     $(self.settlementBar).DATA(_data);
+    $(self.imgState).DATA([NSString stringWithFormat:@"%@_big.png", _data.state]);
 }
 
 #pragma UISearchBarDelegate
@@ -198,9 +201,9 @@ ON_SIGNAL3( VankeStatementListModel, RELOADED, signal )
     [self.model firstPage];
 }
 
-#pragma VankeStatementMonthCell_iPhone
+#pragma VankeStatementDetailMonthCell_iPhone
 
-ON_SIGNAL3(VankeStatementMonthCell_iPhone, pickerMask, signal) {
+ON_SIGNAL3(VankeStatementDetailMonthCell_iPhone, pickerMask, signal) {
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"\n\n\n\n\n\n\n\n\n\n" message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     UIDatePicker *picker = [[UIDatePicker alloc] init];
     [picker setDatePickerMode:UIDatePickerModeDate];
@@ -214,6 +217,10 @@ ON_SIGNAL3(VankeStatementMonthCell_iPhone, pickerMask, signal) {
         }];
         action;
     })];
+    [alertController addAction:({
+        UIAlertAction *action = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
+        action;
+    })];
     
     UIPopoverPresentationController *popoverController = alertController.popoverPresentationController;
     popoverController.sourceView = self.view;

vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.xml

@@ -3,8 +3,9 @@
 <ui namespace="VankeStatementDetailListBoard_iPhone">
     <linear class="wrapper">
         <image class="bg" />
-        <list id="list"/>
+        <list id="list" />
         <VankeStatementDetailMonthCell_iPhone id="settlementBar" />
+        <image id="imgState" class="image-state" />
     </linear>
     
     <style type="text/css">
@@ -42,5 +43,11 @@
             top: 64px;
         }
         
+        .image-state {
+            position: absolute;
+            left: 0px;
+            top: 64px;
+            image-src: url(unconfirmed_big.png);
+        }
     </style>
 </ui>

vanke/view_iPhone/templates/statement/VankeStatementDetailListCell_iPhone.m

@@ -46,7 +46,12 @@ DEF_OUTLET(BeeUILabel, lblDateRange)
         return;
     }
     
-    $(self.imgPhoto).DATA(@"bill.png");
+    if ([item.direction intValue] < 0) {
+        $(self.imgPhoto).DATA(@"money_reduce.png");
+    } else {
+        $(self.imgPhoto).DATA(@"money_add.png");
+    }
+    
     $(self.lblName).DATA(item.subject);
     $(self.lblState).DATA(@"已确认");
     

vanke/view_iPhone/templates/statement/VankeStatementDetailMonthCell_iPhone.xml

@@ -107,6 +107,12 @@
         padding-top: 2px;
     }
     
+    .date-col .date-picker {
+        image-src: url(arrow_down.png);
+        width: auto;
+        height: 100%;
+    }
+    
     #pickerMask {
         position: absolute;
         left: 0px;

vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m

@@ -90,7 +90,7 @@ ON_CREATE_VIEWS( signal )
         } else {
             for ( BeeUIScrollItem *item in self.list.items )
             {
-                item.size = CGSizeMake( self.list.width / self.list.lineCount, 80 );
+                item.size = CGSizeMake( self.list.width / self.list.lineCount, 70 );
                 item.order = 0;
                 item.rule = BeeUIScrollLayoutRule_Fall;
                 item.clazz = [VankeStatementListItemCell_iPhone class];
@@ -175,7 +175,7 @@ ON_DID_DISAPPEAR( signal )
 ON_SIGNAL3( VankeStatementListBoard_iPhone, searchBar, signal )
 {
     NSString *nameLike = [VankeUtil trim:_searchBar.text];
-    self.model.shopNameOrCodeLike = nameLike;
+    self.model.shopLike = nameLike;
     [self.model firstPage];
 }
 
@@ -214,6 +214,10 @@ ON_SIGNAL3(VankeStatementMonthCell_iPhone, pickerMask, signal) {
         }];
         action;
     })];
+    [alertController addAction:({
+        UIAlertAction *action = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
+        action;
+    })];
     
     UIPopoverPresentationController *popoverController = alertController.popoverPresentationController;
     popoverController.sourceView = self.view;

vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.xml

@@ -49,7 +49,7 @@
             position: absolute;
             left: 0px;
             top: 139px;
-            placeholder: "请输入商铺名称或代码搜索";
+            placeholder: "请输入商家代码或名称";
         }
         
     </style>

vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.h

@@ -25,5 +25,6 @@ AS_OUTLET(BeeUIImageView, imgPhoto)
 AS_OUTLET(BeeUILabel, lblName)
 AS_OUTLET(BeeUIImageView, lblState)
 AS_OUTLET(BeeUILabel, lblAmount)
+AS_OUTLET(BeeUIImageView, imgState)
 
 @end

vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.m

@@ -29,6 +29,7 @@ DEF_OUTLET(BeeUIImageView, imgPhoto)
 DEF_OUTLET(BeeUILabel, lblName)
 DEF_OUTLET(BeeUIImageView, lblState)
 DEF_OUTLET(BeeUILabel, lblAmount)
+DEF_OUTLET(BeeUIImageView, imgState)
 
 - (void)load
 {
@@ -49,6 +50,7 @@ DEF_OUTLET(BeeUILabel, lblAmount)
     $(self.lblName).DATA([item codeName]);
     $(self.lblState).DATA(@"已确认");
     $(self.lblAmount).DATA(item.amount.description);
+    $(self.imgState).DATA([NSString stringWithFormat:@"%@.png", item.state]);
 }
 
 - (void)layoutDidFinish

vanke/view_iPhone/templates/statement/VankeStatementListItemCell_iPhone.xml

@@ -22,7 +22,12 @@
                      <label class="unit">元</label>
                  </linear>
              </linear>
+             
+             <linear orientation="v" class="col state-col">
+                 <image id="imgState" class="state"/>
+             </linear>            
         </linear>
+        
     </linear>
     
     <style type="text/css">
@@ -81,7 +86,7 @@
         }
         
         .name-col {
-            width: 50%;
+            width: 35%;
             margin-right: 5px;
         }
         
@@ -93,10 +98,8 @@
         }
         
         .amount-col {
-            width: 25%;
+            width: 22%;
             align: right;
-            position: absolute;
-            right: 10px;
         }
         
         .amount-col .amount-wrapper {
@@ -115,5 +118,17 @@
             color: #aaaaaa;
         }
         
+        .state-col {
+            width: auto;
+            position: absolute;
+            right: 0px;
+            top: -15px;
+        }
+        
+        .state-col .state {
+            height: 100%;
+            width: auto;
+        }
+        
     </style>
 </ui>
\ No newline at end of file

vanke/view_iPhone/templates/statement/VankeStatementMonthCell_iPhone.xml

@@ -110,6 +110,12 @@
         padding-top: 2px;
     }
     
+    .date-col .date-picker {
+        image-src: url(arrow_down.png);
+        width: auto;
+        height: 100%;
+    }
+    
     #pickerMask {
         position: absolute;
         left: 0px;