Browse Source

订单结算优惠券增加,不可使用券,不可使用说明

new_revision_app
wurong 2 years ago
parent
commit
dea8f1993a
  1. 2
      lib/retrofit/min_api.dart
  2. 2
      lib/retrofit/retrofit_api.dart
  3. 2
      lib/settlement/settlement_view/coupon.dart
  4. 10
      lib/store/store_order.dart

2
lib/retrofit/min_api.dart

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8765/app/";///
const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线

2
lib/retrofit/retrofit_api.dart

@ -64,7 +64,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8766/app/";///
const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线

2
lib/settlement/settlement_view/coupon.dart

@ -262,7 +262,7 @@ class _CouponWidget extends State<CouponWidget> {
),
],
),
if ((widget.couponList?.isEx ?? false) && ((widget.couponList?.usable??"") == ""))
if ((widget.couponList?.isEx ?? false) && (widget.couponList.usableReason != null))
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [

10
lib/store/store_order.dart

@ -515,12 +515,12 @@ class _StoreOrderPage extends State<StoreOrderPage>
Spacer(),
GestureDetector(
onTap: () {
if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now()))
&&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){
// if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now()))
// &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){
toDownOrder();
}
else
SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center);
// }
// else
// SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center);
},
child: RoundButton(
width: 103.w,

Loading…
Cancel
Save