Showing
7 changed files
with
42 additions
and
17 deletions
| @@ -74,7 +74,7 @@ PODS: | @@ -74,7 +74,7 @@ PODS: | ||
| 74 | - Toast | 74 | - Toast |
| 75 | - fluwx (0.0.1): | 75 | - fluwx (0.0.1): |
| 76 | - Flutter | 76 | - Flutter |
| 77 | - - "OpenWeChatSDK (~> 1.9.2+1)" | 77 | + - WechatOpenSDK-XCFramework (~> 2.0.2) |
| 78 | - FMDB (2.7.5): | 78 | - FMDB (2.7.5): |
| 79 | - FMDB/standard (= 2.7.5) | 79 | - FMDB/standard (= 2.7.5) |
| 80 | - FMDB/standard (2.7.5) | 80 | - FMDB/standard (2.7.5) |
| @@ -102,7 +102,6 @@ PODS: | @@ -102,7 +102,6 @@ PODS: | ||
| 102 | - Mantle/extobjc (= 2.2.0) | 102 | - Mantle/extobjc (= 2.2.0) |
| 103 | - Mantle/extobjc (2.2.0) | 103 | - Mantle/extobjc (2.2.0) |
| 104 | - MTBBarcodeScanner (5.0.11) | 104 | - MTBBarcodeScanner (5.0.11) |
| 105 | - - "OpenWeChatSDK (1.9.9+1)" | ||
| 106 | - OrderedSet (5.0.0) | 105 | - OrderedSet (5.0.0) |
| 107 | - package_info (0.0.1): | 106 | - package_info (0.0.1): |
| 108 | - Flutter | 107 | - Flutter |
| @@ -146,6 +145,7 @@ PODS: | @@ -146,6 +145,7 @@ PODS: | ||
| 146 | - Flutter | 145 | - Flutter |
| 147 | - webview_flutter (0.0.1): | 146 | - webview_flutter (0.0.1): |
| 148 | - Flutter | 147 | - Flutter |
| 148 | + - WechatOpenSDK-XCFramework (2.0.2) | ||
| 149 | 149 | ||
| 150 | DEPENDENCIES: | 150 | DEPENDENCIES: |
| 151 | - amap_core_fluttify (from `.symlinks/plugins/amap_core_fluttify/ios`) | 151 | - amap_core_fluttify (from `.symlinks/plugins/amap_core_fluttify/ios`) |
| @@ -202,7 +202,6 @@ SPEC REPOS: | @@ -202,7 +202,6 @@ SPEC REPOS: | ||
| 202 | - libwebp | 202 | - libwebp |
| 203 | - Mantle | 203 | - Mantle |
| 204 | - MTBBarcodeScanner | 204 | - MTBBarcodeScanner |
| 205 | - - OpenWeChatSDK | ||
| 206 | - OrderedSet | 205 | - OrderedSet |
| 207 | - Reachability | 206 | - Reachability |
| 208 | - SDWebImage | 207 | - SDWebImage |
| @@ -211,6 +210,7 @@ SPEC REPOS: | @@ -211,6 +210,7 @@ SPEC REPOS: | ||
| 211 | - Toast | 210 | - Toast |
| 212 | - TOCropViewController | 211 | - TOCropViewController |
| 213 | - TPNS-iOS | 212 | - TPNS-iOS |
| 213 | + - WechatOpenSDK-XCFramework | ||
| 214 | 214 | ||
| 215 | EXTERNAL SOURCES: | 215 | EXTERNAL SOURCES: |
| 216 | amap_core_fluttify: | 216 | amap_core_fluttify: |
| @@ -326,7 +326,7 @@ SPEC CHECKSUMS: | @@ -326,7 +326,7 @@ SPEC CHECKSUMS: | ||
| 326 | flutter_sms: 91ce41530f55c85d6524d82307a5d555844c086a | 326 | flutter_sms: 91ce41530f55c85d6524d82307a5d555844c086a |
| 327 | flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 | 327 | flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 |
| 328 | fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037 | 328 | fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037 |
| 329 | - fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 | 329 | + fluwx: e9e728cfdb80e82dac5f4ff974b1901a7939dcd0 |
| 330 | FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a | 330 | FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a |
| 331 | foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278 | 331 | foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278 |
| 332 | image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98 | 332 | image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98 |
| @@ -336,7 +336,6 @@ SPEC CHECKSUMS: | @@ -336,7 +336,6 @@ SPEC CHECKSUMS: | ||
| 336 | libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef | 336 | libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef |
| 337 | Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d | 337 | Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d |
| 338 | MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb | 338 | MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb |
| 339 | - OpenWeChatSDK: ea48e9db20645f78128db9091893910280b8e4b1 | ||
| 340 | OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c | 339 | OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c |
| 341 | package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 | 340 | package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 |
| 342 | path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 | 341 | path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 |
| @@ -359,6 +358,7 @@ SPEC CHECKSUMS: | @@ -359,6 +358,7 @@ SPEC CHECKSUMS: | ||
| 359 | video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff | 358 | video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff |
| 360 | wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f | 359 | wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f |
| 361 | webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b | 360 | webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b |
| 361 | + WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69 | ||
| 362 | 362 | ||
| 363 | PODFILE CHECKSUM: 583d0874d9843cb84ef3a723537d644f42b3ebab | 363 | PODFILE CHECKSUM: 583d0874d9843cb84ef3a723537d644f42b3ebab |
| 364 | 364 |
| @@ -11,6 +11,7 @@ import '../../../models/recharge_list_model.dart'; | @@ -11,6 +11,7 @@ import '../../../models/recharge_list_model.dart'; | ||
| 11 | import '../../../models/setmeal_by_id_model.dart'; | 11 | import '../../../models/setmeal_by_id_model.dart'; |
| 12 | import '../../../models/setmeal_model.dart'; | 12 | import '../../../models/setmeal_model.dart'; |
| 13 | import '../../../models/user.dart'; | 13 | import '../../../models/user.dart'; |
| 14 | +import '../../../provider/base_info_provider.dart'; | ||
| 14 | import '../../../provider/marketing_center_provider.dart'; | 15 | import '../../../provider/marketing_center_provider.dart'; |
| 15 | import '../../../provider/user_model.dart'; | 16 | import '../../../provider/user_model.dart'; |
| 16 | import '../../../res/colors.dart'; | 17 | import '../../../res/colors.dart'; |
| @@ -48,11 +49,33 @@ class _FeastDishSharePageState extends State<FeastDishSharePage> { | @@ -48,11 +49,33 @@ class _FeastDishSharePageState extends State<FeastDishSharePage> { | ||
| 48 | // Map<String, List<Cook>> dataNew = {}; | 49 | // Map<String, List<Cook>> dataNew = {}; |
| 49 | List<String> classNames = []; | 50 | List<String> classNames = []; |
| 50 | 51 | ||
| 52 | + String servicePerson = ''; | ||
| 53 | + | ||
| 51 | @override | 54 | @override |
| 52 | void initState() { | 55 | void initState() { |
| 53 | super.initState(); | 56 | super.initState(); |
| 54 | Utils.changeStatusColor(color: Colors.transparent); | 57 | Utils.changeStatusColor(color: Colors.transparent); |
| 55 | _getSetmealById(); | 58 | _getSetmealById(); |
| 59 | + WidgetsBinding.instance.addPostFrameCallback((_) { | ||
| 60 | + _getCustomerActivityBaseinfo(context); | ||
| 61 | + }); | ||
| 62 | + } | ||
| 63 | + | ||
| 64 | + _getCustomerActivityBaseinfo(BuildContext context) async { | ||
| 65 | + Map<String, String> params = { | ||
| 66 | + 'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid, | ||
| 67 | + "uid": Provider.of<UserModel>(context, listen: false).user.openid, | ||
| 68 | + }; | ||
| 69 | + | ||
| 70 | + BaseIndoProvider _baseIndoProvider = | ||
| 71 | + Provider.of<BaseIndoProvider>(context, listen: false); | ||
| 72 | + bool success = | ||
| 73 | + await _baseIndoProvider.getCustomerActivityBaseinfo(context, params); | ||
| 74 | + if (success) { | ||
| 75 | + servicePerson = | ||
| 76 | + '${_baseIndoProvider.baseInfoSunModel.name ?? Provider.of<UserModel>(context, listen: false).user.nickName ?? ''} ${_baseIndoProvider.baseInfoSunModel.phone ?? Provider.of<UserModel>(context, listen: false).user.userphone ?? ''}'; | ||
| 77 | + } | ||
| 78 | + setState(() {}); | ||
| 56 | } | 79 | } |
| 57 | 80 | ||
| 58 | /// 根据ID获取宴会套餐 | 81 | /// 根据ID获取宴会套餐 |
| @@ -210,7 +233,6 @@ class _FeastDishSharePageState extends State<FeastDishSharePage> { | @@ -210,7 +233,6 @@ class _FeastDishSharePageState extends State<FeastDishSharePage> { | ||
| 210 | String sellerAdr = | 233 | String sellerAdr = |
| 211 | Provider.of<UserModel>(context, listen: false).user.sellerAddr; | 234 | Provider.of<UserModel>(context, listen: false).user.sellerAddr; |
| 212 | User user = Provider.of<UserModel>(context, listen: false).user; | 235 | User user = Provider.of<UserModel>(context, listen: false).user; |
| 213 | - String servicePerson = '${user.nickName ?? ''} ${user.userphone ?? ''}'; | ||
| 214 | 236 | ||
| 215 | return KeyboardDismissOnTap( | 237 | return KeyboardDismissOnTap( |
| 216 | child: Scaffold( | 238 | child: Scaffold( |
| @@ -2778,7 +2778,9 @@ var feastDishSharePageHandle = new Handler( | @@ -2778,7 +2778,9 @@ var feastDishSharePageHandle = new Handler( | ||
| 2778 | .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first))); | 2778 | .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first))); |
| 2779 | return ChangeNotifierProvider<FeastModel>( | 2779 | return ChangeNotifierProvider<FeastModel>( |
| 2780 | create: (_) => FeastModel(), | 2780 | create: (_) => FeastModel(), |
| 2781 | - child: FeastDishSharePage(setmealDetail: setmealDetail)); | 2781 | + child: ChangeNotifierProvider<BaseIndoProvider>( |
| 2782 | + create: (_) => BaseIndoProvider(), | ||
| 2783 | + child: FeastDishSharePage(setmealDetail: setmealDetail))); | ||
| 2782 | }); | 2784 | }); |
| 2783 | 2785 | ||
| 2784 | ///优惠券核销详情页 | 2786 | ///优惠券核销详情页 |
| @@ -2786,10 +2788,9 @@ var couponVerificationDetailPageHandle = new Handler( | @@ -2786,10 +2788,9 @@ var couponVerificationDetailPageHandle = new Handler( | ||
| 2786 | handlerFunc: (BuildContext context, Map<String, List<Object>> params) { | 2788 | handlerFunc: (BuildContext context, Map<String, List<Object>> params) { |
| 2787 | // String idStr = params["idStr"].first; | 2789 | // String idStr = params["idStr"].first; |
| 2788 | IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode( | 2790 | IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode( |
| 2789 | - FluroConvertUtils.fluroCnParamsDecode( | ||
| 2790 | - params["isExamineSunModel"].first))); | 2791 | + FluroConvertUtils.fluroCnParamsDecode( |
| 2792 | + params["isExamineSunModel"].first))); | ||
| 2791 | // } | 2793 | // } |
| 2792 | 2794 | ||
| 2793 | - return CouponVerificationDetailPage( | ||
| 2794 | - isExamineSunModel: isExamineSunModel); | 2795 | + return CouponVerificationDetailPage(isExamineSunModel: isExamineSunModel); |
| 2795 | }); | 2796 | }); |
| @@ -1674,14 +1674,15 @@ class Utils { | @@ -1674,14 +1674,15 @@ class Utils { | ||
| 1674 | var model = new WeChatShareMiniProgramModel( | 1674 | var model = new WeChatShareMiniProgramModel( |
| 1675 | webPageUrl: _webPageUrl, | 1675 | webPageUrl: _webPageUrl, |
| 1676 | userName: _userName, | 1676 | userName: _userName, |
| 1677 | - title: _title, | 1677 | + title: 'ff', |
| 1678 | path: _path, | 1678 | path: _path, |
| 1679 | - description: _description, | 1679 | + description: 'hhh', |
| 1680 | miniProgramType: WXMiniProgramType.PREVIEW, //体验版 | 1680 | miniProgramType: WXMiniProgramType.PREVIEW, //体验版 |
| 1681 | // miniProgramType: WXMiniProgramType.RELEASE //正式版 | 1681 | // miniProgramType: WXMiniProgramType.RELEASE //正式版 |
| 1682 | // miniProgramType: WXMiniProgramType.TEST //开发版 | 1682 | // miniProgramType: WXMiniProgramType.TEST //开发版 |
| 1683 | // thumbnail: WeChatImage.binary(source) | 1683 | // thumbnail: WeChatImage.binary(source) |
| 1684 | - thumbnail: WeChatImage.network(_thumbnail) | 1684 | + thumbnail: WeChatImage.network(_thumbnail), |
| 1685 | + // hdImagePath: WeChatImage.network(_thumbnail), thumbnail: null, | ||
| 1685 | // thumbnail: WeChatImage.binary(image) | 1686 | // thumbnail: WeChatImage.binary(image) |
| 1686 | ); | 1687 | ); |
| 1687 | //分享链接 | 1688 | //分享链接 |
| @@ -580,7 +580,7 @@ packages: | @@ -580,7 +580,7 @@ packages: | ||
| 580 | name: fluwx | 580 | name: fluwx |
| 581 | url: "https://pub.flutter-io.cn" | 581 | url: "https://pub.flutter-io.cn" |
| 582 | source: hosted | 582 | source: hosted |
| 583 | - version: "3.9.0+2" | 583 | + version: "3.13.1" |
| 584 | foundation_fluttify: | 584 | foundation_fluttify: |
| 585 | dependency: transitive | 585 | dependency: transitive |
| 586 | description: | 586 | description: |
| @@ -78,7 +78,8 @@ dependencies: | @@ -78,7 +78,8 @@ dependencies: | ||
| 78 | # 日历 | 78 | # 日历 |
| 79 | table_calendar: ^2.2.1 | 79 | table_calendar: ^2.2.1 |
| 80 | # 微信SDK | 80 | # 微信SDK |
| 81 | - fluwx: ^3.9.0+2 | 81 | + # fluwx: ^3.9.0+2 |
| 82 | + fluwx: ^3.13.1 | ||
| 82 | #网页,短信,电话 | 83 | #网页,短信,电话 |
| 83 | # url_launcher: ^5.4.2 | 84 | # url_launcher: ^5.4.2 |
| 84 | url_launcher: ^6.0.9 | 85 | url_launcher: ^6.0.9 |
-
Please register or login to post a comment