Browse Source

优惠券更改

remove_uniapp
w-R 3 years ago
parent
commit
140371a524
  1. 2
      lib/retrofit/min_api.dart
  2. 2
      lib/retrofit/retrofit_api.dart
  3. 10
      lib/settlement/settlement.dart
  4. 2
      lib/settlement/settlement_view/coupon.dart

2
lib/retrofit/min_api.dart

@ -32,7 +32,7 @@ part 'min_api.g.dart';
// const base_url = "http://192.168.10.37:8766/app/"; // const base_url = "http://192.168.10.37:8766/app/";
const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";/// const localBaseUrl = "http://192.168.10.78:8765/app/";///
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线

2
lib/retrofit/retrofit_api.dart

@ -68,7 +68,7 @@ part 'retrofit_api.g.dart';
// const base_url = "http://192.168.10.132:8766/app/";/// // const base_url = "http://192.168.10.132:8766/app/";///
const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";/// const localBaseUrl = "http://192.168.10.78:8766/app/";///
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线
@RestApi(baseUrl: localBaseUrl) @RestApi(baseUrl: localBaseUrl)

10
lib/settlement/settlement.dart

@ -588,18 +588,18 @@ class _Settlement extends State<Settlement> {
couponBean: couponListBean); couponBean: couponListBean);
}, },
); );
if (couponBean != null) { // if (couponBean != null) {
this.couponListBean = couponBean; this.couponListBean = couponBean;
coupons = couponListBean.promotionName; coupons = couponListBean?.promotionName ?? "";
promotions = ""; promotions = "";
queryOrderInfo( queryOrderInfo(
address != null ? address.id : null, address?.id,
selectedBtn, selectedBtn,
couponListBean != null ? couponListBean.id : null, couponListBean?.id,
0, 0,
null, null,
); );
} // }
} }
/// ///

2
lib/settlement/settlement_view/coupon.dart

@ -167,7 +167,7 @@ class _CouponWidget extends State<CouponWidget> {
margin: EdgeInsets.only(right: 23.w), margin: EdgeInsets.only(right: 23.w),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
Navigator.of(context).pop(widget.couponList); Navigator.of(context).pop(widget.selected ? null : widget.couponList);
}, },
child: Image.asset( child: Image.asset(
widget.selected widget.selected

Loading…
Cancel
Save