xt / Flutter-ReserveApp · Commits

Go to a project

Commit 06c62a0635e8384318ff1f38fb1a41f399c0f772

Authored by wdn127929
1 parent 73bbcb3f
build: skipped

以坚定

Inline Side-by-side
Showing 3 changed files with 33 additions and 24 deletions
@@ -510,7 +510,7 @@ @@ -510,7 +510,7 @@
510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 510 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
511 CODE_SIGN_IDENTITY = "Apple Development"; 511 CODE_SIGN_IDENTITY = "Apple Development";
512 CODE_SIGN_STYLE = Automatic; 512 CODE_SIGN_STYLE = Automatic;
513 - CURRENT_PROJECT_VERSION = 4901; 513 + CURRENT_PROJECT_VERSION = 490;
514 DEVELOPMENT_TEAM = 8J59HM8B82; 514 DEVELOPMENT_TEAM = 8J59HM8B82;
515 ENABLE_BITCODE = NO; 515 ENABLE_BITCODE = NO;
516 FLUTTER_BUILD_MODE = release; 516 FLUTTER_BUILD_MODE = release;
@@ -525,7 +525,7 @@ @@ -525,7 +525,7 @@
525 "$(inherited)", 525 "$(inherited)",
526 "$(PROJECT_DIR)/Flutter", 526 "$(PROJECT_DIR)/Flutter",
527 ); 527 );
528 - MARKETING_VERSION = 4.9.0; 528 + MARKETING_VERSION = 4.9.3;
529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
530 PRODUCT_NAME = Runner; 530 PRODUCT_NAME = Runner;
531 PROVISIONING_PROFILE_SPECIFIER = ""; 531 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -656,10 +656,10 @@ @@ -656,10 +656,10 @@
656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 656 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
657 CODE_SIGN_IDENTITY = "Apple Development"; 657 CODE_SIGN_IDENTITY = "Apple Development";
658 CODE_SIGN_STYLE = Automatic; 658 CODE_SIGN_STYLE = Automatic;
659 - CURRENT_PROJECT_VERSION = 4901; 659 + CURRENT_PROJECT_VERSION = 490;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 - FLUTTER_BUILD_MODE = release; 662 + FLUTTER_BUILD_MODE = debug;
663 FRAMEWORK_SEARCH_PATHS = ( 663 FRAMEWORK_SEARCH_PATHS = (
664 "$(inherited)", 664 "$(inherited)",
665 "$(PROJECT_DIR)/Flutter", 665 "$(PROJECT_DIR)/Flutter",
@@ -671,7 +671,7 @@ @@ -671,7 +671,7 @@
671 "$(inherited)", 671 "$(inherited)",
672 "$(PROJECT_DIR)/Flutter", 672 "$(PROJECT_DIR)/Flutter",
673 ); 673 );
674 - MARKETING_VERSION = 4.9.0; 674 + MARKETING_VERSION = 4.9.3;
675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
676 PRODUCT_NAME = Runner; 676 PRODUCT_NAME = Runner;
677 PROVISIONING_PROFILE_SPECIFIER = ""; 677 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -692,7 +692,7 @@ @@ -692,7 +692,7 @@
692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 692 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
693 CODE_SIGN_IDENTITY = "Apple Development"; 693 CODE_SIGN_IDENTITY = "Apple Development";
694 CODE_SIGN_STYLE = Automatic; 694 CODE_SIGN_STYLE = Automatic;
695 - CURRENT_PROJECT_VERSION = 4901; 695 + CURRENT_PROJECT_VERSION = 490;
696 DEVELOPMENT_TEAM = 8J59HM8B82; 696 DEVELOPMENT_TEAM = 8J59HM8B82;
697 ENABLE_BITCODE = NO; 697 ENABLE_BITCODE = NO;
698 FLUTTER_BUILD_MODE = release; 698 FLUTTER_BUILD_MODE = release;
@@ -707,7 +707,7 @@ @@ -707,7 +707,7 @@
707 "$(inherited)", 707 "$(inherited)",
708 "$(PROJECT_DIR)/Flutter", 708 "$(PROJECT_DIR)/Flutter",
709 ); 709 );
710 - MARKETING_VERSION = 4.9.0; 710 + MARKETING_VERSION = 4.9.3;
711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
712 PRODUCT_NAME = Runner; 712 PRODUCT_NAME = Runner;
713 PROVISIONING_PROFILE_SPECIFIER = ""; 713 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -174,6 +174,7 @@ class _SmsRechargePageState extends State<SmsRechargePage> { @@ -174,6 +174,7 @@ class _SmsRechargePageState extends State<SmsRechargePage> {
174 print(rechargeModel.sunModel.package.substring(10)); 174 print(rechargeModel.sunModel.package.substring(10));
175 Map<String, String> str = { 175 Map<String, String> str = {
176 'appid': rechargeModel.sunModel.appId, 176 'appid': rechargeModel.sunModel.appId,
  177 + // 'appid': 'wx85aa3cdd0f791e65',
177 'partnerid': '1489405762', 178 'partnerid': '1489405762',
178 'prepayid': 179 'prepayid':
179 rechargeModel.sunModel.package.substring(10), 180 rechargeModel.sunModel.package.substring(10),
@@ -192,24 +193,31 @@ class _SmsRechargePageState extends State<SmsRechargePage> { @@ -192,24 +193,31 @@ class _SmsRechargePageState extends State<SmsRechargePage> {
192 print(sign); 193 print(sign);
193 print(rechargeModel.sunModel.paySign); 194 print(rechargeModel.sunModel.paySign);
194 195
  196 + print('appId${rechargeModel.sunModel.appId}');
  197 + print(
  198 + 'prepayId${rechargeModel.sunModel.package.substring(10)}');
  199 + print('nonceStr${rechargeModel.sunModel.nonceStr}');
  200 + print('timeStamp${rechargeModel.sunModel.timeStamp}');
  201 + print('sign${sign}');
  202 +
195 //掉起微信支付 203 //掉起微信支付
196 fluwx 204 fluwx
197 .payWithWeChat( 205 .payWithWeChat(
198 - // appId: 'wx85aa3cdd0f791e65',  
199 - // appId: 'wx71921f840e8f1c34',  
200 - appId: rechargeModel.sunModel.appId,  
201 - partnerId: '1489405762',  
202 - prepayId: rechargeModel.sunModel.package  
203 - .substring(10),  
204 - packageValue: 'Sign=WXPay',  
205 - nonceStr: rechargeModel.sunModel.nonceStr,  
206 - timeStamp: int.parse(  
207 - rechargeModel.sunModel.timeStamp),  
208 - // sign: sign  
209 - sign: sign,  
210 - // signType: rechargeModel.sunModel.signType  
211 - // signType: rechargeModel.sunModel.signType)  
212 - ) 206 + // appId: 'wx85aa3cdd0f791e65',
  207 + // appId: 'wx71921f840e8f1c34',
  208 + appId: rechargeModel.sunModel.appId,
  209 + partnerId: '1489405762',
  210 + prepayId:
  211 + rechargeModel.sunModel.package.substring(10),
  212 + packageValue: 'Sign=WXPay',
  213 + nonceStr: rechargeModel.sunModel.nonceStr,
  214 + timeStamp:
  215 + int.parse(rechargeModel.sunModel.timeStamp),
  216 + // sign: sign
  217 + sign: sign,
  218 + // signType: rechargeModel.sunModel.signType
  219 + // signType: rechargeModel.sunModel.signType)
  220 + )
213 .then((data) { 221 .then((data) {
214 print("---》$data"); 222 print("---》$data");
215 }).catchError((error) { 223 }).catchError((error) {
@@ -79,8 +79,9 @@ dependencies: @@ -79,8 +79,9 @@ dependencies:
79 # 日历 79 # 日历
80 table_calendar: ^2.2.1 80 table_calendar: ^2.2.1
81 # 微信SDK 81 # 微信SDK
82 - # fluwx: ^3.9.0+2  
83 - fluwx: ^3.13.1 82 + fluwx: ^3.9.0+2
  83 + # fluwx: ^3.13.1
  84 + # fluwx: ^4.2.5
84 #网页，短信，电话 85 #网页，短信，电话
85 # url_launcher: ^5.4.2 86 # url_launcher: ^5.4.2
86 url_launcher: ^6.0.9 87 url_launcher: ^6.0.9