xt / Flutter-ReserveApp · Commits

Go to a project

Commit e02dda75c92ab53db8c088ef6a253611de9583ae

Authored by wdn127929
1 parent 0cc22316
build: skipped

多时段每周一直可启用或者关闭

Inline Side-by-side
Showing 5 changed files with 23 additions and 9 deletions
@@ -10,10 +10,10 @@ class Constant { @@ -10,10 +10,10 @@ class Constant {
10 * 10 *
11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！ 11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
12 * */ 12 * */
13 - static const WXMiniProgramType wxMiniProgramType =  
14 - WXMiniProgramType.release; //正式版  
15 // static const WXMiniProgramType wxMiniProgramType = 13 // static const WXMiniProgramType wxMiniProgramType =
16 - // WXMiniProgramType.preview; //体验版 14 + // WXMiniProgramType.release; //正式版
  15 + static const WXMiniProgramType wxMiniProgramType =
  16 + WXMiniProgramType.preview; //体验版
17 // static const WXMiniProgramType wxMiniProgramType = 17 // static const WXMiniProgramType wxMiniProgramType =
18 // WXMiniProgramType.test; //开发版 18 // WXMiniProgramType.test; //开发版
19 19
@@ -256,7 +256,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { @@ -256,7 +256,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
256 color: '${currTimeIndex}' == element.ddateSolt 256 color: '${currTimeIndex}' == element.ddateSolt
257 ? MyColours.color_F8F9FD 257 ? MyColours.color_F8F9FD
258 : MyColours.color_438E93, 258 : MyColours.color_438E93,
259 - fontSize: font(12)), 259 + fontSize: font(11)),
260 ) 260 )
261 ], 261 ],
262 )), 262 )),
@@ -127,6 +127,13 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> { @@ -127,6 +127,13 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> {
127 itemBuilder: (context, index) { 127 itemBuilder: (context, index) {
128 MealListSunModel sunModel = 128 MealListSunModel sunModel =
129 storeBaseInfoP.mealListData![index]; 129 storeBaseInfoP.mealListData![index];
  130 + bool select = false;
  131 + if (sunModel.type == '1') {
  132 + select =
  133 + sunModel.status == '1' && '${sunModel.isFlag}' != '1';
  134 + } else if (sunModel.type == '2') {
  135 + select = sunModel.status == '1';
  136 + }
130 String dateSel = sunModel.type == '1' 137 String dateSel = sunModel.type == '1'
131 ? sunModel.dateSel!.split(',').map((e) { 138 ? sunModel.dateSel!.split(',').map((e) {
132 String str = e.replaceAll(' ', ''); 139 String str = e.replaceAll(' ', '');
@@ -142,7 +149,9 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> { @@ -142,7 +149,9 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> {
142 149
143 return InkWell( 150 return InkWell(
144 onTap: () { 151 onTap: () {
145 - if ('${sunModel.isFlag}' != '1') { 152 + if (('${sunModel.isFlag}' != '1' &&
  153 + sunModel.type == '1') ||
  154 + sunModel.type == '2') {
146 NavigatorUtil.goBookTimeSettingEditPage(context, 155 NavigatorUtil.goBookTimeSettingEditPage(context,
147 sunModel: sunModel); 156 sunModel: sunModel);
148 } 157 }
@@ -167,8 +176,7 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> { @@ -167,8 +176,7 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> {
167 EdgeInsets.symmetric(horizontal: w(12)), 176 EdgeInsets.symmetric(horizontal: w(12)),
168 height: w(33), 177 height: w(33),
169 decoration: BoxDecoration( 178 decoration: BoxDecoration(
170 - color: sunModel.status == '1' &&  
171 - '${sunModel.isFlag}' != '1' 179 + color: select
172 ? MyColours.color_438E93 180 ? MyColours.color_438E93
173 : MyColours.color_999999, 181 : MyColours.color_999999,
174 borderRadius: BorderRadius.only( 182 borderRadius: BorderRadius.only(
@@ -185,7 +193,9 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> { @@ -185,7 +193,9 @@ class _BookTimeSettingListPageState extends State<BookTimeSettingListPage> {
185 fontSize: font(18), 193 fontSize: font(18),
186 color: MyColours.color_ffffff), 194 color: MyColours.color_ffffff),
187 ), 195 ),
188 - if ('${sunModel.isFlag}' != '1') 196 + if (('${sunModel.isFlag}' != '1' &&
  197 + sunModel.type == '1') ||
  198 + sunModel.type == '2')
189 RoundButton( 199 RoundButton(
190 width: w(32), 200 width: w(32),
191 height: w(19), 201 height: w(19),
@@ -3940,12 +3940,13 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3940,12 +3940,13 @@ class TableManagerPageState extends State<TableManagerPage> {
3940 ), 3940 ),
3941 // VEmptyView(10), 3941 // VEmptyView(10),
3942 Text( 3942 Text(
  3943 + // '00:00-00:00',
3943 element.mdate ?? '', 3944 element.mdate ?? '',
3944 style: TextStyle( 3945 style: TextStyle(
3945 color: '${currTimeIndex}' == element.ddateSolt 3946 color: '${currTimeIndex}' == element.ddateSolt
3946 ? MyColours.color_F8F9FD 3947 ? MyColours.color_F8F9FD
3947 : MyColours.color_438E93, 3948 : MyColours.color_438E93,
3948 - fontSize: font(12)), 3949 + fontSize: font(11)),
3949 ) 3950 )
3950 ], 3951 ],
3951 )), 3952 )),
@@ -184,6 +184,9 @@ class StoreBaseIndoProvider with ChangeNotifier { @@ -184,6 +184,9 @@ class StoreBaseIndoProvider with ChangeNotifier {
184 } else { 184 } else {
185 pageState = PageState.Empty; 185 pageState = PageState.Empty;
186 } 186 }
  187 + // mealListData?.removeWhere(
  188 + // (element) => element.dateSel == "20241111",
  189 + // );
187 190
188 notifyListeners(); 191 notifyListeners();
189 } else { 192 } else {