xt / Flutter-ReserveApp · Commits

Go to a project

Commit f95f9874e9a7442451a55750374830489f217329

Authored by wdn127929
1 parent e888e7d8
build: skipped

bu gbug

Inline Side-by-side
Showing 5 changed files with 91 additions and 45 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "320"
def flutterVersionCode = "321"
if (flutterVersionCode == null) {
flutterVersionCode = '320'
flutterVersionCode = '321'
}
def flutterVersionName = "3.2.0"
def flutterVersionName = "3.2.1"
if (flutterVersionName == null) {
flutterVersionName = '3.2.0'
flutterVersionName = '3.2.1'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -304,7 +304,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
// ))
// ],
// ),
VEmptyView(40),
// VEmptyView(40),
MyItem(
title: "线上券创建",
content: '',
... ... @@ -318,25 +318,25 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
ScreenUtil().setHeight(1),
color: MyColours.color_f3f3f3,
),
userModel.user.role_name == '管理员' ||
userModel.user.role_name == '店长'
? MyItem(
title: "全店客情",
content: "",
callback: () {
// Utils.goMiniProgramZm(context, "roomtype/roomtype");
NavigatorUtil.goStoreCustomerPage(context);
},
)
: SizedBox(),
MyItem(
title: "我的客情",
content: "",
callback: () {
// Utils.goMiniProgramZm(context, "roomtype/roomtype");
NavigatorUtil.goMyCustomerPage(context);
},
),
// userModel.user.role_name == '管理员' ||
// userModel.user.role_name == '店长'
// ? MyItem(
// title: "全店客情",
// content: "",
// callback: () {
// // Utils.goMiniProgramZm(context, "roomtype/roomtype");
// NavigatorUtil.goStoreCustomerPage(context);
// },
// )
// : SizedBox(),
// MyItem(
// title: "我的客情",
// content: "",
// callback: () {
// // Utils.goMiniProgramZm(context, "roomtype/roomtype");
// NavigatorUtil.goMyCustomerPage(context);
// },
// ),
VEmptyView(40),
MyItem(
... ...
... ... @@ -330,16 +330,49 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
_chooseTableModel.areaTableMapShow = areaTableMap;
_chooseTableModel.tablesShow = _chooseTableModel.tablesAll;
// }
if (widget.tid == '') {
if (areaTableMap.isNotEmpty) {
if (!needRetain) {
// currentArea = areaTableMap.keys.first;
currentArea = '全部';
_chooseTableModel.currentTables = _chooseTableModel.tablesAll;
} else {
if (currentArea != null && currentArea != '') {
// tablesShow = areaTableMapShow[currentArea];
List keys = areaTableMap.keys.toList();
_selectNumber = keys.indexOf(currentArea);
}
}
if (areas.length == 1) {
currentArea = areaTableMap.keys.first;
}
} else {
// if (currentArea != null && currentArea != '') {
// tablesShow = areaTableMap[currentArea];
// _selectNumber = areaTableMap.length;
// }
// pageState = PageState.Empty;
// pageState = PageState.Success;
}
// if (widget.tid == '') {
// if (!needRetain) {
// // currentArea = areaTableMap.keys.first;
// currentArea = '全部';
// _chooseTableModel.currentTables = _chooseTableModel.tablesAll;
// } else {
// if (currentArea != null && currentArea != '') {
// // tablesShow = areaTableMapShow[currentArea];
// List keys = areaTableMap.keys.toList();
// _selectNumber = keys.indexOf(currentArea);
// }
// }
// if (areas.length == 1) {
// currentArea = areaTableMap.keys.first;
// }
// } else {
// // if (currentArea != null && currentArea != '') {
// // tablesShow = areaTableMapShow[currentArea];
// // selectNumber = areaTableMapShow.length;
// // }
// // // pageState = PageState.Empty;
// // pageState = PageState.Success;
// }
_chooseTableModel.pageState = PageState.Success;
_chooseTableModel.notifyListeners();
... ... @@ -398,9 +431,13 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
vertical: ScreenUtil().setWidth(20),
horizontal: ScreenUtil().setWidth(10)),
shrinkWrap: true,
itemCount: currentArea == '全部'
? _chooseTableModel.tablesShow.length
: _chooseTableModel.areaTableMapShow[areas[i].name].length,
itemCount: _chooseTableModel.tablesShow.length == 0 ||
(i != null &&
_chooseTableModel.areaTableMapShow[areas[i].name].length == 0)
? 0
: currentArea == '全部'
? _chooseTableModel.tablesShow.length
: _chooseTableModel.areaTableMapShow[areas[i].name].length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
childAspectRatio: 1,
... ... @@ -409,9 +446,14 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
),
itemBuilder: (BuildContext context, int index) {
List<t.Table> data = currentArea == '全部'
? _chooseTableModel.tablesShow
: _chooseTableModel.areaTableMapShow[areas[i].name];
List<t.Table> data = _chooseTableModel.tablesShow.length == 0 ||
(i != null &&
_chooseTableModel.areaTableMapShow[areas[i].name].length ==
0)
? 0
: currentArea == '全部'
? _chooseTableModel.tablesShow
: _chooseTableModel.areaTableMapShow[areas[i].name];
// if (index == data.length || data.length == 0) {
// return InkWell(
// onTap: () async {
... ...
... ... @@ -143,11 +143,13 @@ class TableManagerPageState extends State<TableManagerPage> {
vertical: ScreenUtil().setWidth(20),
horizontal: ScreenUtil().setWidth(10)),
shrinkWrap: true,
itemCount: tableManagerModel.currentArea == '全部'
? tableManagerModel.tablesShow.length
: tableManagerModel
.areaTableMapShow[tableManagerModel.currentArea].length +
1,
itemCount: tableManagerModel.tableOuterList.length == 0
? 0
: tableManagerModel.currentArea == '全部'
? tableManagerModel.tablesShow.length
: tableManagerModel
.areaTableMapShow[tableManagerModel.currentArea].length +
1,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
childAspectRatio: 0.8,
... ... @@ -156,10 +158,12 @@ class TableManagerPageState extends State<TableManagerPage> {
),
itemBuilder: (BuildContext context, int index) {
List<t.Table> data = tableManagerModel.currentArea == '全部'
? tableManagerModel.tablesShow
: tableManagerModel
.areaTableMapShow[tableManagerModel.areas[i].name];
List<t.Table> data = tableManagerModel.tableOuterList.length == 0
? []
: tableManagerModel.currentArea == '全部'
? tableManagerModel.tablesShow
: tableManagerModel
.areaTableMapShow[tableManagerModel.areas[i].name];
if (index == data.length || data.length == 0) {
return InkWell(
onTap: () async {
... ...
... ... @@ -679,7 +679,7 @@ class TableManagerModel with ChangeNotifier {
if (currentArea != null && currentArea != '') {
// tablesShow = areaTableMapShow[currentArea];
List keys = areaTableMapShow.keys.toList();
selectNumber = keys.indexOf(currentArea) + 1;
selectNumber = keys.indexOf(currentArea);
}
}
} else {
... ...