xt / Flutter-ReserveApp · Commits

Go to a project

Commit 741e6eb834a82085d76b7cc84d782bab29e4aa79

Authored by gaiyaguang
1 parent d43abb8c
build: skipped

bug修复

Inline Side-by-side
Showing 7 changed files with 82 additions and 77 deletions
... ... @@ -13,7 +13,7 @@ PODS:
- Flutter
- fluwx (0.0.1):
- Flutter
- WechatOpenSDK (= 1.8.6.2)
- WechatOpenSDK (= 1.8.7.1)
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
... ... @@ -47,7 +47,7 @@ PODS:
- Flutter
- url_launcher_web (0.0.1):
- Flutter
- WechatOpenSDK (1.8.6.2)
- WechatOpenSDK (1.8.7.1)
DEPENDENCIES:
- audioplayers (from `.symlinks/plugins/audioplayers/ios`)
... ... @@ -125,7 +125,7 @@ SPEC CHECKSUMS:
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
fluwx: 03e098a7284c556d7b197e0b82984eb0b25183af
fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb
JCore: d75c0306dc99875d323d23e5a063b3a3ef22335a
... ... @@ -142,7 +142,7 @@ SPEC CHECKSUMS:
url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
PODFILE CHECKSUM: a5c9f5cbedb217afa5108d75ed888500ab689803
... ...
... ... @@ -70,7 +70,7 @@ class MyAppState extends State<MyApp>{
appId: "wx85aa3cdd0f791e65",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/one_key");
universalLink: "https://xt04.colorcun.com/link/");
var result = await isWeChatInstalled;
LogUtil.v("is installed $result");
}
... ...
import 'package:json_annotation/json_annotation.dart';
import 'package:one_key/utils/log_util.dart';
part 'table.g.dart';
... ... @@ -40,16 +41,16 @@ class Table {
//获取桌位可坐人数
String get tableNum{
if(max!=null&&max.isNotEmpty&&max!="0"){
return "最多可坐$max人";
}else if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){
if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){
return "";
}else{
}else if(most_pnum!=null&&most_pnum.isNotEmpty&&most_pnum!="0"&&most_pnum!="null"){
if(table_pnum==most_pnum){
return "$table_pnum人";
}else{
return "$table_pnum-$most_pnum人";
}
}else{
return "$table_pnum人";
}
}
... ...
... ... @@ -82,10 +82,10 @@ class InvicationPageState extends State<InvicationPage>{
onTap: (){
Navigator.of(context).pop();
},
behavior: HitTestBehavior.opaque,
child: Container(
width: double.infinity,
alignment: Alignment.centerLeft,
padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30)),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
... ...
... ... @@ -36,78 +36,82 @@ class NotebookItemState extends State<NoteBookItem>{
Color textColor=(notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_353535;
return GestureDetector(
onTap: (){
NavigatorUtil.goNotebookDetailPage(context,notebook.id);
},
child: Container(
width: double.infinity,
height: ScreenUtil().setHeight(110),
color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
child: Row(
children: <Widget>[
Container(
width: ScreenUtil().setWidth(171),
alignment: Alignment.center,
child: Text(
notebook.tableinfoStr,
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(28)),
),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(230),
alignment: Alignment.center,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),
VEmptyView(10),
Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
],
),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
return Container(
width: double.infinity,
height: ScreenUtil().setHeight(110),
color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
child: Row(
children: <Widget>[
GestureDetector(
onTap: (){
NavigatorUtil.goNotebookDetailPage(context,notebook.id);
},
child: Row(
children: <Widget>[
Container(
width: ScreenUtil().setWidth(171),
alignment: Alignment.center,
child: Text(
notebook.tableinfoStr,
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(28)),
),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(230),
alignment: Alignment.center,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),
VEmptyView(10),
Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
],
),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(159),
alignment: Alignment.center,
child: Text(
notebook.ddateStr,
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(28)),
),
),
],
),
Container(
width: ScreenUtil().setWidth(159),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
),
GestureDetector(
onTap: _onOperateClick,
child: Container(
width: ScreenUtil().setWidth(184),
alignment: Alignment.center,
child: Text(
notebook.ddateStr,
notebook.operationText,
style: TextStyle(
color: textColor,
color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(28)),
),
),
MyDivider(
ScreenUtil().setWidth(1),
ScreenUtil().setHeight(90),
color: MyColours.color_ededed,
),
GestureDetector(
onTap: _onOperateClick,
child: Container(
width: ScreenUtil().setWidth(184),
alignment: Alignment.center,
child: Text(
notebook.operationText,
style: TextStyle(
color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(28)),
),
),
),
],
),
),
],
),
);
}
... ...
... ... @@ -295,7 +295,7 @@ packages:
name: fluwx
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.7"
version: "2.0.9"
front_end:
dependency: transitive
description:
... ...
... ... @@ -64,7 +64,7 @@ dependencies:
# 日历
table_calendar: ^2.2.1
# 微信SDK
fluwx: ^2.0.7
fluwx: ^2.0.9
#网页，短信，电话
url_launcher: ^5.4.2
# 滚轮选择器
... ...