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/mine/mine_page.dart
master
fmk 3 years ago
parent
2ebf20808f 602aa6a773
commit
a67be5fbec
14 changed files with 151 additions and 1268 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/home/founder_story_page.dart
  2. 4
      lib/home/main_home_page.dart
  3. 37
      lib/integral/integral_detailed_page.dart
  4. 29
      lib/integral/integral_page.dart
  5. 5
      lib/login/login_page.dart
  6. 8
      lib/mine/edit_name.dart
  7. 40
      lib/mine/manage_address_page.dart
  8. 3
      lib/mine/mine_page.dart
  9. 19
      lib/order/order_detail_page.dart
  10. 46
      lib/retrofit/retrofit_api.dart
  11. 1141
      lib/retrofit/retrofit_api.g.dart
  12. 2
      lib/union/union_page.dart
  13. 77
      lib/view_widget/coupon_widget.dart
  14. 6
      pubspec.lock

2
lib/home/founder_story_page.dart
Unescape View File

@ -73,7 +73,7 @@ class _FounderStoryPage extends State<FounderStoryPage> {
"他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。", "他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。",
style: TextStyle( style: TextStyle(
color: Color(0xFF1A1A1A), color: Color(0xFF1A1A1A),
fontSize: 12, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
height: 1.5), height: 1.5),
)), )),

4
lib/home/main_home_page.dart
Unescape View File

@ -66,8 +66,8 @@ class _MainHomePage extends State<MainHomePage>
}, },
child: Image.asset( child: Image.asset(
"assets/image/icon_notices.png", "assets/image/icon_notices.png",
width: 24.w, width: 24,
height: 24.h, height: 24,
), ),
), ),
), ),

37
lib/integral/integral_detailed_page.dart
Unescape View File

@ -130,7 +130,8 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
elevation: 0, elevation: 0,
title: Text( title: Text(
S.of(context).mingxi, S.of(context).mingxi,
style: TextStyle(color: Colors.white), style:
TextStyle(fontWeight: FontWeight.w500, color: Colors.white),
), ),
centerTitle: false, centerTitle: false,
leading: GestureDetector( leading: GestureDetector(
@ -153,7 +154,7 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
flexibleSpace: FlexibleSpaceBar( flexibleSpace: FlexibleSpaceBar(
background: Container( background: Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(top: 56), margin: EdgeInsets.only(top: 56.h),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -162,13 +163,15 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
userInfo != null ? userInfo.points : "0", userInfo != null ? userInfo.points : "0",
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 48), fontSize: 48.sp),
), ),
Text( Text(
S.of(context).wodejifenzhi, S.of(context).wodejifenzhi,
style: style: TextStyle(
TextStyle(color: Color(0xFFF2F2F2), fontSize: 12), color: Color(0xFFF2F2F2),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
], ],
), ),
@ -184,9 +187,9 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
labelColor: Colors.white, labelColor: Colors.white,
labelStyle: labelStyle:
TextStyle(fontSize: 16, fontWeight: FontWeight.bold), TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w500),
unselectedLabelStyle: unselectedLabelStyle:
TextStyle(fontSize: 16, fontWeight: FontWeight.bold), TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w500),
indicatorColor: Colors.white, indicatorColor: Colors.white,
unselectedLabelColor: Color(0xFFE6E6E6), unselectedLabelColor: Color(0xFFE6E6E6),
), ),
@ -233,14 +236,14 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
Image.asset( Image.asset(
"assets/image/icon_intergral_sign.png", "assets/image/icon_intergral_sign.png",
width: 36.w, width: 36.w,
height: 34, height: 34.h,
), ),
SizedBox( SizedBox(
width: 15, width: 15,
), ),
Expanded( Expanded(
child: Container( child: Container(
height: 34, height: 34.h,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -250,22 +253,28 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
userBill[position].name ?? "", userBill[position].name ?? "",
// S.of(context).qiandao, // S.of(context).qiandao,
style: TextStyle( style: TextStyle(
color: Colors.black, fontSize: 12), color: Colors.black,
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
Text( Text(
userBill[position].createTime ?? "", userBill[position].createTime ?? "",
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), fontSize: 10), color: Color(0xFF727272),
fontSize: 10.sp,
fontWeight: FontWeight.w400),
) )
], ],
), ),
)), )),
Container( Container(
margin: EdgeInsets.only(top: 2), margin: EdgeInsets.only(top: 2.h),
child: Text( child: Text(
"${tabController.index == 0 ? "+" : "-"}${double.tryParse(userBill[position].number ?? "0").toInt().toString()}", "${tabController.index == 0 ? "+" : "-"}${double.tryParse(userBill[position].number ?? "0").toInt().toString()}",
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), fontSize: 12), color: Color(0xFF727272),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
) )
], ],

29
lib/integral/integral_page.dart
Unescape View File

@ -156,7 +156,7 @@ class _IntegralPage extends State<IntegralPage> {
S.of(context).zuorenwudejifen, S.of(context).zuorenwudejifen,
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF353535),
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 16.sp, fontSize: 16.sp,
), ),
), ),
@ -263,6 +263,7 @@ class _IntegralPage extends State<IntegralPage> {
"+${double.tryParse(task.rewardValue).toInt()}", "+${double.tryParse(task.rewardValue).toInt()}",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400,
color: Color(0xFF727272), color: Color(0xFF727272),
), ),
), ),
@ -348,8 +349,8 @@ class _IntegralPage extends State<IntegralPage> {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
"assets/image/icon_gold_blessing.png", "assets/image/icon_gold_blessing.png",
width: 59.w, width: 59,
height: 59.h, height: 59,
), ),
), ),
], ],
@ -386,8 +387,8 @@ class _IntegralPage extends State<IntegralPage> {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
"assets/image/icon_gold_coin.png", "assets/image/icon_gold_coin.png",
width: 30.w, width: 30,
height: 30.h, height: 30,
), ),
), ),
Container( Container(
@ -402,13 +403,13 @@ class _IntegralPage extends State<IntegralPage> {
? "+${signInfo.rewardList[position]}" ? "+${signInfo.rewardList[position]}"
: "+10", : "+10",
style: TextStyle( style: TextStyle(
color: (signInfo != null && color: (signInfo != null &&
signInfo.signInList != null && signInfo.signInList != null &&
signInfo.signInList.length > position) signInfo.signInList.length > position)
? Colors.white ? Colors.white
: Color(0xFF727272), : Color(0xFF727272),
fontSize: 12.sp, fontSize: 12.sp,
), fontWeight: FontWeight.w400),
), ),
), ),
], ],
@ -442,7 +443,7 @@ class _IntegralPage extends State<IntegralPage> {
Text( Text(
S.of(context).qiandaolingjifen, S.of(context).qiandaolingjifen,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -453,7 +454,7 @@ class _IntegralPage extends State<IntegralPage> {
Text( Text(
S.of(context).lianxuqiandaolingqushuangbeijifen, S.of(context).lianxuqiandaolingqushuangbeijifen,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 11.sp, fontSize: 11.sp,
color: Color(0xFF727272), color: Color(0xFF727272),
), ),

5
lib/login/login_page.dart
Unescape View File

@ -398,7 +398,8 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
secondChild: uiPage(), secondChild: uiPage(),
firstCurve: Curves.easeInQuart, firstCurve: Curves.easeInQuart,
secondCurve: Curves.easeInQuart, secondCurve: Curves.easeInQuart,
crossFadeState: isShowLogin ? CrossFadeState.showSecond : CrossFadeState.showFirst, crossFadeState:
isShowLogin ? CrossFadeState.showSecond : CrossFadeState.showFirst,
duration: Duration(milliseconds: Platform.isIOS ? 1000 : 1000), duration: Duration(milliseconds: Platform.isIOS ? 1000 : 1000),
); );
} }
@ -518,7 +519,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
), ),
SizedBox( SizedBox(
height: 8, height: 8.h,
), ),
Opacity( Opacity(
opacity: (255 - changeAlpha) / 255, opacity: (255 - changeAlpha) / 255,

8
lib/mine/edit_name.dart
Unescape View File

@ -28,11 +28,11 @@ class _EditName extends State<EditName> {
background: Colors.white, background: Colors.white,
action: Container( action: Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(right: 16), margin: EdgeInsets.only(right: 16.w),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
String name = _controller.text; String name = _controller.text;
if(name != null && name != "") { if (name != null && name != "") {
Navigator.of(context).pop(name); Navigator.of(context).pop(name);
} else { } else {
SmartDialog.showToast("请输入用户名", alignment: Alignment.center); SmartDialog.showToast("请输入用户名", alignment: Alignment.center);
@ -42,7 +42,7 @@ class _EditName extends State<EditName> {
"保存", "保存",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 18, fontSize: 18.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
@ -76,7 +76,7 @@ class _EditName extends State<EditName> {
maxLines: 1, maxLines: 1,
), ),
Container( Container(
height: 1, height: 1.h,
color: Color(0xFF32A060), color: Color(0xFF32A060),
), ),
], ],

40
lib/mine/manage_address_page.dart
Unescape View File

@ -66,8 +66,8 @@ class _ManageAddressPage extends State<ManageAddressPage> {
? NoDataView( ? NoDataView(
isShowBtn: false, isShowBtn: false,
text: "目前暂无送货地址，请添加", text: "目前暂无送货地址，请添加",
fontSize: 16, fontSize: 16.sp,
margin: EdgeInsets.only(top: 120), margin: EdgeInsets.only(top: 120.h),
) )
: ListView.builder( : ListView.builder(
itemCount: addressList == null ? 0 : addressList.length, itemCount: addressList == null ? 0 : addressList.length,
@ -102,7 +102,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
"新增地址", "新增地址",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16, fontSize: 16.sp,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -143,7 +143,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 10), margin: EdgeInsets.only(left: 10.w),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -151,13 +151,13 @@ class _ManageAddressPage extends State<ManageAddressPage> {
Text( Text(
address.username, address.username,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.black, color: Colors.black,
), ),
), ),
SizedBox( SizedBox(
height: 16, height: 16.h,
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -167,7 +167,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
child: IconText( child: IconText(
address.phone, address.phone,
leftImage: "assets/image/icon_address_call.png", leftImage: "assets/image/icon_address_call.png",
iconSize: 16, iconSize: 16.sp,
), ),
), ),
InkWell( InkWell(
@ -183,14 +183,14 @@ class _ManageAddressPage extends State<ManageAddressPage> {
], ],
), ),
SizedBox( SizedBox(
height: 4, height: 4.h,
), ),
IconText( IconText(
"${address.address}", "${address.address}",
isMax: true, isMax: true,
textAxisAlignment: CrossAxisAlignment.start, textAxisAlignment: CrossAxisAlignment.start,
textStyle: TextStyle( textStyle: TextStyle(
fontSize: 14, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -199,10 +199,10 @@ class _ManageAddressPage extends State<ManageAddressPage> {
iconSize: 16, iconSize: 16,
), ),
SizedBox( SizedBox(
height: 10, height: 10.h,
), ),
Container( Container(
height: 1, height: 1.h,
color: Color(0xFFF2F2F2), color: Color(0xFFF2F2F2),
) )
], ],
@ -227,7 +227,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
child: Text( child: Text(
"", "",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: address.isDefault color: address.isDefault
? Color(0xFF39B54A) ? Color(0xFF39B54A)
@ -238,12 +238,12 @@ class _ManageAddressPage extends State<ManageAddressPage> {
InkWell( InkWell(
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 5, top: 5.h,
), ),
child: Text( child: Text(
"删除", "删除",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black, color: Colors.black,
), ),
@ -267,7 +267,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
return AlertDialog( return AlertDialog(
content: Container( content: Container(
width: MediaQuery.of(context).size.width - 84, width: MediaQuery.of(context).size.width - 84,
height: 110, height: 110.h,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -275,13 +275,13 @@ class _ManageAddressPage extends State<ManageAddressPage> {
Text( Text(
"您确定要删除收货地址吗？", "您确定要删除收货地址吗？",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.black, color: Colors.black,
), ),
), ),
SizedBox( SizedBox(
height: 30, height: 30.h,
), ),
Row( Row(
children: [ children: [
@ -290,7 +290,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
child: BorderText( child: BorderText(
text: "取消", text: "取消",
textColor: Color(0xFF32A060), textColor: Color(0xFF32A060),
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
borderColor: Color(0xFF32A060), borderColor: Color(0xFF32A060),
radius: 4, radius: 4,
@ -304,7 +304,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
flex: 1, flex: 1,
), ),
SizedBox( SizedBox(
width: 16, width: 16.w,
), ),
Expanded( Expanded(
child: InkWell( child: InkWell(
@ -314,7 +314,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
radius: 4, radius: 4,
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
backgroup: Color(0xFF32A060), backgroup: Color(0xFF32A060),
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
onTap: () { onTap: () {

3
lib/mine/mine_page.dart
Unescape View File

@ -11,6 +11,7 @@ import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/event_type.dart'; import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/login_tips.dart'; import 'package:huixiang/view_widget/login_tips.dart';
@ -431,7 +432,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
child: Text( child: Text(
text, text,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),

19
lib/order/order_detail_page.dart
Unescape View File

@ -9,10 +9,7 @@ import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/view_widget/border_text.dart'; import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/login_tips.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/pay_input_view.dart';
import 'package:huixiang/view_widget/request_permission.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
import 'package:huixiang/view_widget/separator.dart'; import 'package:huixiang/view_widget/separator.dart';
import 'package:huixiang/view_widget/text_image_dialog.dart'; import 'package:huixiang/view_widget/text_image_dialog.dart';
@ -92,6 +89,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
bottom: PreferredSize( bottom: PreferredSize(
preferredSize: Size(double.infinity, orderStatus >= 4 ? 118.h : 118), preferredSize: Size(double.infinity, orderStatus >= 4 ? 118.h : 118),
child: Container( child: Container(
color: Color(0xFF3A405A),
height: orderStatus >= 4 ? 118.h : 118.h, height: orderStatus >= 4 ? 118.h : 118.h,
padding: EdgeInsets.fromLTRB(16.w, 0, 16.w, 10.h), padding: EdgeInsets.fromLTRB(16.w, 0, 16.w, 10.h),
child: Column( child: Column(
@ -783,10 +781,10 @@ class _OrderDetailPage extends State<OrderDetailPage> {
if (payStatus == 0) { if (payStatus == 0) {
carryOnPay(); carryOnPay();
} else { } else {
String storeId = (orderInfo != null && String storeId =
orderInfo.storeVO != null) (orderInfo != null && orderInfo.storeVO != null)
? (orderInfo.storeVO.id ?? "") ? (orderInfo.storeVO.id ?? "")
: ""; : "";
aginOrder(storeId); aginOrder(storeId);
} }
}, },
@ -833,8 +831,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
} }
aginOrder(storeId) { aginOrder(storeId) {
Navigator.of(context).pushNamed('/router/union_detail_page', Navigator.of(context)
arguments: {"id": storeId}); .pushNamed('/router/union_detail_page', arguments: {"id": storeId});
} }
Widget buildCommodity() { Widget buildCommodity() {
@ -883,7 +881,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
if (orderInfo == null) return []; if (orderInfo == null) return [];
List<Widget> widgets = []; List<Widget> widgets = [];
if (orderInfo.productList != null) { if (orderInfo.productList != null) {
widgets.addAll(orderInfo.productList.map((e) => commodityItem(e)).toList()); widgets
.addAll(orderInfo.productList.map((e) => commodityItem(e)).toList());
} }
widgets.add(SizedBox(height: 20.h)); widgets.add(SizedBox(height: 20.h));

46
lib/retrofit/retrofit_api.dart
Unescape View File

@ -19,7 +19,6 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'data/address.dart'; import 'data/address.dart';
import 'data/banner.dart'; import 'data/banner.dart';
import 'data/brand.dart';
import 'data/brand_data.dart'; import 'data/brand_data.dart';
import 'data/exchange_order.dart'; import 'data/exchange_order.dart';
import 'data/goods.dart'; import 'data/goods.dart';
@ -31,10 +30,8 @@ import 'data/page.dart';
import 'data/rank.dart'; import 'data/rank.dart';
import 'data/sign_info.dart'; import 'data/sign_info.dart';
import 'data/store.dart'; import 'data/store.dart';
import 'data/store_info.dart';
import 'data/upload_result.dart'; import 'data/upload_result.dart';
import 'data/user_bill.dart'; import 'data/user_bill.dart';
import 'data/user_entity.dart';
import 'data/user_info.dart'; import 'data/user_info.dart';
import 'data/vip_card.dart'; import 'data/vip_card.dart';
import 'data/wx_pay.dart'; import 'data/wx_pay.dart';
@ -45,8 +42,6 @@ const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
/// 本地
@RestApi(baseUrl: baseUrl) @RestApi(baseUrl: baseUrl)
abstract class ApiService { abstract class ApiService {
factory ApiService(Dio dio, factory ApiService(Dio dio,
@ -179,11 +174,13 @@ abstract class ApiService {
///积分商城商品列表 ///积分商城商品列表
@POST("/creditGoods/list") @POST("/creditGoods/list")
Future<BaseData<PageInfo<Goods>>> creditGoods(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Goods>>> creditGoods(
@Body() Map<String, dynamic> param);
///积分商城商品分類列表 ///积分商城商品分類列表
@POST("/creditGoodsCategory/page") @POST("/creditGoodsCategory/page")
Future<BaseData<PageInfo<GoodsCategory>>> goodsCategory(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<GoodsCategory>>> goodsCategory(
@Body() Map<String, dynamic> param);
///积分商城商品详情 ///积分商城商品详情
@GET("/creditGoods/{id}") @GET("/creditGoods/{id}")
@ -215,7 +212,8 @@ abstract class ApiService {
///兑换订单列表 ///兑换订单列表
@POST("/creditOrder/list") @POST("/creditOrder/list")
Future<BaseData<PageInfo<ExchangeOrder>>> creditOrderList(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<ExchangeOrder>>> creditOrderList(
@Body() Map<String, dynamic> param);
///创建积分订单 ///创建积分订单
@POST("/creditOrder/create") @POST("/creditOrder/create")
@ -243,11 +241,13 @@ abstract class ApiService {
///查询领券列表 ///查询领券列表
@POST("/coupon/centreList") @POST("/coupon/centreList")
Future<BaseData<PageInfo<Coupon>>> queryCoupon(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Coupon>>> queryCoupon(
@Body() Map<String, dynamic> param);
///查询卡包列表 ///查询卡包列表
@POST("/coupon/packageList") @POST("/coupon/packageList")
Future<BaseData<PageInfo<Coupon>>> queryCard(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Coupon>>> queryCard(
@Body() Map<String, dynamic> param);
///门店地址列表 ///门店地址列表
@POST("/store/list") @POST("/store/list")
@ -255,7 +255,8 @@ abstract class ApiService {
///分页查看资讯列表 ///分页查看资讯列表
@POST("/information/list") @POST("/information/list")
Future<BaseData<PageInfo<Activity>>> informationList(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Activity>>> informationList(
@Body() Map<String, dynamic> param);
///查看资讯详情 ///查看资讯详情
@GET("/information/{id}") @GET("/information/{id}")
@ -279,11 +280,13 @@ abstract class ApiService {
///分页查看资讯列表 ///分页查看资讯列表
@POST("/information/list") @POST("/information/list")
Future<BaseData<PageInfo<Article>>> queryArticle(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Article>>> queryArticle(
@Body() Map<String, dynamic> param);
///banner查询 ///banner查询
@POST("/banner/page") @POST("/banner/page")
Future<BaseData<PageInfo<BannerData>>> queryBanner(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<BannerData>>> queryBanner(
@Body() Map<String, dynamic> param);
///品牌信息 ///品牌信息
@GET("/home/brand") @GET("/home/brand")
@ -295,7 +298,8 @@ abstract class ApiService {
/// ///
@POST("/member/listBill") @POST("/member/listBill")
Future<BaseData<PageInfo<UserBill>>> queryBillInfo(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<UserBill>>> queryBillInfo(
@Body() Map<String, dynamic> param);
///会员等级列表 ///会员等级列表
@GET("/member/rankList") @GET("/member/rankList")
@ -303,7 +307,8 @@ abstract class ApiService {
///订单列表 ///订单列表
@POST("/order/list") @POST("/order/list")
Future<BaseData<PageInfo<OrderInfo>>> orderList(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<OrderInfo>>> orderList(
@Body() Map<String, dynamic> param);
///订单详情 ///订单详情
@GET("/order/orderDetail?id={id}") @GET("/order/orderDetail?id={id}")
@ -327,7 +332,8 @@ abstract class ApiService {
///分页查询App消息列表 ///分页查询App消息列表
@POST("/app-msg/list") @POST("/app-msg/list")
Future<BaseData<PageInfo<Message>>> msgList(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<Message>>> msgList(
@Body() Map<String, dynamic> param);
///App消息详情 ///App消息详情
@GET("/app-msg/{id}") @GET("/app-msg/{id}")
@ -343,7 +349,8 @@ abstract class ApiService {
///查询评论列表 ///查询评论列表
@POST("/memberComment/list") @POST("/memberComment/list")
Future<BaseData<PageInfo<MemberCommentList>>> memberCommentList(@Body() Map<String, dynamic> param); Future<BaseData<PageInfo<MemberCommentList>>> memberCommentList(
@Body() Map<String, dynamic> param);
///评论点赞 ///评论点赞
@GET("/memberComment/likes/{id}") @GET("/memberComment/likes/{id}")
@ -355,6 +362,7 @@ abstract class ApiService {
///查询物流轨迹 ///查询物流轨迹
@GET("/order/getShippingTrace/{shipperCode}/{logisticCode}") @GET("/order/getShippingTrace/{shipperCode}/{logisticCode}")
Future<BaseData<Logistics>> shippingTrace(@Path("shipperCode") String shipperCode, @Path("logisticCode") String logisticCode); Future<BaseData<Logistics>> shippingTrace(
@Path("shipperCode") String shipperCode,
@Path("logisticCode") String logisticCode);
} }

1141
lib/retrofit/retrofit_api.g.dart
View File

File diff suppressed because it is too large Load Diff

2
lib/union/union_page.dart
Unescape View File

@ -572,7 +572,7 @@ class _UnionPage extends State<UnionPage>
100.0), 100.0),
style: TextStyle( style: TextStyle(
color: Color(0xFF4C4C4C), color: Color(0xFF4C4C4C),
fontSize: 12, fontSize: 12.sp,
), ),
), ),
visible: store.distance != null, visible: store.distance != null,

77
lib/view_widget/coupon_widget.dart
Unescape View File

@ -6,6 +6,7 @@ import 'package:huixiang/retrofit/data/coupon.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
import 'package:huixiang/view_widget/separator.dart'; import 'package:huixiang/view_widget/separator.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class CouponWidget extends StatelessWidget { class CouponWidget extends StatelessWidget {
final GestureTapCallback callback; final GestureTapCallback callback;
@ -43,14 +44,14 @@ class CouponWidget extends StatelessWidget {
), ),
if (coupon.status == 3) if (coupon.status == 3)
Positioned( Positioned(
top: 10, top: 10.h,
right: 0, right: 0,
child: Transform.rotate( child: Transform.rotate(
angle: pi / 5.0, angle: pi / 5.0,
child: Text( child: Text(
S.of(context).yishijiao, //已失效 S.of(context).yishijiao, //已失效
style: TextStyle( style: TextStyle(
fontSize: 8, fontSize: 8.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -70,29 +71,29 @@ class CouponWidget extends StatelessWidget {
child: Row( child: Row(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 20), margin: EdgeInsets.only(left: 20),
child: MImage( child: MImage(
(coupon == null || (coupon == null ||
coupon.couponImg == null || coupon.couponImg == null ||
coupon.couponImg == "") coupon.couponImg == "")
? "" ? ""
: coupon.couponImg, : coupon.couponImg,
) )
// Image.network( // Image.network(
// width: 60, // width: 60,
// height: 60, // height: 60,
// fit: BoxFit.cover, // fit: BoxFit.cover,
// errorBuilder: (context, error, e) { // errorBuilder: (context, error, e) {
// return Image.asset( // return Image.asset(
// "assets/image/default_1.png"); // "assets/image/default_1.png");
// }, // },
// ), // ),
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: Container( child: Container(
height: 60, height: 60.h,
margin: EdgeInsets.only(left: 12), margin: EdgeInsets.only(left: 12),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
@ -109,7 +110,7 @@ class CouponWidget extends StatelessWidget {
coupon.couponName ?? "", coupon.couponName ?? "",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize: 14.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -118,12 +119,12 @@ class CouponWidget extends StatelessWidget {
? Row( ? Row(
children: [ children: [
RoundButton( RoundButton(
width: 42, width: 42.w,
height: 21, height: 21.h,
text: text:
S.of(context).lingqu, S.of(context).lingqu,
textColor: Colors.white, textColor: Colors.white,
fontSize: 12, fontSize: 12.sp,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 2, top: 2,
bottom: 2, bottom: 2,
@ -148,7 +149,7 @@ class CouponWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: Color( color: Color(
0xFF32A060), 0xFF32A060),
fontSize: 12, fontSize: 12.sp,
), ),
), ),
Icon( Icon(
@ -172,7 +173,7 @@ class CouponWidget extends StatelessWidget {
child: Text( child: Text(
coupon.couponDescription ?? "", coupon.couponDescription ?? "",
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10.sp,
color: Color(0xFF4C4C4C), color: Color(0xFF4C4C4C),
), ),
), ),
@ -201,13 +202,17 @@ class CouponWidget extends StatelessWidget {
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
coupon.status == 0 coupon.status == 0
? S.of(context).faxingshijian(coupon.publishStartTime) ? S
.of(context)
.faxingshijian(coupon.publishStartTime)
: coupon.status == 1 : coupon.status == 1
? S.of(context).lingqushijian(coupon.receiveTime) ? S
.of(context)
.lingqushijian(coupon.receiveTime)
: S.of(context).shiyongriqi, : S.of(context).shiyongriqi,
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), color: Color(0xFF727272),
fontSize: 10, fontSize: 10.sp,
), ),
), ),
), ),
@ -252,14 +257,14 @@ class CouponWidget extends StatelessWidget {
"领取成功", "领取成功",
style: TextStyle( style: TextStyle(
color: Color(0xff353535), color: Color(0xff353535),
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
Text( Text(
"您已成功领取优惠劵，请在", "您已成功领取优惠劵，请在",
style: style: TextStyle(
TextStyle(color: Color(0xff353535), fontSize: 14), color: Color(0xff353535), fontSize: 14.sp),
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -269,7 +274,7 @@ class CouponWidget extends StatelessWidget {
"卡包-可使用", "卡包-可使用",
style: TextStyle( style: TextStyle(
color: Color(0xffFF7A1A), color: Color(0xffFF7A1A),
fontSize: 14, fontSize: 14.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
onTap: callback, onTap: callback,
@ -277,18 +282,18 @@ class CouponWidget extends StatelessWidget {
Text( Text(
"中查看", "中查看",
style: TextStyle( style: TextStyle(
color: Color(0xff353535), fontSize: 14), color: Color(0xff353535), fontSize: 14.sp),
), ),
], ],
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 30), padding: EdgeInsets.only(top: 30.h),
child: RoundButton( child: RoundButton(
width: 130, width: 130.w,
height: 34, height: 34.h,
text: S.of(context).queren, text: S.of(context).queren,
textColor: Colors.white, textColor: Colors.white,
fontSize: 12, fontSize: 12.sp,
callback: () { callback: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },

6
pubspec.lock
Unescape View File

@ -552,7 +552,7 @@ packages:
name: like_button name: like_button
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.2" version: "2.0.3"
logger: logger:
dependency: "direct main" dependency: "direct main"
description: description:
@ -818,7 +818,7 @@ packages:
name: shared_preferences_web name: shared_preferences_web
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "2.0.2"
shared_preferences_windows: shared_preferences_windows:
dependency: transitive dependency: transitive
description: description:
@ -1000,7 +1000,7 @@ packages:
name: url_launcher_web name: url_launcher_web
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.2" version: "2.0.4"
url_launcher_windows: url_launcher_windows:
dependency: transitive dependency: transitive
description: description:

Write Preview
Loading…
Cancel
Save