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) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "111" 14 +def flutterVersionCode = "273"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '111' 16 + flutterVersionCode = '273'
17 } 17 }
18 18
19 -def flutterVersionName = "1.1.1" 19 +def flutterVersionName = "2.7.3"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.1.1' 21 + flutterVersionName = '2.7.3'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@
262 }; 262 };
263 90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = { 263 90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = {
264 isa = PBXShellScriptBuildPhase; 264 isa = PBXShellScriptBuildPhase;
265 - buildActionMask = 2147483647; 265 + buildActionMask = 12;
266 files = ( 266 files = (
267 ); 267 );
268 inputPaths = ( 268 inputPaths = (
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 ); 290 );
291 runOnlyForDeploymentPostprocessing = 0; 291 runOnlyForDeploymentPostprocessing = 0;
292 shellPath = /bin/sh; 292 shellPath = /bin/sh;
293 - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; 293 + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
294 }; 294 };
295 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = { 295 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
296 isa = PBXShellScriptBuildPhase; 296 isa = PBXShellScriptBuildPhase;
@@ -611,6 +611,11 @@ @@ -611,6 +611,11 @@
611 isa = XCBuildConfiguration; 611 isa = XCBuildConfiguration;
612 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; 612 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
613 buildSettings = { 613 buildSettings = {
  614 + ARCHS = (
  615 + "$(ARCHS_STANDARD)",
  616 + x86_64,
  617 + arm64,
  618 + );
614 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 619 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
615 CLANG_ENABLE_MODULES = YES; 620 CLANG_ENABLE_MODULES = YES;
616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 621 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
@@ -619,7 +624,7 @@ @@ -619,7 +624,7 @@
619 CURRENT_PROJECT_VERSION = 272; 624 CURRENT_PROJECT_VERSION = 272;
620 DEVELOPMENT_TEAM = 8J59HM8B82; 625 DEVELOPMENT_TEAM = 8J59HM8B82;
621 ENABLE_BITCODE = NO; 626 ENABLE_BITCODE = NO;
622 - FLUTTER_BUILD_MODE = release; 627 + FLUTTER_BUILD_MODE = debug;
623 FRAMEWORK_SEARCH_PATHS = ( 628 FRAMEWORK_SEARCH_PATHS = (
624 "$(inherited)", 629 "$(inherited)",
625 "$(PROJECT_DIR)/Flutter", 630 "$(PROJECT_DIR)/Flutter",
@@ -23,6 +23,7 @@ class MyIntegralPage extends StatefulWidget { @@ -23,6 +23,7 @@ class MyIntegralPage extends StatefulWidget {
23 23
24 class _MyIntegralPageState extends State<MyIntegralPage> { 24 class _MyIntegralPageState extends State<MyIntegralPage> {
25 // MyModel myModel; 25 // MyModel myModel;
  26 + ScrollController _controller = ScrollController();
26 @override 27 @override
27 void initState() { 28 void initState() {
28 super.initState(); 29 super.initState();
@@ -44,195 +45,206 @@ class _MyIntegralPageState extends State<MyIntegralPage> { @@ -44,195 +45,206 @@ class _MyIntegralPageState extends State<MyIntegralPage> {
44 }, 45 },
45 ), 46 ),
46 body: NestedScrollView( 47 body: NestedScrollView(
47 - // controller: _scrollViewController,  
48 - headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {  
49 - return <Widget>[  
50 - SliverAppBar(  
51 - automaticallyImplyLeading: false,  
52 - pinned: false,  
53 - floating: false,  
54 - backgroundColor: MyColours.color_f5f5f5,  
55 - expandedHeight: ScreenUtil().setWidth(386 * 2 + 40),  
56 - flexibleSpace: FlexibleSpaceBar(  
57 - collapseMode: CollapseMode.pin,  
58 - background: Column(  
59 - crossAxisAlignment: CrossAxisAlignment.center,  
60 - children: [  
61 - Stack(  
62 - clipBehavior: Clip.none,  
63 - children: [  
64 - Container(  
65 - height: ScreenUtil().setWidth(145 * 2),  
66 - color: MyColours.color_199095,  
67 - child: Column(  
68 - crossAxisAlignment:  
69 - CrossAxisAlignment.center,  
70 - children: [  
71 - VEmptyView(40),  
72 - Container( 48 + controller: _controller,
  49 + headerSliverBuilder:
  50 + (BuildContext context, bool innerBoxIsScrolled) {
  51 + return <Widget>[
  52 + SliverAppBar(
  53 + automaticallyImplyLeading: false,
  54 + pinned: false,
  55 + floating: false,
  56 + backgroundColor: MyColours.color_f5f5f5,
  57 + expandedHeight: ScreenUtil().setWidth(386 * 2 + 40),
  58 + flexibleSpace: FlexibleSpaceBar(
  59 + collapseMode: CollapseMode.pin,
  60 + background: Column(
  61 + crossAxisAlignment: CrossAxisAlignment.center,
  62 + children: [
  63 + Stack(
  64 + clipBehavior: Clip.none,
  65 + children: [
  66 + Container(
  67 + height: ScreenUtil().setWidth(145 * 2),
  68 + color: MyColours.color_199095,
  69 + child: Column(
  70 + crossAxisAlignment:
  71 + CrossAxisAlignment.center,
  72 + children: [
  73 + VEmptyView(40),
  74 + Container(
  75 + alignment: Alignment.center,
  76 + width: double.infinity,
  77 + height:
  78 + ScreenUtil().setWidth(56 * 2),
  79 + child: Text(
  80 + widget.sunModel?.myIntegral !=
  81 + null
  82 + ? widget.sunModel.myIntegral
  83 + : '0',
  84 + style: TextStyle(
  85 + fontSize:
  86 + ScreenUtil().setSp(80),
  87 + color: MyColours.color_fefefe,
  88 + fontWeight: FontWeight.bold),
  89 + )),
  90 + Container(
73 alignment: Alignment.center, 91 alignment: Alignment.center,
74 width: double.infinity, 92 width: double.infinity,
75 - height: ScreenUtil().setWidth(56 * 2), 93 + height: ScreenUtil().setWidth(20 * 2),
76 child: Text( 94 child: Text(
77 - widget.sunModel?.myIntegral != null  
78 - ? widget.sunModel.myIntegral  
79 - : '0', 95 + '当前积分',
80 style: TextStyle( 96 style: TextStyle(
81 - fontSize:  
82 - ScreenUtil().setSp(80),  
83 - color: MyColours.color_fefefe,  
84 - fontWeight: FontWeight.bold),  
85 - )),  
86 - Container(  
87 - alignment: Alignment.center,  
88 - width: double.infinity,  
89 - height: ScreenUtil().setWidth(20 * 2),  
90 - child: Text(  
91 - '当前积分',  
92 - style: TextStyle(  
93 - fontSize: ScreenUtil().setSp(28),  
94 - color: Color.fromRGBO(  
95 - 255, 255, 255, 0.6), 97 + fontSize: ScreenUtil().setSp(28),
  98 + color: Color.fromRGBO(
  99 + 255, 255, 255, 0.6),
  100 + ),
96 ), 101 ),
97 - ),  
98 - )  
99 - ], 102 + )
  103 + ],
  104 + ),
100 ), 105 ),
101 - ),  
102 - Positioned(  
103 - top:  
104 - ScreenUtil().setWidth(145 * 2 - 18 * 2),  
105 - left: ScreenUtil().setWidth(20),  
106 - right: ScreenUtil().setWidth(20),  
107 - child: Column(children: [  
108 - Container(  
109 - // color: Colors.red,  
110 - padding: EdgeInsets.symmetric(  
111 - vertical:  
112 - ScreenUtil().setWidth(20)),  
113 - // height: ScreenUtil().setWidth(205 * 2),  
114 - decoration: BoxDecoration(  
115 - borderRadius: BorderRadius.circular(  
116 - ScreenUtil().setWidth(40)),  
117 - color: Colors.white),  
118 - child: Column(  
119 - children: [  
120 - MyItem(  
121 - title: '上月积分',  
122 - content: widget  
123 - .sunModel?.shangyue !=  
124 - null  
125 - ? '${widget.sunModel.shangyue}'  
126 - : '0',  
127 - needRadius: true,  
128 - ),  
129 - Padding(  
130 - padding: EdgeInsets.symmetric(  
131 - horizontal: ScreenUtil()  
132 - .setWidth(40)),  
133 - child: MyDivider(  
134 - double.infinity,  
135 - ScreenUtil().setWidth(2),  
136 - color: MyColours.color_f3f3f3,  
137 - )),  
138 - MyItem(  
139 - title: '累计积分',  
140 - content: widget.sunModel  
141 - ?.cumulative !=  
142 - null  
143 - ? '${widget.sunModel.cumulative}'  
144 - : '0',  
145 - needRadius: true,  
146 - ),  
147 - Padding(  
148 - padding: EdgeInsets.symmetric(  
149 - horizontal: ScreenUtil()  
150 - .setWidth(40)),  
151 - child: MyDivider(  
152 - double.infinity,  
153 - ScreenUtil().setWidth(2),  
154 - color: MyColours.color_f3f3f3,  
155 - )),  
156 - MyItem(  
157 - title: '本月积分',  
158 - content: widget  
159 - .sunModel?.benyue !=  
160 - null  
161 - ? '${widget.sunModel.cumulative}'  
162 - : '0',  
163 - needRadius: true,  
164 - ),  
165 - Padding(  
166 - padding: EdgeInsets.symmetric(  
167 - horizontal: ScreenUtil()  
168 - .setWidth(40)),  
169 - child: MyDivider(  
170 - double.infinity,  
171 - ScreenUtil().setWidth(2),  
172 - color: MyColours.color_f3f3f3,  
173 - )),  
174 - MyItem(  
175 - title: '待审核积分',  
176 - content: widget  
177 - .sunModel?.reviewed !=  
178 - null  
179 - ? '${widget.sunModel.reviewed}'  
180 - : '0',  
181 - needRadius: true,  
182 - )  
183 - ], 106 + Positioned(
  107 + top: ScreenUtil()
  108 + .setWidth(145 * 2 - 18 * 2),
  109 + left: ScreenUtil().setWidth(20),
  110 + right: ScreenUtil().setWidth(20),
  111 + child: Column(children: [
  112 + Container(
  113 + // color: Colors.red,
  114 + padding: EdgeInsets.symmetric(
  115 + vertical:
  116 + ScreenUtil().setWidth(20)),
  117 + // height: ScreenUtil().setWidth(205 * 2),
  118 + decoration: BoxDecoration(
  119 + borderRadius:
  120 + BorderRadius.circular(
  121 + ScreenUtil()
  122 + .setWidth(40)),
  123 + color: Colors.white),
  124 + child: Column(
  125 + children: [
  126 + MyItem(
  127 + title: '上月积分',
  128 + content: widget.sunModel
  129 + ?.shangyue !=
  130 + null
  131 + ? '${widget.sunModel.shangyue}'
  132 + : '0',
  133 + needRadius: true,
  134 + ),
  135 + Padding(
  136 + padding: EdgeInsets.symmetric(
  137 + horizontal: ScreenUtil()
  138 + .setWidth(40)),
  139 + child: MyDivider(
  140 + double.infinity,
  141 + ScreenUtil().setWidth(2),
  142 + color:
  143 + MyColours.color_f3f3f3,
  144 + )),
  145 + MyItem(
  146 + title: '累计积分',
  147 + content: widget.sunModel
  148 + ?.cumulative !=
  149 + null
  150 + ? '${widget.sunModel.cumulative}'
  151 + : '0',
  152 + needRadius: true,
  153 + ),
  154 + Padding(
  155 + padding: EdgeInsets.symmetric(
  156 + horizontal: ScreenUtil()
  157 + .setWidth(40)),
  158 + child: MyDivider(
  159 + double.infinity,
  160 + ScreenUtil().setWidth(2),
  161 + color:
  162 + MyColours.color_f3f3f3,
  163 + )),
  164 + MyItem(
  165 + title: '本月积分',
  166 + content: widget
  167 + .sunModel?.benyue !=
  168 + null
  169 + ? '${widget.sunModel.cumulative}'
  170 + : '0',
  171 + needRadius: true,
  172 + ),
  173 + Padding(
  174 + padding: EdgeInsets.symmetric(
  175 + horizontal: ScreenUtil()
  176 + .setWidth(40)),
  177 + child: MyDivider(
  178 + double.infinity,
  179 + ScreenUtil().setWidth(2),
  180 + color:
  181 + MyColours.color_f3f3f3,
  182 + )),
  183 + MyItem(
  184 + title: '待审核积分',
  185 + content: widget.sunModel
  186 + ?.reviewed !=
  187 + null
  188 + ? '${widget.sunModel.reviewed}'
  189 + : '0',
  190 + needRadius: true,
  191 + )
  192 + ],
  193 + ),
184 ), 194 ),
185 - ),  
186 - // VEmptyView(60),  
187 - // RoundButton(  
188 - // onPressed: () async {},  
189 - // text: '兑换',  
190 - // fontSize: 34,  
191 - // isBold: false,  
192 - // height: ScreenUtil().setWidth(84),  
193 - // width: ScreenUtil().setWidth(155 * 2),  
194 - // radius: ScreenUtil().setWidth(10),  
195 - // ),  
196 - // VEmptyView(100),  
197 - // Padding(  
198 - // padding: EdgeInsets.symmetric(  
199 - // horizontal: ScreenUtil().setWidth(40)),  
200 - // child: Text(  
201 - // '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',  
202 - // style: TextStyle(  
203 - // fontSize: ScreenUtil().setSp(24),  
204 - // color: MyColours.color_999999,  
205 - // height: 1.3)))  
206 - ])),  
207 - ],  
208 - ),  
209 - ])))  
210 - ];  
211 - },  
212 - body: Column(  
213 - children: [  
214 - // VEmptyView(60),  
215 - // RoundButton(  
216 - // onPressed: () async {},  
217 - // text: '兑换',  
218 - // fontSize: 34,  
219 - // isBold: false,  
220 - // height: ScreenUtil().setWidth(84),  
221 - // width: ScreenUtil().setWidth(155 * 2),  
222 - // radius: ScreenUtil().setWidth(10),  
223 - // ),  
224 - VEmptyView(100),  
225 - Padding(  
226 - padding: EdgeInsets.symmetric(  
227 - horizontal: ScreenUtil().setWidth(40)),  
228 - child: Text(  
229 - '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效；\n5.每个就餐用户在一个店铺，每7天只能提供一个有效订单获得积分。',  
230 - style: TextStyle(  
231 - fontSize: ScreenUtil().setSp(24),  
232 - color: MyColours.color_999999,  
233 - height: 1.3)))  
234 - ],  
235 - ),  
236 - )); 195 + // VEmptyView(60),
  196 + // RoundButton(
  197 + // onPressed: () async {},
  198 + // text: '兑换',
  199 + // fontSize: 34,
  200 + // isBold: false,
  201 + // height: ScreenUtil().setWidth(84),
  202 + // width: ScreenUtil().setWidth(155 * 2),
  203 + // radius: ScreenUtil().setWidth(10),
  204 + // ),
  205 + // VEmptyView(100),
  206 + // Padding(
  207 + // padding: EdgeInsets.symmetric(
  208 + // horizontal: ScreenUtil().setWidth(40)),
  209 + // child: Text(
  210 + // '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效。',
  211 + // style: TextStyle(
  212 + // fontSize: ScreenUtil().setSp(24),
  213 + // color: MyColours.color_999999,
  214 + // height: 1.3)))
  215 + ])),
  216 + ],
  217 + ),
  218 + ])))
  219 + ];
  220 + },
  221 + body: SingleChildScrollView(
  222 + controller: _controller,
  223 + physics: NeverScrollableScrollPhysics(),
  224 + child: Column(
  225 + children: [
  226 + VEmptyView(60),
  227 + // RoundButton(
  228 + // onPressed: () async {},
  229 + // text: '兑换',
  230 + // fontSize: 34,
  231 + // isBold: false,
  232 + // height: ScreenUtil().setWidth(84),
  233 + // width: ScreenUtil().setWidth(155 * 2),
  234 + // radius: ScreenUtil().setWidth(10),
  235 + // ),
  236 + // VEmptyView(100),
  237 + Padding(
  238 + padding: EdgeInsets.symmetric(
  239 + horizontal: ScreenUtil().setWidth(40)),
  240 + child: Text(
  241 + '积分规则：\n1.每成功创建一个内部预订的预订安排微信发送给客户并且客户打开后，获得10积分；\n2.每个餐厅每天每个时段预订安排发送总量不能超过现有桌位数；\n3.同一顾客同一时段的订单，积分只给最早创建内部预订的经理；\n4.订单创建人转发的预订安排，才可获得积分，转发他人创建的订单无效；\n5.每个就餐用户在一个店铺，每7天只能提供一个有效订单获得积分。',
  242 + style: TextStyle(
  243 + fontSize: ScreenUtil().setSp(24),
  244 + color: MyColours.color_999999,
  245 + height: 1.3)))
  246 + ],
  247 + ),
  248 + )));
237 } 249 }
238 } 250 }
@@ -36,7 +36,7 @@ class MyItemState extends State<MyItem> { @@ -36,7 +36,7 @@ class MyItemState extends State<MyItem> {
36 borderRadius: BorderRadius.circular( 36 borderRadius: BorderRadius.circular(
37 widget.needRadius ? ScreenUtil().setWidth(40) : 0)), 37 widget.needRadius ? ScreenUtil().setWidth(40) : 0)),
38 width: double.infinity, 38 width: double.infinity,
39 - height: ScreenUtil().setHeight(122), 39 + height: ScreenUtil().setWidth(122),
40 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)), 40 padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
41 alignment: Alignment.center, 41 alignment: Alignment.center,
42 child: Row( 42 child: Row(