fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ios更新合并

remove_uniapp
fmk 3 years ago
parent
a5d3734727
commit
f92c5d952b
3 changed files with 158 additions and 166 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      lib/community/community_view/community_dynamic.dart
  2. 11
      lib/main.dart
  3. 309
      lib/mine/recharge_page.dart

4
lib/community/community_view/community_dynamic.dart
Unescape View File

@ -776,8 +776,8 @@ class _CommunityDynamic extends State<CommunityDynamic> {
topLeft: const Radius.circular(25.0), topLeft: const Radius.circular(25.0),
topRight: const Radius.circular(25.0))), topRight: const Radius.circular(25.0))),
child: Container( child: Container(
width: 100.w, width: 130.w,
height: 100.h, height: 130.h,
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(

11
lib/main.dart
Unescape View File

@ -131,8 +131,7 @@ final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin();
EventBus eventBus = EventBus(sync: true); EventBus eventBus = EventBus(sync: true);
Route lastRoutePage;//记录最后一次启动的页面 Route lastRoutePage;
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
final Locale appLocale; final Locale appLocale;
final bool isFirst; final bool isFirst;
@ -188,10 +187,10 @@ class MyApp extends StatelessWidget {
), ),
onGenerateRoute: (settings) { onGenerateRoute: (settings) {
final String name = settings.name; final String name = settings.name;
if(lastRoutePage?.settings?.name == name){//这次启动的页面是否和上一次启动的页面相同 if(lastRoutePage?.settings?.name == name){
if(lastRoutePage?.settings?.name == "/router/personal_page"//这次启动的是不是个人页面 if(lastRoutePage?.settings?.name == "/router/personal_page"
&& lastRoutePage.navigator != null)//上一次启动的页面是否已经退出 && lastRoutePage.navigator != null)
lastRoutePage.navigator.pop();//如果上一次启动的页面还没退出就主动退出上一次的页面,并接着启动这次要启动的页面 lastRoutePage.navigator.pop();
} }
final Function pageContentBuilder = routers[name]; final Function pageContentBuilder = routers[name];

309
lib/mine/recharge_page.dart
Unescape View File

@ -143,178 +143,171 @@ class _RechargePage extends State<RechargePage> {
color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
child: Stack( child: Stack(
children: [ children: [
SingleChildScrollView( Column(children: [
physics: BouncingScrollPhysics(), SingleChildScrollView(
child: Container( physics: BouncingScrollPhysics(),
margin: EdgeInsets.only(left: 16, right: 16), child: Container(
child: Column( margin: EdgeInsets.only(left: 16, right: 16),
children: [ child: Column(
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, Column(
mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ mainAxisAlignment: MainAxisAlignment.start,
// ItemInputWidget( children: [
// S.of(context).qingshuruchongzhijine, // ItemInputWidget(
// hintText: "", // S.of(context).qingshuruchongzhijine,
// controller: controller, // hintText: "",
// padding: EdgeInsets.all(20), // controller: controller,
// errorText: S.of(context).chongzhizuixiaojine(100), // padding: EdgeInsets.all(20),
// titleColor: Color(0xFF727272), // errorText: S.of(context).chongzhizuixiaojine(100),
// errorTextColor: Color(0xFF32A060), // titleColor: Color(0xFF727272),
// radius: 8, // errorTextColor: Color(0xFF32A060),
// discount: discount / 10, // radius: 8,
// style: TextStyle( // discount: discount / 10,
// fontWeight: FontWeight.bold, // style: TextStyle(
// fontSize: 27.sp, // fontWeight: FontWeight.bold,
// color: color, // fontSize: 27.sp,
// ), // color: color,
// inputLimit: 6, // ),
// textInputType: TextInputType.number, // inputLimit: 6,
// textInputFormatter: // textInputType: TextInputType.number,
// FilteringTextInputFormatter.digitsOnly, // textInputFormatter:
// onChanged: (value) { // FilteringTextInputFormatter.digitsOnly,
// if (value != null && // onChanged: (value) {
// value != "" && // if (value != null &&
// double.tryParse(value) < 100) { // value != "" &&
// color = Colors.red; // double.tryParse(value) < 100) {
// } else { // color = Colors.red;
// color = Colors.black; // } else {
// } // color = Colors.black;
// setState(() {}); // }
// }, // setState(() {});
// ), // },
Padding( // ),
padding: EdgeInsets.only(top: 26, bottom: 28), SizedBox(height:20,),
child: Text( Row(
S.of(context).chongzhi, children: [
style: TextStyle( Expanded(
fontSize: 28.sp, child: Text(
color: Color(0xFF181818), S.of(context).zhanghuyue,
fontWeight: MyFontWeight.semi_bold), style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
)),
Text.rich(
TextSpan(children: [
TextSpan(
text: "$mBalance",
style: TextStyle(
fontSize: 26.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
),
TextSpan(
text: "元",
style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
],
),
SizedBox(height: 28),
rechargeList(),
SizedBox(height:22),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
if (vipRuleDetails?.recharge != null &&
vipRuleDetails.recharge != "")
Expanded(
child: Container(
color: Colors.white,
child: Html(
data: "注意:${vipRuleDetails?.recharge ?? ""}",
customImageRenders: {
networkSourceMatcher(): networkImageRender(
loadingWidget: () {
return Container();
},
),
},
),
),
)
],
), ),
],
),
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 16.h,
bottom: 4.h,
), ),
Row( padding: EdgeInsets.only(
children: [ top: 20.h,
Expanded( bottom: 20.h,
child: Text(
S.of(context).zhanghuyue,
style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
)),
Text.rich(
TextSpan(children: [
TextSpan(
text: "$mBalance",
style: TextStyle(
fontSize: 26.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
),
TextSpan(
text: "元",
style: TextStyle(
fontSize: 15.sp,
color: Color(0xFF181818),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
],
), ),
SizedBox(height: 28), // decoration: BoxDecoration(
rechargeList(), // color: Colors.white,
SizedBox(height:22), // borderRadius: BorderRadius.circular(4),
Row( // ),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (vipRuleDetails?.recharge != null && Padding(
vipRuleDetails.recharge != "") padding: EdgeInsets.only(bottom: 16.h),
Expanded( child: Text(
child: Container( S.of(context).zhifufangshi,
color: Colors.white, style: TextStyle(
child: Html( fontSize: 16.sp,
data: "注意:${vipRuleDetails?.recharge ?? ""}", color: Colors.black,
customImageRenders: { fontWeight: FontWeight.bold,
networkSourceMatcher(): networkImageRender(
loadingWidget: () {
return Container();
},
),
},
),
), ),
)
],
),
],
),
Container(
width: double.infinity,
margin: EdgeInsets.only(
top: 16.h,
bottom: 4.h,
),
padding: EdgeInsets.only(
top: 20.h,
bottom: 20.h,
),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.circular(4),
// ),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(bottom: 16.h),
child: Text(
S.of(context).zhifufangshi,
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: FontWeight.bold,
), ),
), ),
), GestureDetector(
GestureDetector( onTap: () {
onTap: () { setState(() {
setState(() { checkIndex = 1;
checkIndex = 1; });
}); },
}, child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Image.asset("assets/image/icon_we_chat.webp"),
Image.asset("assets/image/icon_we_chat.webp"), Expanded(
Expanded( flex: 1,
flex: 1, child: Padding(
child: Padding( padding: EdgeInsets.only(left: 8.w),
padding: EdgeInsets.only(left: 8.w), child: Text(
child: Text( S.of(context).weixinzhifu,
S.of(context).weixinzhifu, style: TextStyle(
style: TextStyle( fontSize: 14.sp,
fontSize: 14.sp, color: Color(0xff353535),
color: Color(0xff353535), ),
), ),
), ),
), ),
), checkView(1),
checkView(1), ],
], ),
), ),
), ],
], ),
), ),
), ],
], ),
), ),
), )
), ],),
Align( Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: GestureDetector( child: GestureDetector(

Write Preview
Loading…
Cancel
Save