Browse Source

pay 修改

wr_2024_invoice
zsw 7 months ago
parent
commit
d9c962c279
  1. BIN
      android/app/libs/uniMPSDK-release.aar
  2. 2
      lib/home/home_page.dart
  3. 2
      lib/main_page.dart
  4. 29
      lib/settlement/settlement_view/pay_method.dart
  5. 185
      pubspec.lock

BIN
android/app/libs/uniMPSDK-release.aar

Binary file not shown.

2
lib/home/home_page.dart

@ -628,7 +628,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
break; break;
case 4: case 4:
String router = bannerData.content; String router = bannerData.content;
// String router = "/router/store_order?{\"id\":\"1512378184161558528\",\"tenant\":\"1188\",\"storeName\":\"农场煮意\"}"; // String router = "/router/store_order?{"id":"1460885296764682240","tenant":"1179","storeName":""}";
if (router.contains("?")) { if (router.contains("?")) {
String params = router.substring(router.indexOf("?") + 1); String params = router.substring(router.indexOf("?") + 1);
Map map = jsonDecode(params); Map map = jsonDecode(params);

2
lib/main_page.dart

@ -487,7 +487,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
offset: Offset(0, 2), offset: Offset(0, 2),
blurRadius: 4, blurRadius: 4,
spreadRadius: 0, spreadRadius: 0,
) ),
], ],
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(4), top: Radius.circular(4),

29
lib/settlement/settlement_view/pay_method.dart

@ -9,7 +9,6 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../../retrofit/data/min_order_info.dart'; import '../../retrofit/data/min_order_info.dart';
import '../../retrofit/data/settleOrderInfo.dart'; import '../../retrofit/data/settleOrderInfo.dart';
import '../../view_widget/settlement_tips_dialog.dart'; import '../../view_widget/settlement_tips_dialog.dart';
import '../../view_widget/tips_dialog.dart';
class PayMethod extends StatefulWidget { class PayMethod extends StatefulWidget {
final Function(int payChannel) payChannelCheck; final Function(int payChannel) payChannelCheck;
@ -186,6 +185,13 @@ class _PayMethod extends State<PayMethod> {
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
double greenMoney = double.parse(mGreenMoney);
if (greenMoney == null) {
greenMoney = 0;
}
if (widget.settleOrderInfo.orderNum > greenMoney) {
return;
}
setState(() { setState(() {
checkIndex = 3; checkIndex = 3;
// if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){ // if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
@ -210,10 +216,7 @@ class _PayMethod extends State<PayMethod> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
checkView(3), checkView(3),
Expanded( Spacer(flex: 1,),
child: Container(),
flex: 1,
),
Text( Text(
"¥$mGreenMoney", "¥$mGreenMoney",
style: TextStyle( style: TextStyle(
@ -230,18 +233,18 @@ class _PayMethod extends State<PayMethod> {
S.of(context).lvbizhifu, S.of(context).lvbizhifu,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xff353535), color: widget.settleOrderInfo.orderNum > (double.parse(mGreenMoney) ?? 0) ? Color(0x66353535) : Color(0xff353535),
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
], ],
), ),
), ),
if(mGreenMoney!="0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))) if(mGreenMoney != "0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
SizedBox( SizedBox(
height: 10, height: 10,
), ),
if(mRaiseMoney!="0" && (widget.tableId > 0? (widget?.minOrderInfo?.isRaise ?? false) : (widget?.settleOrderInfo?.isRaise ?? false))) if(mRaiseMoney != "0" && (widget.tableId > 0 ? (widget?.minOrderInfo?.isRaise ?? false) : (widget?.settleOrderInfo?.isRaise ?? false)))
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
@ -249,11 +252,11 @@ class _PayMethod extends State<PayMethod> {
checkIndex = 4; checkIndex = 4;
if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){ if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
SmartDialog.show( SmartDialog.show(
widget: SettlementTips( widget: SettlementTips(
() { () {},
}, text: "助农积分不参与任何活动优惠,请重新选择支付方式",
text: "助农积分不参与任何活动优惠,请重新选择支付方式", ),
)); );
return; return;
} }
}); });

185
pubspec.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save