Skip to content

万
万科
Commit 6506a4d2 authored by Sandy's avatar Sandy
Browse files
Options

删除客单价

parent 6d357d32
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 15 deletions
vanke.xcodeproj/project.pbxproj
View file @ 6506a4d2
......@@ -80,6 +80,7 @@
19D76AA51D266910006245D6 /* CALayer+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 19D76AA41D266910006245D6 /* CALayer+Addtions.m */; };
8F0419ED1D6ABEF70062800C /* SaleInputAuditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F0419EC1D6ABEF70062800C /* SaleInputAuditViewController.m */; };
8F0419F01D6AC0D20062800C /* SaleInputAuditTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F0419EF1D6AC0D20062800C /* SaleInputAuditTableViewCell.m */; };
8F67FB4B1D7D4D5000808DF1 /* main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F67FB4A1D7D4D5000808DF1 /* main.storyboard */; };
8F8D6A511D6D3734001199FB /* VankeAffairsTenantBoard_iPhone.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8D6A501D6D3734001199FB /* VankeAffairsTenantBoard_iPhone.m */; };
8F8D6A531D6D3894001199FB /* VankeAffairsTenantBoard_iPhone.xml in Resources */ = {isa = PBXBuildFile; fileRef = 8F8D6A521D6D3894001199FB /* VankeAffairsTenantBoard_iPhone.xml */; };
8FBE1E181D6ACDA2002584E5 /* SalesInputAuditListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FBE1E141D6ACDA2002584E5 /* SalesInputAuditListModel.m */; };
......@@ -835,7 +836,7 @@
19605F881D37597300C20590 /* StatementDetailCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatementDetailCell.m; sourceTree = "<group>"; };
19605F891D37597300C20590 /* StatementTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatementTableViewCell.h; sourceTree = "<group>"; };
19605F8A1D37597300C20590 /* StatementTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatementTableViewCell.m; sourceTree = "<group>"; };
19605F911D3759D100C20590 /* Statement.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Statement.storyboard; sourceTree = "<group>"; };
19605F911D3759D100C20590 /* Statement.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Statement.storyboard; path = view_iPhone/templates/statements/Statement.storyboard; sourceTree = "<group>"; };
19605F931D375A4200C20590 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
19605F941D375A4200C20590 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
19605F9E1D3892F600C20590 /* ReportBoardsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportBoardsViewController.h; sourceTree = "<group>"; };
......@@ -864,7 +865,7 @@
19994DBE1D3500030089A129 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; };
19B34CBC1D3A124E0060E272 /* CalculateHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CalculateHelper.h; sourceTree = "<group>"; };
19B34CBD1D3A124E0060E272 /* CalculateHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CalculateHelper.m; sourceTree = "<group>"; };
19B34CC21D3B343D0060E272 /* SalesInPut.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SalesInPut.storyboard; sourceTree = "<group>"; };
19B34CC21D3B343D0060E272 /* SalesInPut.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SalesInPut.storyboard; path = view_iPhone/templates/salesInput/Controller/SalesInPut.storyboard; sourceTree = "<group>"; };
19B34CC41D3B35BB0060E272 /* SaleInputPicCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleInputPicCollectionViewController.h; sourceTree = "<group>"; };
19B34CC51D3B35BB0060E272 /* SaleInputPicCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleInputPicCollectionViewController.m; sourceTree = "<group>"; };
19B34CC71D3B36840060E272 /* SaleInputPicCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleInputPicCollectionViewCell.h; sourceTree = "<group>"; };
......@@ -917,6 +918,7 @@
8F0419EC1D6ABEF70062800C /* SaleInputAuditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleInputAuditViewController.m; sourceTree = "<group>"; };
8F0419EE1D6AC0D20062800C /* SaleInputAuditTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaleInputAuditTableViewCell.h; sourceTree = "<group>"; };
8F0419EF1D6AC0D20062800C /* SaleInputAuditTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SaleInputAuditTableViewCell.m; sourceTree = "<group>"; };
8F67FB4A1D7D4D5000808DF1 /* main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = main.storyboard; sourceTree = "<group>"; };
8F8D6A4F1D6D3734001199FB /* VankeAffairsTenantBoard_iPhone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VankeAffairsTenantBoard_iPhone.h; sourceTree = "<group>"; };
8F8D6A501D6D3734001199FB /* VankeAffairsTenantBoard_iPhone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VankeAffairsTenantBoard_iPhone.m; sourceTree = "<group>"; };
8F8D6A521D6D3894001199FB /* VankeAffairsTenantBoard_iPhone.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = VankeAffairsTenantBoard_iPhone.xml; sourceTree = "<group>"; };
......@@ -2179,7 +2181,6 @@
19D76A9A1D266780006245D6 /* SalesInputViewController.m */,
1912FCF21CCF1493004CF976 /* ChooseProjectTableViewController.h */,
1912FCF31CCF1493004CF976 /* ChooseProjectTableViewController.m */,
19B34CC21D3B343D0060E272 /* SalesInPut.storyboard */,
19B34CC41D3B35BB0060E272 /* SaleInputPicCollectionViewController.h */,
19B34CC51D3B35BB0060E272 /* SaleInputPicCollectionViewController.m */,
19B34CD61D3C8AF80060E272 /* GalleryViewController.h */,
......@@ -2248,7 +2249,6 @@
19605F7C1D37597300C20590 /* Models */,
19605F7F1D37597300C20590 /* ViewControllers */,
19605F841D37597300C20590 /* Views */,
19605F911D3759D100C20590 /* Statement.storyboard */,
);
name = "statements（对账单）";
path = statements;
......@@ -3054,7 +3054,10 @@
C12804EA1BC3727A001ECBAA /* VankeConfig.h */,
C1D58B361BB1BC9200D297FE /* AppDelegate.m */,
C1D58B551BB1BC9200D297FE /* Info.plist */,
8F67FB4A1D7D4D5000808DF1 /* main.storyboard */,
19605F911D3759D100C20590 /* Statement.storyboard */,
C1DED2B71BCEC3F70049BB2D /* LaunchScreen.xib */,
19B34CC21D3B343D0060E272 /* SalesInPut.storyboard */,
C1D58B501BB1BC9200D297FE /* Images.xcassets */,
C10F17831BF7ACA80065F18C /* 3rd */,
C1D58B3A1BB1BC9200D297FE /* controller */,
......@@ -4740,6 +4743,7 @@
C19AC88D1C1735E600DE260E /* confirmed@3x.png in Resources */,
C1D595031BB42A6800D297FE /* page-normal@2x.png in Resources */,
C117864F1C0B3A5900DB7E4B /* notice_icon@3x.png in Resources */,
8F67FB4B1D7D4D5000808DF1 /* main.storyboard in Resources */,
19D76AA11D2667AB006245D6 /* SaleInputPictureTableViewCell.xib in Resources */,
C117866A1C0B4C5200DB7E4B /* bill_remark@2x.png in Resources */,
C19AC89E1C1735E600DE260E /* rejected_big@2x.png in Resources */,
......
vanke/main.storyboard 0 → 100644
View file @ 6506a4d2
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<scenes/>
</document>
vanke/view_iPhone/templates/floor-list/VankeFloorListBoardCell_iPhone.xml
View file @ 6506a4d2
......@@ -29,11 +29,11 @@
<label class="unit">人</label>
</linear>
<linear orientation="h" class="row price-wrapper">
<label class="lbl">客单价:</label>
<label id="lblPrice" class="value"></label>
<label class="unit">元/人</label>
</linear>
<!-- <linear orientation="h" class="row price-wrapper">-->
<!-- <label class="lbl">客单价:</label>-->
<!-- <label id="lblPrice" class="value"></label>-->
<!-- <label class="unit">元/人</label>-->
<!-- </linear>-->
</linear>
</linear>
......@@ -134,9 +134,9 @@
padding-right: -15px;
}
#lblPrice {
padding-right: -32px;
}
<!-- #lblPrice {-->
<!-- padding-right: -32px;-->
<!-- }-->
.data-wrapper .value.red {
color: #ed1b23;
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
View file @ 6506a4d2
......@@ -84,7 +84,7 @@ ON_CREATE_VIEWS( signal )
item.clazz = [NoDataCell_iPhoneCell class];
item.data = @"没有数据，请稍后重试！";
} else {
CGFloat cellHeight = 240;
CGFloat cellHeight = 220;
if (self.listType == CELL_TYPE_PASSENGER) {
cellHeight = 200;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment