Browse Source

轮播更改为自动轮播;

我的-优惠券ui更改;
优惠券高度更改;
new_revision_app
wurong 2 years ago
parent
commit
94d285d05e
  1. 2
      android/app/build.gradle
  2. 3
      lib/community/community_view/course_banner.dart
  3. 3
      lib/home/home_view/home_banner.dart
  4. 2
      lib/main_page.dart
  5. 22
      lib/mine/mine_page.dart
  6. 4
      lib/mine/mine_view/mine_navbar.dart
  7. 2
      lib/retrofit/min_api.dart
  8. 2
      lib/retrofit/retrofit_api.dart
  9. 2
      lib/settlement/settlement_view/coupon.dart
  10. 3
      lib/store/store_order.dart
  11. 1
      lib/utils/flutter_utils.dart
  12. 2
      lib/view_widget/new_coupon_widget.dart
  13. 262
      pubspec.lock
  14. 2
      pubspec.yaml

2
android/app/build.gradle

@ -90,7 +90,7 @@ def mfph = [
] ]
android { android {
compileSdkVersion 31 compileSdkVersion 33
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'

3
lib/community/community_view/course_banner.dart

@ -37,6 +37,9 @@ class _CourseBanner extends State<CourseBanner> {
child: Swiper( child: Swiper(
viewportFraction: 0.88, viewportFraction: 0.88,
scale: 0.93, scale: 0.93,
autoplay: true,
duration: 1500,
autoplayDelay: 2500,
pagination: SwiperPagination( pagination: SwiperPagination(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
builder: DotSwiperPaginationBuilder( builder: DotSwiperPaginationBuilder(

3
lib/home/home_view/home_banner.dart

@ -36,6 +36,9 @@ class _HomeBanner extends State<HomeBanner> {
color: Colors.white.withAlpha(76), color: Colors.white.withAlpha(76),
), ),
), ),
autoplay: true,
duration: 1500,
autoplayDelay: 2500,
controller: widget.controller, controller: widget.controller,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
itemBuilder: (context, position) { itemBuilder: (context, position) {

2
lib/main_page.dart

@ -73,7 +73,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
break; break;
case AppLifecycleState.resumed: // case AppLifecycleState.resumed: //
pushRoute(); pushRoute();
if(DateTime.now().millisecondsSinceEpoch - lastTime > 300000) if(DateTime.now().millisecondsSinceEpoch - lastTime > 420000)
Navigator.of(context).popAndPushNamed('/router/main_page'); Navigator.of(context).popAndPushNamed('/router/main_page');
break; break;
case AppLifecycleState.paused: // case AppLifecycleState.paused: //

22
lib/mine/mine_page.dart

@ -137,7 +137,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
// EasyLoading.dismiss(); // EasyLoading.dismiss();
} }
queryCoupon()async{ queryCoupon() async {
SharedPreferences value = await SharedPreferences.getInstance(); SharedPreferences value = await SharedPreferences.getInstance();
apiService = ApiService( apiService = ApiService(
Dio(), Dio(),
@ -260,20 +260,16 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
setState(() { setState(() {
totalMsg = 0; totalMsg = 0;
}); });
}, totalMsg, }, totalMsg, infoNumber, ranks),
infoNumber,
ranks
),
////// //////
MineNavbar( MineNavbar(couponNum, userInfo, infoNumber, () {
couponNum, toIntegralPage();
userInfo, }, () {
infoNumber, setState((){
() { queryCoupon();
toIntegralPage(); });
}, }),
),
/// VIP等级信息 /// VIP等级信息
// MineVipEntry( // MineVipEntry(

4
lib/mine/mine_view/mine_navbar.dart

@ -13,8 +13,9 @@ class MineNavbar extends StatefulWidget {
final UserInfo userInfo; final UserInfo userInfo;
final SocialInfo infoNumber; final SocialInfo infoNumber;
final GestureTapCallback toIntegralPage; final GestureTapCallback toIntegralPage;
final Function queryCoupon;
MineNavbar(this.couponNum,this.userInfo,this.infoNumber,this.toIntegralPage); MineNavbar(this.couponNum,this.userInfo,this.infoNumber,this.toIntegralPage,this.queryCoupon);
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -161,6 +162,7 @@ class _MineNavbar extends State<MineNavbar> {
return; return;
} }
Navigator.of(context).pushNamed('/router/coupon_page'); Navigator.of(context).pushNamed('/router/coupon_page');
widget.queryCoupon();
}); });
}, },
child: mineBottomItem( child: mineBottomItem(

2
lib/retrofit/min_api.dart

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart'; part 'min_api.g.dart';
const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";/// const localBaseUrl = "http://192.168.10.78:8765/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";/// // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线

2
lib/retrofit/retrofit_api.dart

@ -64,7 +64,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart'; part 'retrofit_api.g.dart';
const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";/// const localBaseUrl = "http://192.168.10.78:8766/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";/// // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线

2
lib/settlement/settlement_view/coupon.dart

@ -202,7 +202,7 @@ class _CouponWidget extends State<CouponWidget> {
), ),
), ),
Expanded( Expanded(
flex: (widget.couponList?.isEx ?? false) ? 56 : 42, flex: (widget.couponList?.isEx ?? false) ? 66 : 42,
child: Container( child: Container(
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 23.w, horizontal: 23.w,

3
lib/store/store_order.dart

@ -676,6 +676,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
color: Colors.white.withAlpha(76), color: Colors.white.withAlpha(76),
), ),
), ),
autoplay: true,
duration: 1500,
autoplayDelay: 2500,
itemBuilder: (context, position) { itemBuilder: (context, position) {
return Container( return Container(
child: MImage( child: MImage(

1
lib/utils/flutter_utils.dart

@ -58,6 +58,7 @@ class AppUtils {
return resString; return resString;
} }
///
static Future<BMFCoordinate> coordConvert(BMFCoordinate latLng) async { static Future<BMFCoordinate> coordConvert(BMFCoordinate latLng) async {
return BMFCalculateUtils.coordConvert( return BMFCalculateUtils.coordConvert(
coordinate: latLng, coordinate: latLng,

2
lib/view_widget/new_coupon_widget.dart

@ -43,7 +43,7 @@ class NewCouponWidget extends StatelessWidget {
// } // }
return Container( return Container(
height: (coupon != null && coupon.isEx) ? 160.h : 140.h, height: (coupon != null && coupon.isEx) ? 163.h : 143.h,
width: double.infinity, width: double.infinity,
margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h), margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h),
padding: EdgeInsets.only(right: 5), padding: EdgeInsets.only(right: 5),

262
pubspec.lock

File diff suppressed because it is too large Load Diff

2
pubspec.yaml

@ -3,7 +3,7 @@ description: 一心回乡.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 3.2.4+48 version: 3.2.10+55
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save