xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0ee1c90a90d5097136933522eae9a591665c2171

Authored by wdn127929
1 parent 10f7e362
build: skipped

存酒单位修改

Inline Side-by-side
Showing 7 changed files with 87 additions and 36 deletions
... ... @@ -15,17 +15,17 @@ if (flutterRoot == null) {
def flutterVersionCode = "487"
def flutterVersionCode = "488"
if (flutterVersionCode == null) {
flutterVersionCode = '487'
flutterVersionCode = '488'
}
def flutterVersionName = "4.8.7"
def flutterVersionName = "4.8.8"
if (flutterVersionName == null) {
flutterVersionName = '4.8.7'
flutterVersionName = '4.8.8'
}
... ...
... ... @@ -510,7 +510,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 486;
CURRENT_PROJECT_VERSION = 487;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -525,7 +525,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.6;
MARKETING_VERSION = 4.8.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -656,7 +656,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 486;
CURRENT_PROJECT_VERSION = 487;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -671,7 +671,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.6;
MARKETING_VERSION = 4.8.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -692,7 +692,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 486;
CURRENT_PROJECT_VERSION = 487;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -707,7 +707,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.8.6;
MARKETING_VERSION = 4.8.7;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -3,10 +3,10 @@ import 'package:fluwx/fluwx.dart';
class Constant {
static const int status_success = 200; //服务器返回成功
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.RELEASE; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.PREVIEW; //体验版
WXMiniProgramType.RELEASE; //正式版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.PREVIEW; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.TEST; //开发版
... ...
... ... @@ -14,7 +14,18 @@ class WineManageFaModel {
if (json['data'] != null) {
data = [];
json['data'].forEach((v) {
data.add(new WineManageModel.fromJson(v));
WineManageModel temp = WineManageModel.fromJson(v);
int tempNum = 0; //全部剩余量
temp.wineData.forEach((element) {
tempNum += double.parse(
element.wineStock == '' || element.wineStock == null
? '0'
: element.wineStock)
.toInt(); //剩余量
});
if (tempNum > 0) {
data.add(temp); //全部剩余量>0,列表显示
}
});
}
msg = json['msg'];
... ... @@ -88,13 +99,19 @@ class WineManageModel {
wineData = [];
if (json['wine'] is List) {
json['wine'].forEach((v) {
wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
WineManageSunModel temp = WineManageSunModel.fromJson(v);
if (int.parse(temp.wineStock) > 0) {
wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
}
});
} else {
convert.jsonDecode(json['wine']).forEach((v) {
wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
WineManageSunModel temp = WineManageSunModel.fromJson(v);
if (int.parse(temp.wineStock) > 0) {
wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
}
});
}
}
... ... @@ -116,13 +133,19 @@ class WineManageModel {
wineData = [];
if (json['wine'] is List) {
json['wine'].forEach((v) {
// wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(v);
// wineDataMove.add(v);
if (int.parse(v.wineStock) > 0) {
wineDataMove.add(v);
}
});
} else {
convert.jsonDecode(json['wine']).forEach((v) {
// wineData.add(new WineManageSunModel.fromJson(v));
wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
WineManageSunMoveModel temp = WineManageSunMoveModel.fromJson(v);
if (int.parse(temp.wineStock) > 0) {
wineDataMove.add(temp);
}
// wineDataMove.add(new WineManageSunMoveModel.fromJson(v));
});
}
}
... ... @@ -177,10 +200,21 @@ class WineManageSunModel {
WineManageSunModel.fromJson(Map<String, dynamic> json) {
wineName = json['wine_name'];
wineAmount = json['wine_amount'];
wineAmount = double.parse(
json['wine_amount'] == '' || json['wine_amount'] == null
? '0'
: json['wine_amount'])
.toInt()
.toString();
unit = json['unit'];
wineNumber = json['wine_number'] ?? "";
wineStock = json['wine_stock'] ?? "";
// wineStock = json['wine_stock'] ?? "";
wineStock = double.parse(
json['wine_stock'] == '' || json['wine_stock'] == null
? '0'
: json['wine_stock'])
.toInt()
.toString();
cdate = json['cdate'] ?? "";
img = <UploadImgModel>[];
... ... @@ -249,12 +283,29 @@ class WineManageSunMoveModel {
WineManageSunMoveModel.fromJson(Map<String, dynamic> json) {
wineName = json['wine_name'];
wineAmount = json['wine_amount'];
wineAmount = double.parse(
json['wine_amount'] == '' || json['wine_amount'] == null
? '0'
: json['wine_amount'])
.toInt()
.toString();
// wineNumC.text = wineAmount ?? '';
unit = json['unit'];
wineNumber = json['wine_number'] ?? "";
checkAmount = json['check_amount'] ?? '';
wineStock = json['wine_stock'] ?? "";
// checkAmount = json['check_amount'] ?? '';
checkAmount = double.parse(
json['check_amount'] == '' || json['check_amount'] == null
? '0'
: json['check_amount'])
.toInt()
.toString();
// wineStock = json['wine_stock'] ?? "";
wineStock = double.parse(
json['wine_stock'] == '' || json['wine_stock'] == null
? '0'
: json['wine_stock'])
.toInt()
.toString();
cdate = json['cdate'] ?? "";
// wineNumC.text = wineNumber;
... ...
... ... @@ -116,13 +116,13 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
onChanged: (value) {
// print(value);
if (value != null && value.trim().length > 0) {
// bool isNumber =
// Utils.isInteger(value); //判断输入的内容是否是数字
// if (!isNumber) {
// Utils.showToast('请输入数字');
// controller.text = '';
// return;
// }
bool isNumber =
Utils.isInteger(value); //判断输入的内容是否是数字
if (!isNumber) {
Utils.showToast('请输入整数');
controller.text = '';
return;
}
if (double.parse(value) >
double.parse(
widget.wineManageSunModel.wineAmount)) {
... ...
... ... @@ -109,7 +109,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
if (element.checkAmount != null &&
element.checkAmount != '' &&
double.parse(element.checkAmount) > 0) {
int.parse(element.checkAmount) > 0) {
//有输入数量
WineCheckModel sunMoveModel = WineCheckModel();
sunMoveModel.wineName = element.wineName;
... ...
... ... @@ -1659,7 +1659,7 @@ class Utils {
path: _path,
description: _description,
// miniProgramType: , //体验版
miniProgramType:Constant.wxMiniProgramType, //正式版
miniProgramType: Constant.wxMiniProgramType, //正式版
// miniProgramType: //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
... ...