xt / Flutter-ReserveApp · Commits

Go to a project

Commit 41d9bd188e66bae9a6814ca774d543a08fc132cf

Authored by wdn127929
1 parent cd6d31b4
build: skipped

2.7.7

Inline Side-by-side
Showing 5 changed files with 90 additions and 49 deletions
... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "276"
def flutterVersionCode = "277"
if (flutterVersionCode == null) {
flutterVersionCode = '276'
flutterVersionCode = '277'
}
def flutterVersionName = "2.7.6"
def flutterVersionName = "2.7.7"
if (flutterVersionName == null) {
flutterVersionName = '2.7.6'
flutterVersionName = '2.7.7'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -473,7 +473,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 274;
CURRENT_PROJECT_VERSION = 277;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -488,7 +488,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.4;
MARKETING_VERSION = 2.7.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -618,7 +618,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 274;
CURRENT_PROJECT_VERSION = 277;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -633,7 +633,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.4;
MARKETING_VERSION = 2.7.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -653,7 +653,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 274;
CURRENT_PROJECT_VERSION = 277;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -668,7 +668,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.4;
MARKETING_VERSION = 2.7.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -69,7 +69,7 @@ ReserveDetailSunModel _$ReserveDetailSunModelFromJson(
?.map((e) =>
e == null ? null : Customers.fromJson(e as Map<String, dynamic>))
?.toList(),
json['cancel'] == null
json['cancel'] == null || json['cancel'] == ''
? null
: Cancel.fromJson(json['cancel'] as Map<String, dynamic>),
json['order'] == null
... ...
... ... @@ -620,6 +620,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
formatPhone != '') {
if (userModel.user.role_name !=
'管理员' &&
userModel.user.role_name !=
'店长' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid) {
... ... @@ -632,9 +634,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
"客户电话",
userModel.user.role_name !=
'管理员' &&
userModel
.user.role_name !=
'店长' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid && formatPhone.trim().length > 0
userModel
.user.openid &&
formatPhone
.trim()
.length >
0
? Utils.starPhone(formatPhone)
: formatPhone),
),
... ... @@ -981,14 +991,26 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
return;
}
NavigatorUtil.goSmsPage(
context, detailEntity.id);
context,
detailEntity.id,
);
break;
case 3: //电话
if (detailEntity.phone != null &&
detailEntity
.phone.isNotEmpty) {
Utils.goPhone(
detailEntity.phone);
if (userModel.user.role_name !=
'管理员' &&
userModel.user.role_name !=
'店长' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid) {
Utils.showToast("您无权拨打该电话");
} else {
Utils.goPhone(
detailEntity.phone);
}
} else {
Utils.showToast("没有预订人电话信息");
}
... ... @@ -1066,6 +1088,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
decoration: BoxDecoration(
border: Border.all(
color: userModel.user.role_name != '管理员' &&
userModel.user.role_name != '店长' &&
widget.uid != "null" &&
widget.uid != userModel.user.openid
? MyColours.color_999999
... ... @@ -1083,6 +1106,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
child: _cancelAndChangeBtn(() {
print('点击变更预订');
if (userModel.user.role_name != '管理员' &&
userModel.user.role_name != '店长' &&
widget.uid != "null" &&
widget.uid != userModel.user.openid) {
} else {
... ... @@ -1092,6 +1116,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}, '变更预订',
fontColor: userModel.user.role_name !=
'管理员' &&
userModel.user.role_name !=
'店长' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid
... ... @@ -1101,6 +1127,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
ScreenUtil().setWidth(2),
ScreenUtil().setWidth(50),
color: userModel.user.role_name != '管理员' &&
userModel.user.role_name != '店长' &&
widget.uid != "null" &&
widget.uid != userModel.user.openid
? MyColours.color_999999
... ... @@ -1109,6 +1136,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
Expanded(
child: _cancelAndChangeBtn(() {
if (userModel.user.role_name != '管理员' &&
userModel.user.role_name != '店长' &&
widget.uid != "null" &&
widget.uid != userModel.user.openid) {
} else {
... ... @@ -1117,6 +1145,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}, '取消预订',
fontColor: userModel.user.role_name !=
'管理员' &&
userModel.user.role_name !=
'店长' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid
... ...
... ... @@ -643,7 +643,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
VEmptyView(20),
Row(
// mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
InkWell(
onTap: () {
... ... @@ -652,50 +652,61 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
});
},
child: Container(
// color: Colors.red,
// height: ScreenUtil().setWidth(34),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(102),
top: ScreenUtil().setWidth(10),
bottom: ScreenUtil().setWidth(10)),
child: Center(
child: Image.asset(
_check
? "assets/mine_radio_sel.png"
: "assets/mine_radio_nor.png",
width: ScreenUtil().setWidth(42),
height: ScreenUtil().setWidth(42)),
))),
alignment: Alignment.topCenter,
// color: Colors.red,
height: ScreenUtil().setWidth(134),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(102),
bottom: ScreenUtil().setWidth(10)),
child: Image.asset(
_check
? "assets/mine_radio_sel.png"
: "assets/mine_radio_nor.png",
width: ScreenUtil().setWidth(42),
height: ScreenUtil().setWidth(42)),
)),
HEmptyView(6),
Text(
'已阅读并同意',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535),
Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(10)),
child: Text(
'已阅读并同意',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535),
),
),
InkWell(
onTap: () {
NavigatorUtil.goWebPage(context, '软件服务协议', "xy");
},
child: Text(
'《软件服务协议》',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_2bb5b7),
),
child: Padding(
padding:
EdgeInsets.only(top: ScreenUtil().setWidth(10)),
child: Text(
'《软件服务协议》',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_2bb5b7),
)),
),
Text('及',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535)),
Padding(
padding:
EdgeInsets.only(top: ScreenUtil().setWidth(10)),
child: Text('及',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535))),
InkWell(
onTap: () {
NavigatorUtil.goWebPage(context, '隐私政策', "zc");
},
child: Text('《隐私政策》',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_2bb5b7)),
child: Padding(
padding:
EdgeInsets.only(top: ScreenUtil().setWidth(10)),
child: Text('《隐私政策》',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_2bb5b7))),
)
],
),
... ...