Browse Source

活动自动选择更改;

门店地址,新增判断,如果没有地址经纬度则不跳转
dev
wurong 1 year ago
parent
commit
3d31eefb2e
  1. 6
      lib/settlement/settlement.dart
  2. 20
      lib/store/store_view/store_info.dart

6
lib/settlement/settlement.dart

@ -140,7 +140,7 @@ class _Settlement extends State<Settlement> {
storeId: storeId,
showLoading: false);
queryMemberInfo();
if (promotions != null && promotions != "" && tableId <= 0) {
if (widget.arguments["pid"] != null && widget.arguments["pid"] != "" && tableId <= 0) {
queryOrderInfo(
address != null ? address.id : null,
((storeInfo?.pickupType?.dineInTakeStatus ?? false) == true &&
@ -155,7 +155,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
"ACTIVITY",
"AUTO",
// useVipPriceSelect,
// useBenefitSelect,
count1,
@ -1383,7 +1383,7 @@ class _Settlement extends State<Settlement> {
0,
(settleOrderInfo.isRaise || payChannel == 5)
? ""
: promotion?.id ?? productId,
: widget.arguments["pid"] ?? (promotion?.id ?? productId),
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",

20
lib/store/store_view/store_info.dart

@ -190,14 +190,18 @@ class _StoreInfoView extends State<StoreInfoView> {
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navigator.of(context).pushNamed(
'/router/location_map',
arguments: {
"lat": widget.storeInfo.latitude,
"lng": widget.storeInfo.longitude,
"storeName": widget.storeInfo.storeName,
},
);
if(widget.storeInfo.longitude != null && widget.storeInfo.latitude != null){
Navigator.of(context).pushNamed(
'/router/location_map',
arguments: {
"lat": widget.storeInfo.latitude,
"lng": widget.storeInfo.longitude,
"storeName": widget.storeInfo.storeName,
},
);
}else{
return;
}
},
child: Text(
"${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo.address : ""}",

Loading…
Cancel
Save