Browse Source

Merge branch 'dev' into wr_2023_business

wr_2023_business
wurong 1 year ago
parent
commit
c85039e851
  1. BIN
      android/app/src/main/res/mipmap-hdpi/ic_launcher.png
  2. BIN
      android/app/src/main/res/mipmap-hdpi/icon_splash_logo.png
  3. BIN
      android/app/src/main/res/mipmap-ldpi/ic_launcher.png
  4. BIN
      android/app/src/main/res/mipmap-mdpi/ic_launcher.png
  5. BIN
      android/app/src/main/res/mipmap-mdpi/icon_splash_logo.png
  6. BIN
      android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  7. BIN
      android/app/src/main/res/mipmap-xhdpi/icon_splash_logo.png
  8. BIN
      android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  9. BIN
      android/app/src/main/res/mipmap-xxhdpi/icon_splash_logo.png
  10. BIN
      android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  11. BIN
      android/app/src/main/res/mipmap-xxxhdpi/icon_splash_logo.png
  12. 15
      lib/view_widget/selector_store_dialog.dart
  13. 2
      pubspec.yaml

BIN
android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
android/app/src/main/res/mipmap-hdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
android/app/src/main/res/mipmap-ldpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/app/src/main/res/mipmap-mdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
android/app/src/main/res/mipmap-mdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
android/app/src/main/res/mipmap-xhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
android/app/src/main/res/mipmap-xxhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
android/app/src/main/res/mipmap-xxxhdpi/icon_splash_logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 62 KiB

15
lib/view_widget/selector_store_dialog.dart

@ -8,6 +8,8 @@ import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'no_data_view.dart';
class SelectorStoreWidget extends StatefulWidget {
final List<Store> stores;
@ -91,7 +93,18 @@ class _SelectorStoreWidget extends State<SelectorStoreWidget> {
? (widget.stores.length > 4 ? 4 : widget.stores.length)
: 0) *
60.h,
child: ListView.builder(
child: (widget.stores == null || widget.stores.length == 0)
? Padding(padding:EdgeInsets.symmetric(horizontal: 16.w),
child: Text(
"该优惠券未设置适用门店,适用情况请查看使用详情",
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
color: Colors.black,
),
),)
: ListView.builder(
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
return GestureDetector(

2
pubspec.yaml

@ -3,7 +3,7 @@ description: 海峡姐妹.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 3.2.20+63
version: 3.2.22+65
environment:
sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save