Commit cf50496861498df8da5aca792cdedf555cc151cc

Authored by gaiyaguang
1 parent 741e6eb8

2020/05/14 10:03

@@ -39,6 +39,14 @@ class Table { @@ -39,6 +39,14 @@ class Table {
39 } 39 }
40 } 40 }
41 41
  42 + String get maxText{
  43 + if(max==null||max=="0"||max=="null"){
  44 + return "";
  45 + }else{
  46 + return "最多可坐"+max+"人";
  47 + }
  48 + }
  49 +
42 //获取桌位可坐人数 50 //获取桌位可坐人数
43 String get tableNum{ 51 String get tableNum{
44 if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){ 52 if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){
@@ -135,12 +135,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -135,12 +135,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
135 RowMultiText("预订桌位", (detailEntity.tables.length.toString()+"个")), 135 RowMultiText("预订桌位", (detailEntity.tables.length.toString()+"个")),
136 Align( 136 Align(
137 alignment: Alignment.centerRight, 137 alignment: Alignment.centerRight,
138 - child: Row(  
139 - mainAxisSize: MainAxisSize.min,  
140 - children: detailEntity.tables.map((table){  
141 - return TableItem(table);  
142 - }).toList(),  
143 - ), 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,)
144 ), 141 ),
145 RowMultiText("客户姓名", detailEntity.rnameStr), 142 RowMultiText("客户姓名", detailEntity.rnameStr),
146 RowMultiText("客户电话", detailEntity.phone), 143 RowMultiText("客户电话", detailEntity.phone),
@@ -79,8 +79,8 @@ class HomePageState extends State<HomePage>{ @@ -79,8 +79,8 @@ class HomePageState extends State<HomePage>{
79 WidgetsBinding.instance.addPostFrameCallback((_){ 79 WidgetsBinding.instance.addPostFrameCallback((_){
80 if(widget.initialIndex==0)return; 80 if(widget.initialIndex==0)return;
81 getUntreatedMessage(); 81 getUntreatedMessage();
82 - UpdateModel updateModel=new UpdateModel();  
83 - updateModel.checkUpdate(context); 82 +// UpdateModel updateModel=new UpdateModel();
  83 +// updateModel.checkUpdate(context);
84 }); 84 });
85 } 85 }
86 86
@@ -86,7 +86,7 @@ class Utils { @@ -86,7 +86,7 @@ class Utils {
86 static goShareInvicationToWeChat(String rid){ 86 static goShareInvicationToWeChat(String rid){
87 String _webPageUrl = "http://colorcun.com/"; 87 String _webPageUrl = "http://colorcun.com/";
88 String _thumbnail = 88 String _thumbnail =
89 - "http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148572.jpg"; 89 + "https://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148572.jpg";
90 String _title = "用餐已为您安排,点击查看详情"; 90 String _title = "用餐已为您安排,点击查看详情";
91 String _userName = "gh_487873d353b3"; 91 String _userName = "gh_487873d353b3";
92 String _path = "pages/customer/index?id=$rid&hasInvitation=1"; 92 String _path = "pages/customer/index?id=$rid&hasInvitation=1";
@@ -56,12 +56,12 @@ class NeedItemState extends State<NeedItem>{ @@ -56,12 +56,12 @@ class NeedItemState extends State<NeedItem>{
56 children: <Widget>[ 56 children: <Widget>[
57 Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(30),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,), 57 Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(30),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
58 Offstage( 58 Offstage(
59 - offstage: table.tableNum.isEmpty?true:false, 59 + offstage: table.maxText.isEmpty?true:false,
60 child: Column( 60 child: Column(
61 mainAxisSize: MainAxisSize.min, 61 mainAxisSize: MainAxisSize.min,
62 children: <Widget>[ 62 children: <Widget>[
63 VEmptyView(5), 63 VEmptyView(5),
64 - Text(table.tableNum,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,), 64 + Text(table.maxText,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
65 ], 65 ],
66 ), 66 ),
67 ), 67 ),