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

Merge branch 'dev' into wr_2023_business

wr_2023_business
wurong 2 years ago
parent
c713f8f581 f0dbee5666
commit
56d0fc49f5
7 changed files with 173 additions and 102 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. 3
      lib/home/home_page.dart
  2. 1
      lib/mine/mine_page.dart
  3. 184
      lib/order/exchange_order_page.dart
  4. 2
      lib/setting/binding_phone_page.dart
  5. 76
      lib/union/union_list.dart
  6. 7
      pubspec.lock
  7. 2
      pubspec.yaml

3
lib/home/home_page.dart
Unescape View File

@ -537,9 +537,11 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
// }), // }),
///特惠专区 ///特惠专区
if(coupons != null && coupons.length != 0)
DiscountZone(coupons), DiscountZone(coupons),
///特惠专区-推荐商品展示 ///特惠专区-推荐商品展示
if(homeRank != null && homeRank.commodityZone.length != 0)
HomeRecommendGoods(homeRank), HomeRecommendGoods(homeRank),
///助农专区 ///助农专区
@ -550,6 +552,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
WelfareCore(), WelfareCore(),
///吃喝玩商品热销榜 ///吃喝玩商品热销榜
if(homeRank != null && homeRank.commodityList.length != 0)
TopSellingList(homeRank), TopSellingList(homeRank),
// ///店铺推荐 // ///店铺推荐

1
lib/mine/mine_page.dart
Unescape View File

@ -238,7 +238,6 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
Container( Container(
height: 306.h, height: 306.h,
decoration: BoxDecoration( decoration: BoxDecoration(
// color: Color(0xFF32A060)
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
image: AssetImage("assets/image/settlement_bg.webp"), image: AssetImage("assets/image/settlement_bg.webp"),

184
lib/order/exchange_order_page.dart
Unescape View File

@ -728,97 +728,97 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
], ],
), ),
), ),
Container( // Container(
margin: EdgeInsets.only(left: 16, right: 16, bottom: 8), // margin: EdgeInsets.only(left: 16, right: 16, bottom: 8),
padding: EdgeInsets.all(20), // padding: EdgeInsets.all(20),
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.white, // color: Colors.white,
boxShadow: [ // boxShadow: [
BoxShadow( // BoxShadow(
color: Colors.black.withAlpha(12), // color: Colors.black.withAlpha(12),
offset: Offset(0, 3), // offset: Offset(0, 3),
blurRadius: 14, // blurRadius: 14,
spreadRadius: 0, // spreadRadius: 0,
) // )
], // ],
borderRadius: BorderRadius.all(Radius.circular(8)), // borderRadius: BorderRadius.all(Radius.circular(8)),
), // ),
child: Column( // child: Column(
children: [ // children: [
Row( // Row(
children: [ // children: [
Expanded( // Expanded(
child: Text( // child: Text(
"兑换数量", // "兑换数量",
style: TextStyle( // style: TextStyle(
fontWeight: MyFontWeight.regular, // fontWeight: MyFontWeight.regular,
fontSize: 14.sp, // fontSize: 14.sp,
color: Color(0xFF353535)), // color: Color(0xFF353535)),
)), // )),
InkWell( // InkWell(
onTap: () { // onTap: () {
setState(() { // setState(() {
if (buyNum > 1) buyNum -= 1; // if (buyNum > 1) buyNum -= 1;
}); // });
}, // },
child: Image.asset( // child: Image.asset(
"assets/image/reduce.webp", // "assets/image/reduce.webp",
width: 22, // width: 22,
height: 22, // height: 22,
), // ),
), // ),
Container( // Container(
width: 30, // width: 30,
alignment: Alignment.center, // alignment: Alignment.center,
child: Text( // child: Text(
buyNum.toString(), // buyNum.toString(),
style: TextStyle( // style: TextStyle(
color: Colors.black, // color: Colors.black,
fontSize: 14.sp, // fontSize: 14.sp,
fontWeight: MyFontWeight.medium, // fontWeight: MyFontWeight.medium,
), // ),
), // ),
), // ),
InkWell( // InkWell(
onTap: () { // onTap: () {
setState(() { // setState(() {
if (widget.arguments["payType"] == 1 // if (widget.arguments["payType"] == 1
? (double.parse(widget // ? (double.parse(widget
.arguments["oneBean"]) * // .arguments["oneBean"]) *
(buyNum + 1)) > // (buyNum + 1)) >
double.parse(happyBean) // double.parse(happyBean)
: (widget.arguments["payType"] == 2 // : (widget.arguments["payType"] == 2
? (double.parse(widget.arguments[ // ? (double.parse(widget.arguments[
"onePrice"]) * // "onePrice"]) *
(buyNum + 1)) > // (buyNum + 1)) >
double.parse(points) // double.parse(points)
: (widget.arguments["price"] == // : (widget.arguments["price"] ==
null || // null ||
widget.arguments["price"] == // widget.arguments["price"] ==
"0" // "0"
? false // ? false
: (double.parse(widget // : (double.parse(widget
.arguments["price"]) * // .arguments["price"]) *
(buyNum + 1)) > // (buyNum + 1)) >
double.parse(points)))) { // double.parse(points)))) {
SmartDialog.showToast("您的积分不足", // SmartDialog.showToast("您的积分不足",
alignment: Alignment.center); // alignment: Alignment.center);
return; // return;
} // }
buyNum += 1; // buyNum += 1;
}); // });
}, // },
child: Image.asset( // child: Image.asset(
"assets/image/add.webp", // "assets/image/add.webp",
width: 22, // width: 22,
height: 22, // height: 22,
), // ),
), // ),
], // ],
), // ),
], // ],
), // ),
), // ),
if (widget.arguments["payType"] == 4 || if (widget.arguments["payType"] == 4 ||
(widget.arguments["payType"] == 3 && (widget.arguments["payType"] == 3 &&
widget.arguments["money"] != "0.00")) widget.arguments["money"] != "0.00"))
@ -1170,7 +1170,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
"payType": (widget.arguments["payType"] == 1) "payType": (widget.arguments["payType"] == 1)
? 2 ? 2
: ((widget.arguments["payType"] == 2) ? 1 : 3), : ((widget.arguments["payType"] == 2) ? 1 : 3),
"number": buyNum, "number": 1,
"useTyped": widget.arguments["useTyped"], "useTyped": widget.arguments["useTyped"],
"payChannel": "payChannel":
handleNeedPay().contains("元") ? (checkIndex == 3 ? "1" : "4") : "0", handleNeedPay().contains("元") ? (checkIndex == 3 ? "1" : "4") : "0",

2
lib/setting/binding_phone_page.dart
Unescape View File

@ -351,7 +351,7 @@ class _BindingPhonePage extends State<BindingPhonePage> {
Container( Container(
height: 30.h, height: 30.h,
width: MediaQuery.of(context).size.width - 100.w, width: MediaQuery.of(context).size.width - 100.w,
margin: EdgeInsets.only(bottom:Platform.isIOS ? 10.h:0), margin: EdgeInsets.only(bottom:Platform.isIOS ? 5.h:0),
child: TextField( child: TextField(
style: TextStyle( style: TextStyle(
height: 1.h, height: 1.h,

76
lib/union/union_list.dart
Unescape View File

@ -11,6 +11,7 @@ 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:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:shimmer/shimmer.dart';
import '../view_widget/no_data_view.dart'; import '../view_widget/no_data_view.dart';
@ -49,13 +50,20 @@ class _UnionList extends State<UnionList> {
header: MyHeader(), header: MyHeader(),
onRefresh: widget.onRefresh, onRefresh: widget.onRefresh,
child: (widget.storeList == null || widget.storeList.length == 0) child: (widget.storeList == null || widget.storeList.length == 0)
? NoDataView( ? ListView.builder(
src:"assets/image/di_zhi.webp", itemCount:5,
isShowBtn: false, padding: EdgeInsets.only(
text: "暂无店铺列表~", top: 8.h,
fontSize: 16.sp, bottom: 100.h, /* + (375.h - 88.h) + 4.h*/
margin: EdgeInsets.only(top: 120.h), ),
):ListView.builder( physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
return InkWell(
onTap: () {
},
child:sm(),
);
}):ListView.builder(
itemCount:widget.storeList == null ? 0 : widget.storeList.length, itemCount:widget.storeList == null ? 0 : widget.storeList.length,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 8.h, top: 8.h,
@ -93,7 +101,8 @@ class _UnionList extends State<UnionList> {
); );
} }
}, },
child: buildStoreItem(widget.storeList[position], position), child:
buildStoreItem(widget.storeList[position], position),
); );
})), })),
) )
@ -101,6 +110,57 @@ class _UnionList extends State<UnionList> {
); );
} }
Widget sm(){
return Container(
margin:EdgeInsets.symmetric(horizontal: 14.w,vertical: 8.h),
width: double.infinity,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(6),
),
height: 223.h,
child:Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Shimmer.fromColors(
baseColor: Color(0XFFD8D8D8),
highlightColor: Color(0XFFD8D8D8),
child: Container(
color: Color(0XFFD8D8D8),
width: double.infinity,
height: 140.h,
),
),
Padding(padding: EdgeInsets.only(left: 6.w,bottom: 5.h,top: 12.h),
child: Shimmer.fromColors(
baseColor: Color(0XFFD8D8D8),
highlightColor: Color(0XFFD8D8D8),
child: Container(
decoration: BoxDecoration(
color: Color(0XFFD8D8D8),
borderRadius: BorderRadius.circular(2),
),
width: 108.w,
height: 20.h,
),
),),Padding(padding: EdgeInsets.only(left: 6.w,),
child: Shimmer.fromColors(
baseColor: Color(0XFFD8D8D8),
highlightColor: Color(0XFFD8D8D8),
child: Container(
decoration: BoxDecoration(
color: Color(0XFFD8D8D8),
borderRadius: BorderRadius.circular(2),
),
width: 260.w,
height: 20.h,
),
),),
],
),
);
}
Widget buildSearchItem() { Widget buildSearchItem() {
return Container( return Container(
height: 36.h, height: 36.h,

7
pubspec.lock
Unescape View File

@ -728,6 +728,13 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.6" version: "1.3.6"
shimmer:
dependency: "direct main"
description:
name: shimmer
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.0"
simple_gesture_detector: simple_gesture_detector:
dependency: transitive dependency: transitive
description: description:

2
pubspec.yaml
Unescape View File

@ -108,6 +108,8 @@ dependencies:
mqtt_client: ^9.6.8 mqtt_client: ^9.6.8
shimmer: ^3.0.0
# 时间选择器 # 时间选择器
flutter_datetime_picker: ^1.5.1 flutter_datetime_picker: ^1.5.1

Write Preview
Loading…
Cancel
Save