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

Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app 

 Conflicts:
	lib/community/community_view/community_dynamic.dart
	lib/settlement/settlement.dart
	lib/settlement/settlement_view/activity_coupon_remarks.dart
master
fmk 3 years ago
parent
7df73a5efe f79317065b
commit
ddb753f144
6 changed files with 63 additions and 25 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. 2
      lib/community/community_view/community_dynamic.dart
  2. 3
      lib/mine/mine_view/mine_item.dart
  3. 4
      lib/mine/release_page.dart
  4. 55
      lib/order/edit_remarks_page.dart
  5. 12
      lib/settlement/settlement.dart
  6. 12
      lib/settlement/settlement_view/activity_coupon_remarks.dart

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

@ -205,7 +205,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
], ],
), ),
), ),
if(widget.comment.memberInfo == null || widget.comment.memberInfo.mid != widget.userId??"") if(widget?.comment?.memberInfo?.mid != widget.userId??"")
GestureDetector( GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {

3
lib/mine/mine_view/mine_item.dart
Unescape View File

@ -69,7 +69,8 @@ class _MineItem extends State<MineItem> {
return; return;
} }
Navigator.of(context) Navigator.of(context)
.pushNamed('/router/releasePage'); .pushNamed('/router/releasePage',
arguments: {});
}); });
}, },
child: mineItem( child: mineItem(

4
lib/mine/release_page.dart
Unescape View File

@ -24,6 +24,7 @@ class _ReleasePage extends State<ReleasePage> {
RefreshController refreshController = RefreshController(); RefreshController refreshController = RefreshController();
ApiService apiService; ApiService apiService;
int pageNum = 0; int pageNum = 0;
String userId;
List<ComunityComment> comments = []; List<ComunityComment> comments = [];
@ -42,6 +43,7 @@ class _ReleasePage extends State<ReleasePage> {
queryCommunity() async { queryCommunity() async {
if (apiService == null) { if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance(); SharedPreferences value = await SharedPreferences.getInstance();
userId = value.getString('userId');
apiService = ApiService( apiService = ApiService(
Dio(), Dio(),
context: context, context: context,
@ -119,7 +121,7 @@ class _ReleasePage extends State<ReleasePage> {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
'/router/community_details', '/router/community_details',
arguments: { arguments: {
"comment": comments[position], "comment": comments[position],"userId":userId,
}, },
); );
}, },

55
lib/order/edit_remarks_page.dart
Unescape View File

@ -12,6 +12,8 @@ class EditRemarksPage extends StatefulWidget {
} }
class _EditRemarksPage extends State<EditRemarksPage> { class _EditRemarksPage extends State<EditRemarksPage> {
TextEditingController commentTextController = TextEditingController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -65,6 +67,9 @@ class _EditRemarksPage extends State<EditRemarksPage> {
], ],
), ),
child: TextField( child: TextField(
controller: commentTextController,
keyboardType: TextInputType.multiline,
maxLines: 10,
decoration: InputDecoration( decoration: InputDecoration(
isDense: true, isDense: true,
hintText: '请填写备注信息，例如:面包切一刀', hintText: '请填写备注信息，例如:面包切一刀',
@ -85,17 +90,22 @@ class _EditRemarksPage extends State<EditRemarksPage> {
), ),
flex: 1, flex: 1,
), ),
Container( GestureDetector(
padding: EdgeInsets.all(16.h), onTap: (){
width: MediaQuery.of(context).size.width, Navigator.pop(context,commentTextController.text);
alignment: Alignment.center, },
color: Color(0xFF32A060), child: Container(
child: Text( padding: EdgeInsets.all(16.h),
S.of(context).tijiao, width: MediaQuery.of(context).size.width,
style: TextStyle( alignment: Alignment.center,
color: Colors.white, color: Color(0xFF32A060),
fontWeight: FontWeight.bold, child: Text(
fontSize: 16.sp, S.of(context).tijiao,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 16.sp,
),
), ),
), ),
), ),
@ -104,8 +114,15 @@ class _EditRemarksPage extends State<EditRemarksPage> {
); );
} }
addRemarksCnt(cnt){
setState(() {
commentTextController.text = commentTextController.text + cnt;
});
}
List<Widget> remarks() { List<Widget> remarks() {
return [ return [
GestureDetector(child:
Container( Container(
padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w), padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -119,8 +136,9 @@ class _EditRemarksPage extends State<EditRemarksPage> {
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
), ),onTap: (){addRemarksCnt("面包");},),
Container( GestureDetector(child:
Container(
padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w), padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF32A060), color: Color(0xFF32A060),
@ -133,7 +151,8 @@ class _EditRemarksPage extends State<EditRemarksPage> {
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
), ),onTap: (){addRemarksCnt("面包要切好");},),
GestureDetector(child:
Container( Container(
padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w), padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -147,7 +166,8 @@ class _EditRemarksPage extends State<EditRemarksPage> {
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
), ),onTap: (){addRemarksCnt("一点");},),
GestureDetector(child:
Container( Container(
padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w), padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -161,7 +181,8 @@ class _EditRemarksPage extends State<EditRemarksPage> {
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
), ),onTap: (){addRemarksCnt("点");},),
GestureDetector(child:
Container( Container(
padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w), padding: EdgeInsets.symmetric(vertical: 6.h, horizontal: 22.w),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -175,7 +196,7 @@ class _EditRemarksPage extends State<EditRemarksPage> {
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),
), ),onTap: (){addRemarksCnt("点");},),
]; ];
} }
} }

12
lib/settlement/settlement.dart
Unescape View File

@ -51,7 +51,7 @@ class _Settlement extends State<Settlement> {
SettleOrderInfo settleOrderInfo; SettleOrderInfo settleOrderInfo;
MinOrderInfo minOrderInfo; MinOrderInfo minOrderInfo;
int selectedBtn = 0; int selectedBtn = 0;
String remakers = ""; String remakers = "口味、面包硬度等";
String parentCode = ""; String parentCode = "";
String parentId = ""; String parentId = "";
int payChannel = 4; int payChannel = 4;
@ -393,6 +393,16 @@ class _Settlement extends State<Settlement> {
promotions, promotions,
couponCount(), couponCount(),
placeOrder, placeOrder,
remakers,
(){
Navigator.of(context).pushNamed(
'/router/edit_remarks_page',
arguments: {},
).then((value) => {setState(() {
if(value != null)
remakers = value;
})});
}
), ),
if (placeOrder) ///支付方式 if (placeOrder) ///支付方式

12
lib/settlement/settlement_view/activity_coupon_remarks.dart
Unescape View File

@ -7,12 +7,14 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
class ActivityCouponRemarks extends StatefulWidget { class ActivityCouponRemarks extends StatefulWidget {
final Function() couponCart; final Function() couponCart;
final Function() activityCart; final Function() activityCart;
final Function() editRemark;
final String coupons; final String coupons;
final String promotions; final String promotions;
final SettleOrderInfo settleOrderInfo; final SettleOrderInfo settleOrderInfo;
final int couponCount; final int couponCount;
final bool placeOrder; final bool placeOrder;
final String remark;
ActivityCouponRemarks( ActivityCouponRemarks(
this.couponCart, this.couponCart,
@ -22,6 +24,8 @@ class ActivityCouponRemarks extends StatefulWidget {
this.promotions, this.promotions,
this.couponCount, this.couponCount,
this.placeOrder, this.placeOrder,
this.remark,
this.editRemark,
); );
@override @override
@ -145,7 +149,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
), ),
InkWell( InkWell(
onTap: () { onTap: () {
widget.editRemark();
}, },
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -162,15 +166,15 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
), ),
), ),
), ),
Text( Expanded(child:Text(
"口味、面包硬度等", widget.remark,
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),),
Icon( Icon(
Icons.keyboard_arrow_right, Icons.keyboard_arrow_right,
size: 16, size: 16,

Write Preview
Loading…
Cancel
Save