1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

Browse Source 
# Conflicts:
#	lib/pages/tab_navigator.dart
pull/1/head
张萌 3 years ago
parent 4c1ec3079e 8fde6eb959
commit 4c3ea957f6
7 changed files with 130 additions and 108 deletions
Show Stats Download Patch File Download Diff File

2
lib/pages/personal/intergral/integral_center_page.dart
Unescape View File

@ -168,7 +168,7 @@ class _integralCenterPageState extends State<integralCenterPage> {
child: Assets.icons.vipFont.image(height: 32.w), child: Assets.icons.vipFont.image(height: 32.w),
), ),
TextSpan( TextSpan(
text: ' 积分中心', text: ' 会员中心',
style: TextStyle( style: TextStyle(
color: Colors.white.withOpacity(0.85), color: Colors.white.withOpacity(0.85),
fontSize: 36.w, fontSize: 36.w,

2
lib/pages/tab_navigator.dart
Unescape View File

@ -1,5 +1,4 @@
import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart';
import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_new_community/ui/community/community_views/community_page.dart'; import 'package:aku_new_community/ui/community/community_views/community_page.dart';
@ -15,6 +14,7 @@ import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'home/home_page.dart'; import 'home/home_page.dart';
import 'opening_code_page/opening_code_page.dart';
import 'personal/personal_page.dart'; import 'personal/personal_page.dart';
class TabNavigator extends StatefulWidget { class TabNavigator extends StatefulWidget {

77
lib/ui/community/activity/activity_detail_page.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/home/activity_detail_model.dart'; import 'package:aku_new_community/models/home/activity_detail_model.dart';
import 'package:aku_new_community/models/home/home_activity_model.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
@ -17,6 +18,7 @@ import 'package:get/get.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'activity_func.dart'; import 'activity_func.dart';
import 'activity_people_list_page.dart';
class ActivityDetailPage extends StatefulWidget { class ActivityDetailPage extends StatefulWidget {
final int id; final int id;
@ -237,40 +239,40 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
format: 'yyyy.MM.dd HH:mm', format: 'yyyy.MM.dd HH:mm',
)}', )}',
), ),
16.hb, // 16.hb,
Row( // Row(
children: [ // children: [
'活动方式'.text.size(28.sp).make().box.width(136.w).make(), // '活动方式'.text.size(28.sp).make().box.width(136.w).make(),
'本次活动介绍' // '本次活动介绍'
.richText // .richText
.tap(() { // .tap(() {
var bottomSheet = Container( // var bottomSheet = Container(
width: double.infinity, // width: double.infinity,
padding: EdgeInsets.all(32.w), // padding: EdgeInsets.all(32.w),
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.white, // color: Colors.white,
borderRadius: BorderRadius.circular(16.w)), // borderRadius: BorderRadius.circular(16.w)),
child: Column( // child: Column(
children: [ // children: [
'活动介绍'.text.size(32.sp).black.bold.make(), // '活动介绍'.text.size(32.sp).black.bold.make(),
32.w.heightBox, // 32.w.heightBox,
_model!.content.text // _model!.content.text
.size(28.sp) // .size(28.sp)
.color(Colors.black.withOpacity(0.65)) // .color(Colors.black.withOpacity(0.65))
.make(), // .make(),
], // ],
), // ),
); // );
Get.bottomSheet( // Get.bottomSheet(
bottomSheet, // bottomSheet,
); // );
}) // })
.size(28.sp) // .size(28.sp)
.color(Colors.blue) // .color(Colors.blue)
.make(), // .make(),
Spacer(), // Spacer(),
], // ],
), // ),
16.hb, 16.hb,
Row( Row(
children: [ children: [
@ -321,6 +323,7 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
class AvatarsParticipate extends StatelessWidget { class AvatarsParticipate extends StatelessWidget {
final List<String?> avatars; final List<String?> avatars;
final List<Registration>? registrationList;
//参加人数 //参加人数
final int pNum; final int pNum;
@ -335,13 +338,15 @@ class AvatarsParticipate extends StatelessWidget {
required this.avatars, required this.avatars,
required this.pNum, required this.pNum,
this.tNum, this.tNum,
this.hasIcon = true, this.hasIcon = true, this.registrationList,
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return InkWell( return InkWell(
onTap: () {}, onTap: () {
Get.to(() => ActivityPeopleListPage( registrationList: registrationList,));
},
child: Container( child: Container(
child: Row( child: Row(
children: [ children: [

7
lib/ui/community/activity/activity_detail_page_old.dart
Unescape View File

@ -173,8 +173,11 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
), ),
MaterialButton( MaterialButton(
height: 92.w, height: 92.w,
onPressed: () => onPressed: () {
Get.to(() => ActivityPeopleListPage(id: widget.id)),
}
,
child: Row( child: Row(
children: [ children: [
StackAvatar( StackAvatar(

2
lib/ui/community/activity/activity_list_page.dart
Unescape View File

@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';
class ActivityListPage extends StatefulWidget { class ActivityListPage extends StatefulWidget {
ActivityListPage({Key? key}) : super(key: key); ActivityListPage({Key? key}) : super(key: key);
@override @override
_ActivityListPageState createState() => _ActivityListPageState(); _ActivityListPageState createState() => _ActivityListPageState();

100
lib/ui/community/activity/activity_people_list_page.dart
Unescape View File

@ -1,69 +1,83 @@
import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/model/community/activity_people_model.dart';
import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/models/home/activity_detail_model.dart';
import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
class ActivityPeopleListPage extends StatefulWidget { class ActivityPeopleListPage extends StatefulWidget {
final int? id; final List<Registration>? registrationList;
ActivityPeopleListPage({Key? key, required this.id}) : super(key: key); ActivityPeopleListPage({Key? key, required this.registrationList}) : super(key: key);
@override @override
_ActivityPeopleListPageState createState() => _ActivityPeopleListPageState(); _ActivityPeopleListPageState createState() => _ActivityPeopleListPageState();
} }
class _ActivityPeopleListPageState extends State<ActivityPeopleListPage> { class _ActivityPeopleListPageState extends State<ActivityPeopleListPage> {
EasyRefreshController _refreshController = EasyRefreshController();
@override @override
void dispose() { void dispose() {
_refreshController.dispose();
super.dispose(); super.dispose();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BeeScaffold( return BeeScaffold(
title: '参与人员', title: '报名人员列表',
body: BeeListView<ActivityPeopleModel>( body:
controller: _refreshController, Column(
path: API.community.activityPeopleList,
extraParams: {'activityId': widget.id}, children: [
convert: (model) => Container(
model.rows.map((e) => ActivityPeopleModel.fromJson(e)).toList(), color: Colors.black.withOpacity(0.06),
builder: (items) { height: 75.w,
return ListView.separated( width: double.infinity,
padding: EdgeInsets.all(32.w), child: '已有'.richText.color(Colors.black.withOpacity(0.65)).size(28.sp).withTextSpanChildren([
itemBuilder: (context, index) { widget.registrationList==null?''.textSpan
final ActivityPeopleModel model = items[index]; .size(28.sp)
return Row( .color(Color(0xFFFA5858))
children: [ .make(): '${widget.registrationList!.length}'
96.hb, .textSpan
20.wb, .size(28.sp)
FadeInImage.assetNetwork( .color(Color(0xFFFA5858))
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, .make(),
image: SAASAPI.image(ImgModel.first(model.imgUrl)), '人报名参加本次活动'.textSpan.size(28.sp).color(Colors.black.withOpacity(0.65)).make(),
height: 60.w, ]).make(),
width: 60.w, ),
),
18.wb,
model.name!.text.size(28.sp).make(), widget.registrationList!=null?
Spacer(), ListView.separated(
model.tel!.text.size(28.sp).make(), padding: EdgeInsets.all(32.w),
], shrinkWrap: true,
); itemBuilder: (context, index) {
}, return Row(
separatorBuilder: (_, __) => Divider(height: 1.w), children: [
itemCount: items.length, 96.hb,
); 20.wb,
}, FadeInImage.assetNetwork(
).material(color: Colors.white), placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
image: SAASAPI.image(ImgModel.first(widget.registrationList![index].avatarImgList)),
height: 60.w,
width: 60.w,
),
18.wb,
widget.registrationList![index].name.text.size(28.sp).make(),
],
);
},
separatorBuilder: (_, __) => Divider(height: 1.w),
itemCount: widget.registrationList!.length,
):SizedBox(),
],
)
); );
} }
} }

48
lib/ui/market/search/good_detail_page.dart
Unescape View File

@ -611,29 +611,29 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
40.wb, 40.wb,
GestureDetector( // GestureDetector(
onTap: () async { // onTap: () async {
await CollectionFunc.collection(_goodDetail!.id); // await CollectionFunc.collection(_goodDetail!.id);
_refreshController.callRefresh(); // _refreshController.callRefresh();
}, // },
child: Column( // child: Column(
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: [ // children: [
Image.asset( // Image.asset(
_goodDetail!.isCollection == 0 // _goodDetail!.isCollection == 0
? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG // ? R.ASSETS_ICONS_ICON_GOOD_FAVOR_PNG
: R.ASSETS_ICONS_SHOP_FAVORFILL_PNG, // : R.ASSETS_ICONS_SHOP_FAVORFILL_PNG,
width: 48.w, // width: 48.w,
height: 48.w, // height: 48.w,
), // ),
Text( // Text(
'加入收藏', // '加入收藏',
style: TextStyle(fontSize: 20.sp, color: ktextPrimary), // style: TextStyle(fontSize: 20.sp, color: ktextPrimary),
), // ),
], // ],
), // ),
), // ),
40.wb, 40.wb,
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
@ -656,7 +656,7 @@ class _GoodDetailPageState extends State<GoodDetailPage> {
], ],
), ),
), ),
40.wb, 80.wb,
Row( Row(
children: [ children: [
GestureDetector( GestureDetector(

Write Preview
Loading…
Cancel
Save