fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app 

# Conflicts:
#	lib/home/home_page.dart
#	lib/settlement/settlement.dart
dart3_last
wurong 2 years ago
parent
1cc6aaf56e 4ce745015f
commit
a83981c51a
10 changed files with 430 additions and 437 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ios/Flutter/AppFrameworkInfo.plist
  2. 2
      ios/Podfile
  3. 4
      ios/Podfile.lock
  4. 12
      ios/Runner.xcodeproj/project.pbxproj
  5. 1
      ios/Runner/Info.plist
  6. 2
      lib/community/community_view/class_list_view.dart
  7. 160
      lib/home/home_page.dart
  8. 404
      lib/settlement/settlement.dart
  9. 2
      lib/settlement/settlement_view/activity_coupon_remarks.dart
  10. 278
      pubspec.lock

2
ios/Flutter/AppFrameworkInfo.plist
Unescape View File

@ -21,6 +21,6 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>9.0</string> <string>11.0</string>
</dict> </dict>
</plist> </plist>

2
ios/Podfile
Unescape View File

@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project # Uncomment this line to define a global platform for your project
platform :ios, '10.0' platform :ios, '11.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency. # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true' ENV['COCOAPODS_DISABLE_STATS'] = 'true'

4
ios/Podfile.lock
Unescape View File

@ -325,7 +325,7 @@ SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777 BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780 BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37 flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37
flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434 flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434
flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
@ -355,6 +355,6 @@ SPEC CHECKSUMS:
webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c PODFILE CHECKSUM: 27a0f08c504497d82c425d2ccb28d9958a6e156a
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -667,7 +667,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.7; MARKETING_VERSION = 3.1.9;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -869,7 +869,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.7; MARKETING_VERSION = 3.1.9;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 7; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -962,7 +962,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.1.7; MARKETING_VERSION = 3.1.9;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

1
ios/Runner/Info.plist
Unescape View File

@ -144,6 +144,7 @@
</dict> </dict>
<key>UIBackgroundModes</key> <key>UIBackgroundModes</key>
<array> <array>
<string>location</string>
<string>remote-notification</string> <string>remote-notification</string>
</array> </array>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>

2
lib/community/community_view/class_list_view.dart
Unescape View File

@ -217,7 +217,7 @@ class _ClassListView extends State<ClassListView> {
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(
fontSize: 13.sp, fontSize: 13.sp,
height: 1.2.h, height: 1.5.h,
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
color: Colors.black, color: Colors.black,
), ),

160
lib/home/home_page.dart
Unescape View File

@ -163,6 +163,8 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
final BaseData brand = final BaseData brand =
await apiService.queryHomeBrand().catchError((onError) { await apiService.queryHomeBrand().catchError((onError) {
SmartDialog.showToast(AppUtils.dioErrorTypeToString(onError.type),
alignment: Alignment.center);
refreshController.refreshFailed(); refreshController.refreshFailed();
}); });
if (brand != null && brand.isSuccess) { if (brand != null && brand.isSuccess) {
@ -287,9 +289,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
queryUserBalance() async { queryUserBalance() async {
BaseData<UserInfo> baseData = BaseData<UserInfo> baseData =
await apiService.queryInfo().catchError((onError) { await apiService.queryInfo().catchError((onError) {});
SmartDialog.showToast(AppUtils.dioErrorTypeToString(onError.type),
alignment: Alignment.center);});
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
userInfo = baseData.data; userInfo = baseData.data;
mRaiseMoney = double.tryParse(userInfo.raiseMoney); mRaiseMoney = double.tryParse(userInfo.raiseMoney);
@ -504,86 +504,85 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
child: SingleChildScrollView( child: SingleChildScrollView(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
child: FutureBuilder( child: FutureBuilder(
future:queryHome(), future: queryHome(),
builder: (context, snapshot) { builder: (context, snapshot) {
return Column( return Column(
children: [ children: [
///banner ///banner
HomeBanner(bannerData, controller), HomeBanner(bannerData, controller),
///吃喝玩 ///吃喝玩
UnionEntry((int jpIndex) { UnionEntry((int jpIndex) {
widget.changeTab(1,jpIndex); widget.changeTab(1,jpIndex);
}), }),
///快捷操作 ///快捷操作
ShortcutOperation((int jpIndex) { ShortcutOperation((int jpIndex) {
widget.changeTab(1,jpIndex); widget.changeTab(1,jpIndex);
}),
///推广图
spread(),
// ///签到
// SignView(isSigned, (value) {
// setState(() {
// isSigned = value;
// });
// }),
///特惠专区
DiscountZone(coupons),
///特惠专区-推荐商品展示
HomeRecommendGoods(homeRank),
///助农专区
if(mRaiseMoney != 0.0)
HappyHelpFarmers(),
///福利中心
WelfareCore(),
///吃喝玩商品热销榜
TopSellingList(homeRank),
// ///店铺推荐
// QuickOrder(),
// ///超级优惠券
// CouponView(),
// ///精选活动
// FeaturedActivity(),
// ///积分商城
// HomeIntegralStore(gooods),
///积分商品头Tab
PointsGoodsTitle(
gooodsCategorys,
(orderType, orderDesc) {
this.orderType = orderType;
this.orderDesc = orderDesc;
setState(() {});
},
(index) {
categoryId = gooodsCategorys[index].id;
pageNum = 1;
setState(() {});
},
),
///积分商品列表
PointGoods(
goods,
(index) {
_toDetails(index);
},
),
],
);
}), }),
///推广图
spread(),
// ///签到
// SignView(isSigned, (value) {
// setState(() {
// isSigned = value;
// });
// }),
///特惠专区
DiscountZone(coupons),
///特惠专区-推荐商品展示
HomeRecommendGoods(homeRank),
///助农专区
if(mRaiseMoney != 0)
HappyHelpFarmers(),
///福利中心
WelfareCore(),
///吃喝玩商品热销榜
TopSellingList(homeRank),
// ///店铺推荐
// QuickOrder(),
// ///超级优惠券
// CouponView(),
// ///精选活动
// FeaturedActivity(),
// ///积分商城
// HomeIntegralStore(gooods),
///积分商品头Tab
PointsGoodsTitle(
gooodsCategorys,
(orderType, orderDesc) {
this.orderType = orderType;
this.orderDesc = orderDesc;
setState(() {});
},
(index) {
categoryId = gooodsCategorys[index].id;
pageNum = 1;
setState(() {});
},
),
///积分商品列表
PointGoods(
goods,
(index) {
_toDetails(index);
},
),
],
);})
), ),
), ),
), ),
@ -603,6 +602,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
child: GestureDetector( child: GestureDetector(
onTap: (){ onTap: (){
Navigator.of(context).pushNamed('/router/invite_friends'); Navigator.of(context).pushNamed('/router/invite_friends');
// Navigator.of(context).pushNamed('/router/mine_greenery');
}, },
child: ClipRRect( child: ClipRRect(
child:Image.asset( child:Image.asset(

404
lib/settlement/settlement.dart
Unescape View File

@ -120,7 +120,8 @@ class _Settlement extends State<Settlement> {
token: minToken, token: minToken,
tenant: tenant, tenant: tenant,
storeId: storeId, storeId: storeId,
showLoading: false); showLoading: false
);
queryMemberInfo(); queryMemberInfo();
if (promotions != null && promotions != "" && tableId <= 0) { if (promotions != null && promotions != "" && tableId <= 0) {
queryOrderInfo( queryOrderInfo(
@ -189,68 +190,68 @@ class _Settlement extends State<Settlement> {
try { try {
EasyLoading.show(status: S.current.zhengzaijiazai); EasyLoading.show(status: S.current.zhengzaijiazai);
BaseData<SettleOrderInfo> baseData = await minService.getOrderInfo({ BaseData<SettleOrderInfo> baseData = await minService.getOrderInfo({
"addressId": addressId, "addressId": addressId,
"isTake": isTake, "isTake": isTake,
"memberCouponId": memberCouponId, "memberCouponId": memberCouponId,
"orderId": orderId, "orderId": orderId,
"promotionId": promotionId, "promotionId": promotionId,
"productSkuId": productSkuId, "productSkuId": productSkuId,
"actProductId": actProductId, "actProductId": actProductId,
"actProductSkuId": actProductSkuId, "actProductSkuId": actProductSkuId,
"useVipPrice": useVipPriceSelect, "useVipPrice":useVipPriceSelect,
"buyNum": buyNum, "buyNum": buyNum,
"payChannel": payChannel, "payChannel":payChannel,
"tableId": tableId "tableId": tableId
}).catchError((error) {}); }).catchError((error) {});
this.promotion = null; this.promotion = null;
promotions = ""; promotions = "";
this.couponListBean = null; this.couponListBean = null;
coupons = ""; coupons = "";
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
settleOrderInfo = baseData.data; settleOrderInfo = baseData.data;
if ((settleOrderInfo?.promotionId ?? "") != "") { if ((settleOrderInfo?.promotionId ?? "") != "") {
settleOrderInfo.promotionInfoList.forEach((element) { settleOrderInfo.promotionInfoList.forEach((element) {
if (element.id == settleOrderInfo.promotionId) { if (element.id == settleOrderInfo.promotionId) {
this.promotion = element; this.promotion = element;
promotions = promotion?.name ?? ""; promotions = promotion?.name ?? "";
} }
}); });
} }
if ((settleOrderInfo?.memberCouponId ?? "") != "") { if ((settleOrderInfo?.memberCouponId ?? "") != "") {
settleOrderInfo.couponList.forEach((element) { settleOrderInfo.couponList.forEach((element) {
if (element.id == settleOrderInfo.memberCouponId) { if (element.id == settleOrderInfo.memberCouponId) {
this.couponListBean = element; this.couponListBean = element;
coupons = couponListBean?.promotionName ?? ""; coupons = couponListBean?.promotionName ?? "";
} }
}); });
} }
if (settleOrderInfo.orderProductList == null || if (settleOrderInfo.orderProductList == null ||
settleOrderInfo.orderProductList.length == 0) { settleOrderInfo.orderProductList.length == 0) {
placeOrder = true; placeOrder = true;
queryOrderDetails( queryOrderDetails(
pageType != null ? widget.arguments["orderId"] : parentId); pageType != null ? widget.arguments["orderId"] : parentId);
} }
if (!isRaiseChannel && settleOrderInfo.isRaise) { if(!isRaiseChannel && settleOrderInfo.isRaise){
isRaiseChannel = true; isRaiseChannel = true;
queryOrderInfo( queryOrderInfo(
address?.id, address?.id,
selectedBtn, selectedBtn,
couponListBean?.id, couponListBean?.id,
0, 0,
promotion?.id ?? productId, promotion?.id ?? productId,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, useVipPriceSelect,
count1, count1,
settleOrderInfo.isRaise ? 7 : payChannel, settleOrderInfo.isRaise ? 7 :payChannel,
tableId); tableId);
}
} else {
SmartDialog.showToast(baseData?.msg ?? "", alignment: Alignment.center);
} }
} finally { } else {
SmartDialog.showToast(baseData?.msg ?? "", alignment: Alignment.center);
}
}finally{
setState(() {}); setState(() {});
EasyLoading.dismiss(); EasyLoading.dismiss();
} }
@ -263,7 +264,7 @@ class _Settlement extends State<Settlement> {
}); });
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
SharedPreferences.getInstance().then( SharedPreferences.getInstance().then(
(value) => { (value) => {
value.setString('minMember', jsonEncode(baseData.data)), value.setString('minMember', jsonEncode(baseData.data)),
}, },
); );
@ -312,76 +313,76 @@ class _Settlement extends State<Settlement> {
} }
queryAddress(int selectedBtn) async { queryAddress(int selectedBtn) async {
setState(() {
this.selectedBtn = selectedBtn;
});
if (address != null) {
queryOrderInfo(
address.id,
selectedBtn,
null,
0,
productId ?? null,
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect,
count1,
payChannel,
tableId);
return;
}
BaseData<List<Address>> baseDate =
await minService.queryAddress().catchError((error) {});
BMFCoordinate bmfCoordinate = BMFCoordinate(
double.tryParse(storeInfo.latitude),
double.tryParse(storeInfo.longitude),
);
if (baseDate != null && baseDate.isSuccess) {
setState(() { setState(() {
address = baseDate.data[0]; this.selectedBtn = selectedBtn;
}); });
for (int i = 1; i < baseDate.data.length; i++) { if (address != null) {
Address address1 = baseDate.data[i]; queryOrderInfo(
address.id,
selectedBtn,
null,
0,
productId ?? null,
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect,
count1,
payChannel,
tableId);
return;
}
BaseData<List<Address>> baseDate =
await minService.queryAddress().catchError((error) {});
BMFCoordinate coordinate = await BMFCalculateUtils.coordConvert( BMFCoordinate bmfCoordinate = BMFCoordinate(
coordinate: BMFCoordinate( double.tryParse(storeInfo.latitude),
double.tryParse(address.longitude), double.tryParse(storeInfo.longitude),
double.tryParse(address.latitude), );
), if (baseDate != null && baseDate.isSuccess) {
fromType: BMF_COORD_TYPE.COMMON, setState(() {
toType: BMF_COORD_TYPE.BD09LL); address = baseDate.data[0];
BMFCoordinate coordinate1 = await BMFCalculateUtils.coordConvert( });
coordinate: BMFCoordinate( for (int i = 1; i < baseDate.data.length; i++) {
double.tryParse(address1.longitude), Address address1 = baseDate.data[i];
double.tryParse(address1.latitude),
), BMFCoordinate coordinate = await BMFCalculateUtils.coordConvert(
fromType: BMF_COORD_TYPE.COMMON, coordinate: BMFCoordinate(
toType: BMF_COORD_TYPE.BD09LL); double.tryParse(address.longitude),
double.tryParse(address.latitude),
),
fromType: BMF_COORD_TYPE.COMMON,
toType: BMF_COORD_TYPE.BD09LL);
BMFCoordinate coordinate1 = await BMFCalculateUtils.coordConvert(
coordinate: BMFCoordinate(
double.tryParse(address1.longitude),
double.tryParse(address1.latitude),
),
fromType: BMF_COORD_TYPE.COMMON,
toType: BMF_COORD_TYPE.BD09LL);
double mi = await BMFCalculateUtils.getLocationDistance( double mi = await BMFCalculateUtils.getLocationDistance(
bmfCoordinate, coordinate); bmfCoordinate, coordinate);
double mi1 = await BMFCalculateUtils.getLocationDistance( double mi1 = await BMFCalculateUtils.getLocationDistance(
bmfCoordinate, coordinate1); bmfCoordinate, coordinate1);
if (mi1 < mi) { if (mi1 < mi) {
address = address1; address = address1;
}
} }
await queryOrderInfo(
address.id,
selectedBtn,
null,
0,
productId ?? null,
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect,
count1,
payChannel,
tableId);
} }
await queryOrderInfo(
address.id,
selectedBtn,
null,
0,
productId ?? null,
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect,
count1,
payChannel,
tableId);
}
} }
///选择收货地址 ///选择收货地址
@ -498,9 +499,7 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.orderTypeId = 0; placeOrderFirst.orderTypeId = 0;
placeOrderFirst.parentCode = parentCode; // 火锅加菜 placeOrderFirst.parentCode = parentCode; // 火锅加菜
placeOrderFirst.parentId = parentId; // 火锅加菜 placeOrderFirst.parentId = parentId; // 火锅加菜
placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00") placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00") ? payChannel = 0 : (settleOrderInfo.isRaise ? 7:payChannel));
? payChannel = 0
: (settleOrderInfo.isRaise ? 7 : payChannel));
placeOrderFirst.promotionInfoDTO = PromotionInfoDTOBean(); placeOrderFirst.promotionInfoDTO = PromotionInfoDTOBean();
placeOrderFirst.promotionInfoDTO.promotionId = placeOrderFirst.promotionInfoDTO.promotionId =
(promotion != null && tableId <= 0) ? promotion.id : ""; (promotion != null && tableId <= 0) ? promotion.id : "";
@ -753,8 +752,8 @@ class _Settlement extends State<Settlement> {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
DistributionMode((addressId, isTake, DistributionMode((addressId, isTake, memberCouponId,
memberCouponId, orderId, promotionId) { orderId, promotionId) {
setState(() { setState(() {
this.selectedBtn = 0; this.selectedBtn = 0;
}); });
@ -785,58 +784,50 @@ class _Settlement extends State<Settlement> {
// ), // ),
///订单商品 ///订单商品
if (settleOrderInfo != null || if(settleOrderInfo != null || minOrderInfo != null)
minOrderInfo != null) SettlementOrderCommodity(
SettlementOrderCommodity( selectedBtn,
selectedBtn, settleOrderInfo,
settleOrderInfo, minOrderInfo,
minOrderInfo, tableId,
tableId, pageType,
pageType, (coupons != "" || promotions!="") ? false :useVipPriceSelect,
(coupons != "" || promotions != "") this.showVipTips
? false ),
: useVipPriceSelect,
this.showVipTips),
///优惠券/备注/会员优惠金额 ///优惠券/备注/会员优惠金额
if (settleOrderInfo != null || if(settleOrderInfo != null || minOrderInfo != null)
minOrderInfo != null) ActivityCouponRemarks(
ActivityCouponRemarks( couponCart,
couponCart, activityCart,
activityCart, settleOrderInfo,
settleOrderInfo, minOrderInfo,
minOrderInfo, coupons,
coupons, promotions,
promotions, couponCount(),
couponCount(), placeOrder,
placeOrder, remakers,
remakers,
() {
Navigator.of(context).pushNamed(
'/router/edit_remarks_page',
arguments: {},
).then((value) => {
setState(() {
if (value != null)
remakers = value;
})
});
},
tableId,
vipPriceSelect,
() { () {
setState(() { Navigator.of(context).pushNamed(
this.showVipTips = true; '/router/edit_remarks_page',
}); arguments: {},
}), ).then((value) => {
setState(() {
if (settleOrderInfo != null && if (value != null) remakers = value;
placeOrder && })
joinA != JoinActivity.BargainBug) });},
tableId,
vipPriceSelect,
(){
setState(() {
this.showVipTips = true;
});
}
),
///支付方式 if (settleOrderInfo != null && placeOrder && joinA != JoinActivity.BargainBug)
PayMethod(payChannelCheck, coupons, promotions, ///支付方式
useVipPriceSelect, settleOrderInfo), PayMethod(payChannelCheck,coupons,promotions,useVipPriceSelect,settleOrderInfo),
], ],
), ),
), ),
@ -906,10 +897,10 @@ class _Settlement extends State<Settlement> {
orderButton = true; orderButton = true;
pageType != null pageType != null
? bargainOrderId != null ? bargainOrderId != null
? activityPay() ? activityPay()
: joinA == JoinActivity.GoJoin : joinA == JoinActivity.GoJoin
? queryJoinAct() ? queryJoinAct()
: queryLaunchAct() : queryLaunchAct()
: queryPlaceOrderFirst(); : queryPlaceOrderFirst();
}, },
), ),
@ -930,23 +921,23 @@ class _Settlement extends State<Settlement> {
payChannelCheck(int payChannel) { payChannelCheck(int payChannel) {
this.payChannel = payChannel; this.payChannel = payChannel;
if (tableId > 0) { if (tableId > 0) {
queryOrderDetails(parentId); queryOrderDetails(parentId);
} else { } else {
queryOrderInfo( queryOrderInfo(
address?.id, address?.id,
selectedBtn, selectedBtn,
couponListBean?.id, couponListBean?.id,
0, 0,
promotion?.id ?? productId, promotion?.id ?? productId,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect, useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);}
}
} }
vipPriceSelect(bool useVipPriceSelect) { vipPriceSelect(bool useVipPriceSelect) {
@ -966,8 +957,7 @@ class _Settlement extends State<Settlement> {
useVipPriceSelect, useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);}
}
} }
mobileChange(String mobile) { mobileChange(String mobile) {
@ -1007,8 +997,10 @@ class _Settlement extends State<Settlement> {
// promotions = ""; // promotions = "";
// this.promotion = null; // this.promotion = null;
if (tableId > 0) { if (tableId > 0) {
if (couponBean == null) queryCancelMemberCoupon(parentId); if(couponBean == null)
if (couponBean.id != null) queryUseMemberCoupon(couponBean.id); queryCancelMemberCoupon(parentId);
if (couponBean.id != null)
queryUseMemberCoupon(couponBean.id);
} else { } else {
queryOrderInfo( queryOrderInfo(
address?.id, address?.id,
@ -1048,7 +1040,7 @@ class _Settlement extends State<Settlement> {
selectedBtn, selectedBtn,
null, null,
0, 0,
(pro.id ?? "") ?? productId, (pro.id??"")??productId,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",

2
lib/settlement/settlement_view/activity_coupon_remarks.dart
Unescape View File

@ -76,7 +76,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
if(!widget?.settleOrderInfo?.isRaise ?? false) if(!(widget?.settleOrderInfo?.isRaise ?? false))
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

278
pubspec.lock
View File

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