Browse Source

部分更改;

dart3_last
wurong 2 years ago
parent
commit
c94ea72f2d
  1. 2
      lib/home/guide_page.dart
  2. 10
      lib/retrofit/data/vip_card_home.dart
  3. 6
      lib/settlement/settlement.dart
  4. 13
      lib/vip/vip_view/vip_goods_discount.dart
  5. 2
      pubspec.yaml

2
lib/home/guide_page.dart

@ -24,7 +24,7 @@ class _GuidePage extends State<GuidePage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
if(Platform.isAndroid&&!ExamineInstance.instance.isExamine) if(Platform.isAndroid)
isLogin(); isLogin();
} }

10
lib/retrofit/data/vip_card_home.dart

@ -153,7 +153,8 @@ class ProductVips {
String info, String info,
num buyCount, num buyCount,
num sellCountLimit, num sellCountLimit,
String vipDiscount,}){ String vipDiscount,
String tenantCode}){
_id = id; _id = id;
_createTime = createTime; _createTime = createTime;
_createUser = createUser; _createUser = createUser;
@ -193,6 +194,7 @@ class ProductVips {
_buyCount = buyCount; _buyCount = buyCount;
_sellCountLimit = sellCountLimit; _sellCountLimit = sellCountLimit;
_vipDiscount = vipDiscount; _vipDiscount = vipDiscount;
_tenantCode = tenantCode;
} }
ProductVips.fromJson(dynamic json) { ProductVips.fromJson(dynamic json) {
@ -235,6 +237,7 @@ class ProductVips {
_buyCount = json['buyCount']; _buyCount = json['buyCount'];
_sellCountLimit = json['sellCountLimit']; _sellCountLimit = json['sellCountLimit'];
_vipDiscount = json['vipDiscount']; _vipDiscount = json['vipDiscount'];
_tenantCode =json['tenantCode'];
} }
String _id; String _id;
String _createTime; String _createTime;
@ -275,6 +278,7 @@ class ProductVips {
num _buyCount; num _buyCount;
num _sellCountLimit; num _sellCountLimit;
String _vipDiscount; String _vipDiscount;
String _tenantCode;
ProductVips copyWith({ String id, ProductVips copyWith({ String id,
String createTime, String createTime,
String createUser, String createUser,
@ -314,6 +318,7 @@ ProductVips copyWith({ String id,
num buyCount, num buyCount,
num sellCountLimit, num sellCountLimit,
String vipDiscount, String vipDiscount,
String tenantCode,
}) => ProductVips( id: id ?? _id, }) => ProductVips( id: id ?? _id,
createTime: createTime ?? _createTime, createTime: createTime ?? _createTime,
createUser: createUser ?? _createUser, createUser: createUser ?? _createUser,
@ -353,6 +358,7 @@ ProductVips copyWith({ String id,
buyCount: buyCount ?? _buyCount, buyCount: buyCount ?? _buyCount,
sellCountLimit: sellCountLimit ?? _sellCountLimit, sellCountLimit: sellCountLimit ?? _sellCountLimit,
vipDiscount: vipDiscount ?? _vipDiscount, vipDiscount: vipDiscount ?? _vipDiscount,
tenantCode:tenantCode ?? _tenantCode,
); );
String get id => _id; String get id => _id;
String get createTime => _createTime; String get createTime => _createTime;
@ -393,6 +399,7 @@ ProductVips copyWith({ String id,
num get buyCount => _buyCount; num get buyCount => _buyCount;
num get sellCountLimit => _sellCountLimit; num get sellCountLimit => _sellCountLimit;
String get vipDiscount => _vipDiscount; String get vipDiscount => _vipDiscount;
String get tenantCode => _tenantCode;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
@ -435,6 +442,7 @@ ProductVips copyWith({ String id,
map['buyCount'] = _buyCount; map['buyCount'] = _buyCount;
map['sellCountLimit'] = _sellCountLimit; map['sellCountLimit'] = _sellCountLimit;
map['vipDiscount'] = _vipDiscount; map['vipDiscount'] = _vipDiscount;
map['tenantCode'] = _tenantCode;
return map; return map;
} }

6
lib/settlement/settlement.dart

@ -751,7 +751,7 @@ class _Settlement extends State<Settlement> {
minOrderInfo, minOrderInfo,
tableId, tableId,
pageType, pageType,
(coupons != "" || promotions!="") ? (useVipPriceSelect == false) :(useVipPriceSelect == true) (coupons != "" || promotions!="") ? false :useVipPriceSelect
), ),
///// /////
@ -962,7 +962,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
false, useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -995,7 +995,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
false, useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);

13
lib/vip/vip_view/vip_goods_discount.dart

@ -129,11 +129,14 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
itemBuilder: (context, position) { itemBuilder: (context, position) {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
Navigator.of(context) Navigator.of(context).pushNamed(
.pushNamed('/router/shop_details_page', arguments: { '/router/store_order',
"id": widget?.vipCardHome?.productVips[position].id, arguments: {
"storeId": widget?.vipCardHome?.productVips[position].storeId, "id":widget?.vipCardHome?.productVips[position].storeId,
}); "tenant": widget?.vipCardHome?.productVips[position].tenantCode,
"storeName": widget?.vipCardHome?.productVips[position].supplierName
},
);
}, },
child: vipGoodsRecommendItem(widget.vipCardHome.productVips[position]), child: vipGoodsRecommendItem(widget.vipCardHome.productVips[position]),
); );

2
pubspec.yaml

@ -3,7 +3,7 @@ description: 一心回乡.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 3.1.5+32 version: 3.1.5+33
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save