Browse Source

Merge branch 'dev' into wr_2023_business

wr_2023_business
fmk 2 years ago
parent
commit
7c4a6dd1e3
  1. 1
      ios/Podfile
  2. 31
      ios/Podfile.lock
  3. 6
      ios/Runner.xcodeproj/project.pbxproj
  4. 3
      lib/home/home_page.dart
  5. 1
      lib/mine/mine_page.dart
  6. 184
      lib/order/exchange_order_page.dart
  7. 4
      lib/setting/binding_phone_page.dart
  8. 55
      lib/union/union_list.dart
  9. 7
      pubspec.lock
  10. 2
      pubspec.yaml

1
ios/Podfile

@ -1,5 +1,6 @@
# Uncomment this line to define a global platform for your project # Uncomment this line to define a global platform for your project
platform :ios, '11.0' platform :ios, '11.0'
source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency. # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true' ENV['COCOAPODS_DISABLE_STATS'] = 'true'

31
ios/Podfile.lock

@ -46,7 +46,7 @@ PODS:
- Flutter - Flutter
- fluwx (0.0.1): - fluwx (0.0.1):
- Flutter - Flutter
- WechatOpenSDK-XCFramework (~> 2.0.2) - "OpenWeChatSDK (~> 1.9.2+1)"
- image_pickers (0.0.1): - image_pickers (0.0.1):
- AFNetworking - AFNetworking
- Flutter - Flutter
@ -166,6 +166,7 @@ PODS:
- mob_sharesdk_spec2/ShareSDK - mob_sharesdk_spec2/ShareSDK
- number_precision (0.0.1): - number_precision (0.0.1):
- Flutter - Flutter
- "OpenWeChatSDK (1.9.9+1)"
- package_info (0.0.1): - package_info (0.0.1):
- Flutter - Flutter
- path_provider (0.0.1): - path_provider (0.0.1):
@ -228,6 +229,13 @@ PODS:
- tpns_flutter_plugin (1.1.6): - tpns_flutter_plugin (1.1.6):
- Flutter - Flutter
- TPNS-iOS (= 1.3.4.1) - TPNS-iOS (= 1.3.4.1)
- UMCommon (7.4.1):
- UMDevice
- UMDevice (3.1.0)
- umeng_common_sdk (0.0.1):
- Flutter
- UMCommon
- UMDevice
- url_launcher (0.0.1): - url_launcher (0.0.1):
- Flutter - Flutter
- video_player_avfoundation (0.0.1): - video_player_avfoundation (0.0.1):
@ -236,7 +244,6 @@ PODS:
- Flutter - Flutter
- webview_flutter (0.0.1): - webview_flutter (0.0.1):
- Flutter - Flutter
- WechatOpenSDK-XCFramework (2.0.2)
- ZLPhotoBrowser-objc (1.0.4): - ZLPhotoBrowser-objc (1.0.4):
- SDWebImage - SDWebImage
@ -261,22 +268,25 @@ DEPENDENCIES:
- thumbnails (from `.symlinks/plugins/thumbnails/ios`) - thumbnails (from `.symlinks/plugins/thumbnails/ios`)
- tobias (from `.symlinks/plugins/tobias/ios`) - tobias (from `.symlinks/plugins/tobias/ios`)
- tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
- umeng_common_sdk (from `.symlinks/plugins/umeng_common_sdk/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
SPEC REPOS: SPEC REPOS:
trunk: https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git:
- AEINFoundation - AEINFoundation
- AFNetworking - AFNetworking
- BaiduMapKit - BaiduMapKit
- BMKLocationKit - BMKLocationKit
- mob_sharesdk_spec2 - mob_sharesdk_spec2
- OpenWeChatSDK
- SDWebImage - SDWebImage
- SSZipArchive - SSZipArchive
- TPNS-iOS - TPNS-iOS
- WechatOpenSDK-XCFramework - UMCommon
- UMDevice
- ZLPhotoBrowser-objc - ZLPhotoBrowser-objc
EXTERNAL SOURCES: EXTERNAL SOURCES:
@ -318,6 +328,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/tobias/ios" :path: ".symlinks/plugins/tobias/ios"
tpns_flutter_plugin: tpns_flutter_plugin:
:path: ".symlinks/plugins/tpns_flutter_plugin/ios" :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
umeng_common_sdk:
:path: ".symlinks/plugins/umeng_common_sdk/ios"
url_launcher: url_launcher:
:path: ".symlinks/plugins/url_launcher/ios" :path: ".symlinks/plugins/url_launcher/ios"
video_player_avfoundation: video_player_avfoundation:
@ -329,7 +341,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AEINFoundation: e046b5fbe75aaf120a54fdc530b1d62d4ce88dfe AEINFoundation: e046b5fbe75aaf120a54fdc530b1d62d4ce88dfe
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777 BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780 BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347 emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
@ -339,10 +351,11 @@ SPEC CHECKSUMS:
flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: e9e728cfdb80e82dac5f4ff974b1901a7939dcd0 fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492
image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773 image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2 mob_sharesdk_spec2: efa0cb438a29b37ab99d015a272dff69177e30a2
number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
OpenWeChatSDK: ea48e9db20645f78128db9091893910280b8e4b1
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
@ -355,13 +368,15 @@ SPEC CHECKSUMS:
tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5
TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2 tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
UMCommon: 47e0b53f6a36568e958a5abd005ed7577fcac9ad
UMDevice: 9ef8045b59e0479cff7062915c879a1af46fa094
umeng_common_sdk: a8abd7f86dfd013dbbeeae587ee143760c6582f2
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 9a26c1c4037e42be4afc95d70f8bd02a4b989a1c PODFILE CHECKSUM: f4ea28c741a7c9a1c417c066f9cfd7b29654dd12
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

6
ios/Runner.xcodeproj/project.pbxproj

@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

3
lib/home/home_page.dart

@ -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

@ -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

@ -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",

4
lib/setting/binding_phone_page.dart

@ -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 ?7.h:0),
child: TextField( child: TextField(
style: TextStyle( style: TextStyle(
height: 1.h, height: 1.h,
@ -377,7 +377,7 @@ class _BindingPhonePage extends State<BindingPhonePage> {
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
hintText: S.of(context).qingshurushoujihao, hintText: S.of(context).qingshurushoujihao,
// contentPadding: EdgeInsets.only(top: 12, bottom: 12, left: 12), // contentPadding: EdgeInsets.only(top: 12, bottom: 12,),
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFFA29E9E), color: Color(0xFFA29E9E),

55
lib/union/union_list.dart

@ -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';
@ -93,7 +94,8 @@ class _UnionList extends State<UnionList> {
); );
} }
}, },
child: buildStoreItem(widget.storeList[position], position), child:
buildStoreItem(widget.storeList[position], position),
); );
})), })),
) )
@ -101,6 +103,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

@ -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

@ -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

Loading…
Cancel
Save