diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index b5bb513..2cdb56a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -161,7 +161,7 @@
NSCalendarsUsageDescription
我们需要访问日历权限
NSCameraUsageDescription
- 我们需要访问您的相机，当您评价商品、编辑头像、发布录像或直播时，请同意
+ 是否允许"瑞库客"访问您设备上的照片、媒体内容和文件
NSContactsUsageDescription
我们需要访问您的通讯录权限
NSLocationAlwaysAndWhenInUseUsageDescription
@@ -175,9 +175,9 @@
NSMotionUsageDescription
我们需要访问健康权限
NSPhotoLibraryAddUsageDescription
- 我们需要访问您的照片，当您评价商品或编辑头像时，请同意
+ 是否允许"瑞库客"访问您设备上的照片、媒体内容和文件
NSPhotoLibraryUsageDescription
- 我们需要访问您的照片，当您评价商品或编辑头像时，请同意
+ 是否允许"瑞库客"访问您设备上的照片、媒体内容和文件
NSSpeechRecognitionUsageDescription
我们需要访问语音识别权限
UILaunchStoryboardName
diff --git a/lib/pages/business/focus/child_focus_page.dart b/lib/pages/business/focus/child_focus_page.dart
index b65b567..fcc8362 100644
--- a/lib/pages/business/focus/child_focus_page.dart
+++ b/lib/pages/business/focus/child_focus_page.dart
@@ -81,6 +81,7 @@ class _FocusPageState extends BaseStoreState
List urls = indexModel.photos.map((f){
return Api.getResizeImgUrl(f.url, 300);
}).toList();
+ print(urls);
ImageUtils.saveNetworkImagesToPhoto(
urls,
(index){
diff --git a/lib/pages/home/classify/commodity_detail_page.dart b/lib/pages/home/classify/commodity_detail_page.dart
index 693a937..9be94e4 100644
--- a/lib/pages/home/classify/commodity_detail_page.dart
+++ b/lib/pages/home/classify/commodity_detail_page.dart
@@ -140,7 +140,7 @@ class _CommodityDetailPageState extends BaseStoreState
// backgroundColor: AppColor.frenchColor,
backgroundColor: Colors.white,
body: SafeArea(
- top: false,
+ top: true,
bottom: true,
child: Stack(
children: [
diff --git a/lib/pages/home/classify/order_preview_page.dart b/lib/pages/home/classify/order_preview_page.dart
index 7f7fa7c..7ce1ea4 100644
--- a/lib/pages/home/classify/order_preview_page.dart
+++ b/lib/pages/home/classify/order_preview_page.dart
@@ -702,7 +702,7 @@ class _GoodsOrderPageState extends BaseStoreState {
OverseaAcceptLicensePage(),
),
child: Text(
- '《境商品用户购买须知》',
+ '《跨境商品用户购买须知》',
style: TextStyle(
color: Color(0xFF007AFF),
fontSize: rSP(13),
diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
index 3a06895..b813cb9 100644
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@@ -1297,7 +1297,7 @@ class _HomePageState extends BaseStoreState
_buildSingleGoodsCard(R.ASSETS_HOME_IC_FURNITURE_PNG, '家具饰品'),
_buildSingleGoodsCard(R.ASSETS_HOME_IC_CLOTHES_PNG, '服饰内衣'),
_buildSingleGoodsCard(R.ASSETS_HOME_IC_BAG_PNG, '鞋靴箱包'),
- _buildSingleGoodsCard(R.ASSETS_HOME_IC_MEMBERS_PNG, '会员专享'),
+ //_buildSingleGoodsCard(R.ASSETS_HOME_IC_MEMBERS_PNG, '会员专享'), 9.23优化更新隐藏
],
),
),
diff --git a/lib/pages/shopping_cart/item/item_shopping_cart.dart b/lib/pages/shopping_cart/item/item_shopping_cart.dart
index 6d31bd1..4780c85 100644
--- a/lib/pages/shopping_cart/item/item_shopping_cart.dart
+++ b/lib/pages/shopping_cart/item/item_shopping_cart.dart
@@ -429,19 +429,19 @@ class _ShoppingCartItemState extends State {
style: AppTextStyle.generate(14 * 2.sp,
color: AppColor.themeColor),
),
- TextSpan(
- text: "￥",
- style: AppTextStyle.generate(7 * 2.sp,
- color: AppColor.greyColor),
- ),
- TextSpan(
- text:
- "${goods.originalPrice.toStringAsFixed(2)}",
- style: AppTextStyle.generate(11 * 2.sp,
- decoration:
- TextDecoration.lineThrough,
- color: AppColor.greyColor),
- ),
+ // TextSpan(
+ // text: "￥",
+ // style: AppTextStyle.generate(7 * 2.sp,
+ // color: AppColor.greyColor),
+ // ),
+ // TextSpan(
+ // text:
+ // "${goods.originalPrice.toStringAsFixed(2)}",
+ // style: AppTextStyle.generate(11 * 2.sp,
+ // decoration:
+ // TextDecoration.lineThrough,
+ // color: AppColor.greyColor),
+ // ),
])),
)),
goods.publishStatus == 1
diff --git a/lib/pages/shopping_cart/shopping_cart_page.dart b/lib/pages/shopping_cart/shopping_cart_page.dart
index f554108..28699e6 100644
--- a/lib/pages/shopping_cart/shopping_cart_page.dart
+++ b/lib/pages/shopping_cart/shopping_cart_page.dart
@@ -410,7 +410,7 @@ class _ShoppingCartPageState extends BaseStoreState
_buildLikeWidget() {
return Container(
padding: EdgeInsets.symmetric(horizontal: 10.rw),
- height: _likeGoodsList?.length * 378.rw / 2,
+ height: _likeGoodsList?.length * 381.rw / 2,
width: double.infinity,
child: Column(
children: [
diff --git a/lib/pages/user/setting_page.dart b/lib/pages/user/setting_page.dart
index 7258e4e..c040ba5 100644
--- a/lib/pages/user/setting_page.dart
+++ b/lib/pages/user/setting_page.dart
@@ -137,14 +137,14 @@ class _SettingItemListViewState extends ResumableState {
}),
//秒杀临时入口
- SCTile.normalTile("秒杀(临时)", listener: () async {
-
-
- Get.to(() => SeckillActivityPage());
-
-
- //CRoute.push(context, PrivacyPageV2());
- }),
+ // SCTile.normalTile("秒杀(临时)", listener: () async {
+ //
+ //
+ // Get.to(() => SeckillActivityPage());
+ //
+ //
+ // //CRoute.push(context, PrivacyPageV2());
+ // }),
getEmptyBox(),
diff --git a/lib/pages/user/user_benefit_currency_pag.dart b/lib/pages/user/user_benefit_currency_pag.dart
index af4ec80..b0211f0 100644
--- a/lib/pages/user/user_benefit_currency_pag.dart
+++ b/lib/pages/user/user_benefit_currency_pag.dart
@@ -779,9 +779,12 @@ class _UserBenefitCurrencyPageState extends State {
_gone[num] = !_gone[num];
setState(() {});
} else if (detail.count == 1) {
- AppRouter.push(context, RouteName.SHOP_ORDER_DETAIL,
- arguments: OrderDetailPage.setArguments(
- detail.detail[0].id)); //只有一条数据时，第二层也会有一条
+ if(detail.detail!=null){
+ AppRouter.push(context, RouteName.SHOP_ORDER_DETAIL,
+ arguments: OrderDetailPage.setArguments(
+ detail.detail[0].id)); //只有一条数据时，第二层也会有一条
+ }
+
}
} else {
int type = 0;
@@ -914,8 +917,11 @@ class _UserBenefitCurrencyPageState extends State {
children: [
GestureDetector(
onTap: () {
- AppRouter.push(context, RouteName.SHOP_ORDER_DETAIL,
- arguments: OrderDetailPage.setArguments(id));
+ if(id!=null&&id!=0){
+
+ AppRouter.push(context, RouteName.SHOP_ORDER_DETAIL,
+ arguments: OrderDetailPage.setArguments(id));
+ }
},
child: Row(
children: [
diff --git a/lib/utils/image_utils.dart b/lib/utils/image_utils.dart
index 73c69e1..cbd605b 100644
--- a/lib/utils/image_utils.dart
+++ b/lib/utils/image_utils.dart
@@ -103,23 +103,24 @@ class ImageUtils {
try {
final Map result =
await ImageGallerySaver.saveImage(data);
- if (Platform.isAndroid) {
- if (result.containsValue(true)) {
- endBack(true);
- return true;
- } else {
- endBack(false);
- return false;
- }
- } else if (Platform.isIOS) {
- if (result.containsValue(true)) {
- endBack(true);
- return true;
- } else {
- endBack(false);
- return false;
- }
- }
+ //只下载单张图片的bug
+ // if (Platform.isAndroid) {
+ // if (result.containsValue(true)) {
+ // endBack(true);
+ // return true;
+ // } else {
+ // endBack(false);
+ // return false;
+ // }
+ // } else if (Platform.isIOS) {
+ // if (result.containsValue(true)) {
+ // endBack(true);
+ // return true;
+ // } else {
+ // endBack(false);
+ // return false;
+ // }
+ // }
} catch (e) {
if (e is ArgumentError) {
if (Platform.isIOS) {
diff --git a/lib/widgets/home_gif_header.dart b/lib/widgets/home_gif_header.dart
index 5c08136..28e8456 100644
--- a/lib/widgets/home_gif_header.dart
+++ b/lib/widgets/home_gif_header.dart
@@ -30,7 +30,7 @@ class _HomeGifHeaderState extends RefreshIndicatorState
void onModeChange(RefreshStatus mode) {
if (mode == RefreshStatus.refreshing) {
_gifController.repeat(
- min: 0, max: 38, period: Duration(milliseconds: 1500));
+ min: 0, max: 38, period: Duration(milliseconds: 1000));
}
super.onModeChange(mode);
}
@@ -40,7 +40,7 @@ class _HomeGifHeaderState extends RefreshIndicatorState
double value = _gifController.value;
if (value < 38) {
await Future.delayed(
- Duration(milliseconds: ((39 - value) / 39 * 1500).toInt() - 100), () {
+ Duration(milliseconds: ((39 - value) / 39 * 1000).toInt() - 100), () {
_gifController.value = 38;
// _gifController.stop();
});
diff --git a/lib/widgets/refresh_widget.dart b/lib/widgets/refresh_widget.dart
index 01b8136..ced7376 100644
--- a/lib/widgets/refresh_widget.dart
+++ b/lib/widgets/refresh_widget.dart
@@ -133,17 +133,15 @@ class _RefreshWidgetState extends State {
size: 20 * 2.sp,
color: widget.color,
),
- refreshingIcon: CupertinoActivityIndicator(
- animating: true,
- radius: 9.0 * 2.w,
- ),
+ // refreshingIcon:CircularProgressIndicator(),
completeIcon: Icon(
Icons.check,
size: 20 * 2.sp,
color: widget.color,
),
spacing: rSize(5),
- refreshingText: widget.refreshingText,
+
+ refreshingText: '',//widget.refreshingText,
completeText: widget.completeText,
failedText: widget.failedText,
idleText: widget.idleText,
diff --git a/pubspec.yaml b/pubspec.yaml
index 7790c32..ddf4483 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: recook
description: Recook Market App.
publish_to: "none"
-version: 1.12.1-dev+315
+version: 1.12.2-dev+316
environment:
sdk: ">=2.10.0 <3.0.0"