xt / Flutter-ReserveApp · Commits

Go to a project

Commit b89a757741d65c8fd34c6126d7839c4c34025551

Authored by wdn127929
1 parent a8b4d4f6
build: skipped

积分界面适配问题

Inline Side-by-side
Showing 4 changed files with 208 additions and 191 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 = "111"
def flutterVersionCode = "273"
if (flutterVersionCode == null) {
flutterVersionCode = '111'
flutterVersionCode = '273'
}
def flutterVersionName = "1.1.1"
def flutterVersionName = "2.7.3"
if (flutterVersionName == null) {
flutterVersionName = '1.1.1'
flutterVersionName = '2.7.3'
}
apply plugin: 'com.android.application'
... ...
... ... @@ -262,7 +262,7 @@
};
90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
buildActionMask = 12;
files = (
);
inputPaths = (
... ... @@ -290,7 +290,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
};
9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
... ... @@ -611,6 +611,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
arm64,
);
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
... ... @@ -619,7 +624,7 @@
CURRENT_PROJECT_VERSION = 272;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
... ... @@ -23,6 +23,7 @@ class MyIntegralPage extends StatefulWidget {
class _MyIntegralPageState extends State<MyIntegralPage> {
// MyModel myModel;
ScrollController _controller = ScrollController();
@override
void initState() {
super.initState();
... ... @@ -44,195 +45,206 @@ class _MyIntegralPageState extends State<MyIntegralPage> {
},
),
body: NestedScrollView(
// controller: _scrollViewController,
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
automaticallyImplyLeading: false,
pinned: false,
floating: false,
backgroundColor: MyColours.color_f5f5f5,
expandedHeight: ScreenUtil().setWidth(386 * 2 + 40),
flexibleSpace: FlexibleSpaceBar(
collapseMode: CollapseMode.pin,
background: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Stack(
clipBehavior: Clip.none,
children: [
Container(
height: ScreenUtil().setWidth(145 * 2),
color: MyColours.color_199095,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
VEmptyView(40),
Container(
controller: _controller,
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
automaticallyImplyLeading: false,
pinned: false,
floating: false,
backgroundColor: MyColours.color_f5f5f5,
expandedHeight: ScreenUtil().setWidth(386 * 2 + 40),
flexibleSpace: FlexibleSpaceBar(
collapseMode: CollapseMode.pin,
background: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Stack(
clipBehavior: Clip.none,
children: [
Container(
height: ScreenUtil().setWidth(145 * 2),
color: MyColours.color_199095,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
VEmptyView(40),
Container(
alignment: Alignment.center,
width: double.infinity,
height:
ScreenUtil().setWidth(56 * 2),
child: Text(
widget.sunModel?.myIntegral !=
null
? widget.sunModel.myIntegral
: '0',
style: TextStyle(
fontSize:
ScreenUtil().setSp(80),
color: MyColours.color_fefefe,
fontWeight: FontWeight.bold),
)),
Container(
alignment: Alignment.center,
width: double.infinity,
height: ScreenUtil().setWidth(56 * 2),
height: ScreenUtil().setWidth(20 * 2),
child: Text(
widget.sunModel?.myIntegral != null
? widget.sunModel.myIntegral
: '0',
'当前积分',
style: TextStyle(
fontSize:
ScreenUtil().setSp(80),
color: MyColours.color_fefefe,
fontWeight: FontWeight.bold),
)),
Container(
alignment: Alignment.center,
width: double.infinity,
height: ScreenUtil().setWidth(20 * 2),
child: Text(
'当前积分',
style: TextStyle(
fontSize: ScreenUtil().setSp(28),
color: Color.fromRGBO(
255, 255, 255, 0.6),
fontSize: ScreenUtil().setSp(28),
color: Color.fromRGBO(
255, 255, 255, 0.6),
),
),
),
)
],
)
],
),
),
),
Positioned(
top:
ScreenUtil().setWidth(145 * 2 - 18 * 2),
left: ScreenUtil().setWidth(20),
right: ScreenUtil().setWidth(20),
child: Column(children: [
Container(
// color: Colors.red,
padding: EdgeInsets.symmetric(
vertical:
ScreenUtil().setWidth(20)),
// height: ScreenUtil().setWidth(205 * 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(40)),
color: Colors.white),
child: Column(
children: [
MyItem(
title: '上月积分',
content: widget
.sunModel?.shangyue !=
null
? '${widget.sunModel.shangyue}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color: MyColours.color_f3f3f3,
)),
MyItem(
title: '累计积分',
content: widget.sunModel
?.cumulative !=
null
? '${widget.sunModel.cumulative}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color: MyColours.color_f3f3f3,
)),
MyItem(
title: '本月积分',
content: widget
.sunModel?.benyue !=
null
? '${widget.sunModel.cumulative}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color: MyColours.color_f3f3f3,
)),
MyItem(
title: '待审核积分',
content: widget
.sunModel?.reviewed !=
null
? '${widget.sunModel.reviewed}'
: '0',
needRadius: true,
)
],
Positioned(
top: ScreenUtil()
.setWidth(145 * 2 - 18 * 2),
left: ScreenUtil().setWidth(20),
right: ScreenUtil().setWidth(20),
child: Column(children: [
Container(
// color: Colors.red,
padding: EdgeInsets.symmetric(
vertical:
ScreenUtil().setWidth(20)),
// height: ScreenUtil().setWidth(205 * 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
ScreenUtil()
.setWidth(40)),
color: Colors.white),
child: Column(
children: [
MyItem(
title: '上月积分',
content: widget.sunModel
?.shangyue !=
null
? '${widget.sunModel.shangyue}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color:
MyColours.color_f3f3f3,
)),
MyItem(
title: '累计积分',
content: widget.sunModel
?.cumulative !=
null
? '${widget.sunModel.cumulative}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color:
MyColours.color_f3f3f3,
)),
MyItem(
title: '本月积分',
content: widget
.sunModel?.benyue !=
null
? '${widget.sunModel.cumulative}'
: '0',
needRadius: true,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil()
.setWidth(40)),
child: MyDivider(
double.infinity,
ScreenUtil().setWidth(2),
color:
MyColours.color_f3f3f3,
)),
MyItem(
title: '待审核积分',
content: widget.sunModel
?.reviewed !=
null
? '${widget.sunModel.reviewed}'
: '0',
needRadius: true,
)
],
),
),
),
// VEmptyView(60),
// RoundButton(
// onPressed: () async {},
// text: '兑换',
// fontSize: 34,
// isBold: false,
// height: ScreenUtil().setWidth(84),
// width: ScreenUtil().setWidth(155 * 2),
// radius: ScreenUtil().setWidth(10),
// ),
// VEmptyView(100),
// Padding(
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(40)),
// child: Text(
// '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',
// style: TextStyle(
// fontSize: ScreenUtil().setSp(24),
// color: MyColours.color_999999,
// height: 1.3)))
])),
],
),
])))
];
},
body: Column(
children: [
// VEmptyView(60),
// RoundButton(
// onPressed: () async {},
// text: '兑换',
// fontSize: 34,
// isBold: false,
// height: ScreenUtil().setWidth(84),
// width: ScreenUtil().setWidth(155 * 2),
// radius: ScreenUtil().setWidth(10),
// ),
VEmptyView(100),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Text(
'积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效；\n5.每个就餐用户在一个店铺，每7天只能提供一个有效订单获得积分。',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_999999,
height: 1.3)))
],
),
));
// VEmptyView(60),
// RoundButton(
// onPressed: () async {},
// text: '兑换',
// fontSize: 34,
// isBold: false,
// height: ScreenUtil().setWidth(84),
// width: ScreenUtil().setWidth(155 * 2),
// radius: ScreenUtil().setWidth(10),
// ),
// VEmptyView(100),
// Padding(
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(40)),
// child: Text(
// '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',
// style: TextStyle(
// fontSize: ScreenUtil().setSp(24),
// color: MyColours.color_999999,
// height: 1.3)))
])),
],
),
])))
];
},
body: SingleChildScrollView(
controller: _controller,
physics: NeverScrollableScrollPhysics(),
child: Column(
children: [
VEmptyView(60),
// RoundButton(
// onPressed: () async {},
// text: '兑换',
// fontSize: 34,
// isBold: false,
// height: ScreenUtil().setWidth(84),
// width: ScreenUtil().setWidth(155 * 2),
// radius: ScreenUtil().setWidth(10),
// ),
// VEmptyView(100),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40)),
child: Text(
'积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效；\n5.每个就餐用户在一个店铺，每7天只能提供一个有效订单获得积分。',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_999999,
height: 1.3)))
],
),
)));
}
}
... ...
... ... @@ -36,7 +36,7 @@ class MyItemState extends State<MyItem> {
borderRadius: BorderRadius.circular(
widget.needRadius ? ScreenUtil().setWidth(40) : 0)),
width: double.infinity,
height: ScreenUtil().setHeight(122),
height: ScreenUtil().setWidth(122),
padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
alignment: Alignment.center,
child: Row(
... ...