xt / Flutter-ReserveApp · Commits

Go to a project

Commit 46ddf41a073aced7444f4966990c875cda4fc38f

Authored by gaiyaguang
1 parent cf504968
build: skipped

tapd bug修复

Inline Side-by-side
Showing 4 changed files with 40 additions and 24 deletions
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
73 <key>UISupportedInterfaceOrientations</key> 73 <key>UISupportedInterfaceOrientations</key>
74 <array> 74 <array>
75 <string>UIInterfaceOrientationPortrait</string> 75 <string>UIInterfaceOrientationPortrait</string>
  76 + <string>UIInterfaceOrientationLandscapeRight</string>
76 </array> 77 </array>
77 <key>UISupportedInterfaceOrientations~ipad</key> 78 <key>UISupportedInterfaceOrientations~ipad</key>
78 <array> 79 <array>
@@ -184,13 +184,16 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -184,13 +184,16 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
184 ), 184 ),
185 RowMultiText("包间需求", (detailEntity.demands.length.toString()+"个")??""), 185 RowMultiText("包间需求", (detailEntity.demands.length.toString()+"个")??""),
186 Align( 186 Align(
187 - alignment: Alignment.centerRight,  
188 - child: Row(  
189 - mainAxisSize: MainAxisSize.min,  
190 - children: detailEntity.demands.map((table){  
191 - return NeedItem(table);  
192 - }).toList(),  
193 - ), 187 + alignment: Alignment.centerRight,
  188 + child: Offstage(
  189 + offstage: detailEntity.demands.length>0?false:true,
  190 + child: Container(
  191 + height: ScreenUtil().setHeight(210),
  192 + child: ListView.builder(itemBuilder: (BuildContext contxt,int index){
  193 + return NeedItem(detailEntity.demands[index]);
  194 + },itemCount: detailEntity.demands.length,shrinkWrap: true,scrollDirection: Axis.horizontal,),
  195 + ),
  196 + )
194 ), 197 ),
195 RowMultiText("客户姓名", detailEntity.rnameStr), 198 RowMultiText("客户姓名", detailEntity.rnameStr),
196 RowMultiText("客户电话", detailEntity.phone), 199 RowMultiText("客户电话", detailEntity.phone),
@@ -90,7 +90,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -90,7 +90,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
90 showBack: true, 90 showBack: true,
91 ), 91 ),
92 Expanded( 92 Expanded(
93 - child: DefaultTextStyle(style: TextStyle(decoration: TextDecoration.none), child: Container( 93 + child: DefaultTextStyle(style: TextStyle(decoration: TextDecoration.none), overflow:TextOverflow.ellipsis,child: Container(
94 color: MyColours.color_ffffff, 94 color: MyColours.color_ffffff,
95 child: SingleChildScrollView( 95 child: SingleChildScrollView(
96 child: Container( 96 child: Container(
@@ -122,12 +122,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -122,12 +122,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
122 RowMultiText("包间需求", (detailEntity.demands.length.toString()+"个")??""), 122 RowMultiText("包间需求", (detailEntity.demands.length.toString()+"个")??""),
123 Align( 123 Align(
124 alignment: Alignment.centerRight, 124 alignment: Alignment.centerRight,
125 - child: Row(  
126 - mainAxisSize: MainAxisSize.min,  
127 - children: detailEntity.demands.map((table){  
128 - return NeedItem(table);  
129 - }).toList(),  
130 - ), 125 + child: Offstage(
  126 + offstage: detailEntity.demands.length>0?false:true,
  127 + child: Container(
  128 + height: ScreenUtil().setHeight(210),
  129 + child: ListView.builder(itemBuilder: (BuildContext contxt,int index){
  130 + return NeedItem(detailEntity.demands[index]);
  131 + },itemCount: detailEntity.demands.length,shrinkWrap: true,scrollDirection: Axis.horizontal,),
  132 + ),
  133 + )
131 ) 134 )
132 ], 135 ],
133 ), 136 ),
@@ -135,9 +138,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -135,9 +138,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
135 RowMultiText("预订桌位", (detailEntity.tables.length.toString()+"个")), 138 RowMultiText("预订桌位", (detailEntity.tables.length.toString()+"个")),
136 Align( 139 Align(
137 alignment: Alignment.centerRight, 140 alignment: Alignment.centerRight,
138 - child: ListView.builder(itemBuilder: (BuildContext contxt,int index){  
139 - return TableItem(detailEntity.tables[index]);  
140 - },itemCount: detailEntity.tables.length,shrinkWrap: true,scrollDirection: Axis.horizontal,) 141 + child: Offstage(
  142 + offstage: detailEntity.tables.length>0?false:true,
  143 + child: Container(
  144 + height: ScreenUtil().setHeight(210),
  145 + child: ListView.builder(itemBuilder: (BuildContext contxt,int index){
  146 + return TableItem(detailEntity.tables[index]);
  147 + },itemCount: detailEntity.tables.length,shrinkWrap: true,scrollDirection: Axis.horizontal,),
  148 + ),
  149 + )
141 ), 150 ),
142 RowMultiText("客户姓名", detailEntity.rnameStr), 151 RowMultiText("客户姓名", detailEntity.rnameStr),
143 RowMultiText("客户电话", detailEntity.phone), 152 RowMultiText("客户电话", detailEntity.phone),
@@ -17,16 +17,19 @@ class RowMultiText extends StatelessWidget{ @@ -17,16 +17,19 @@ class RowMultiText extends StatelessWidget{
17 width: double.infinity, 17 width: double.infinity,
18 height: ScreenUtil().setHeight(80), 18 height: ScreenUtil().setHeight(80),
19 alignment: Alignment.center, 19 alignment: Alignment.center,
20 - child: Stack(  
21 - alignment: Alignment.center, 20 + child: Row(
  21 + crossAxisAlignment: CrossAxisAlignment.center,
22 children: <Widget>[ 22 children: <Widget>[
23 - Positioned(  
24 - left: 0, 23 + Align(
  24 + alignment: Alignment.centerLeft,
25 child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(30)),), 25 child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(30)),),
26 ), 26 ),
27 - Positioned(  
28 - right: 0,  
29 - child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)),), 27 + Expanded(
  28 + child: Container(
  29 + alignment: Alignment.centerRight,
  30 + margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
  31 + child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)),maxLines:1,overflow: TextOverflow.ellipsis,),
  32 + ),
30 ) 33 )
31 ], 34 ],
32 ), 35 ),