diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index 58475538..a303e5f4 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/lib/pages/goods_deto_page/goods_deto_page.dart @@ -34,13 +34,10 @@ class _GoodsDetoPageState extends State { bool _canSkew(int? state) { switch (state) { case 1: + + return false; case 2: case 3: - return false; - case 4: - case 5: - case 6: - case 7: return true; default: return true; diff --git a/lib/pages/goods_deto_page/widget/goods_info_card.dart b/lib/pages/goods_deto_page/widget/goods_info_card.dart index 4b9ee484..77b68540 100644 --- a/lib/pages/goods_deto_page/widget/goods_info_card.dart +++ b/lib/pages/goods_deto_page/widget/goods_info_card.dart @@ -37,13 +37,10 @@ class GoodsInfoCard extends StatelessWidget { Color _getColor(int? state) { switch (state) { case 1: - case 2: - case 3: + return kDarkPrimaryColor; - case 4: - case 5: - case 6: - case 7: + case 2: + return ktextSubColor; default: return kDangerColor; @@ -98,7 +95,7 @@ class GoodsInfoCard extends StatelessWidget { fontSize: 32.sp, color: Color(0xff333333)), ), - Text(BeeMap.fixState[model!.status!]!, + Text(BeeMap.goodsOutStatus[model!.status!]!, style: TextStyle( fontWeight: FontWeight.w600, fontSize: 28.sp, diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart index 43884435..8ad0245e 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart +++ b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart @@ -54,13 +54,13 @@ class _BorrowGoodsDetailPageState extends State { body: EasyRefresh( firstRefresh: true, header: MaterialHeader(), - // onRefresh: () async { - // List models = await (getModels()); - // _models = - // models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList(); - // _onload = false; - // setState(() {}); - // }, + onRefresh: () async { + List models = await (getModels()); + _models = + models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList(); + _onload = false; + setState(() {}); + }, child: _onload ? _empty() : ListView( diff --git a/lib/ui/manager/advice/advice_detail_page.dart b/lib/ui/manager/advice/advice_detail_page.dart index e8bf7200..d4d6adfc 100644 --- a/lib/ui/manager/advice/advice_detail_page.dart +++ b/lib/ui/manager/advice/advice_detail_page.dart @@ -131,20 +131,24 @@ class _AdviceDetailPageState extends State { _model.appAdviceDetailVo!.appAdviceVo!.date, format: 'yyyy年MM月dd日 HH:mm', ).text.size(24.sp).color(Color(0xFF999999)).make(), - Divider( - height: 50.w, - thickness: 1.w, - color: Color(0xFFD8D8D8), - ), - BeeGridImageView( - urls: widget.model!.imgUrls!.map((e) => e.url).toList(), - padding: EdgeInsets.only(right: 100.w), - ), - Divider( - height: 50.w, - thickness: 1.w, - color: Color(0xFFD8D8D8), - ), + ...widget.model!.imgUrls!.isEmpty + ? [] + : [ + Divider( + height: 50.w, + thickness: 1.w, + color: Color(0xFFD8D8D8), + ), + BeeGridImageView( + urls: widget.model!.imgUrls!.map((e) => e.url).toList(), + padding: EdgeInsets.only(right: 100.w), + ), + Divider( + height: 50.w, + thickness: 1.w, + color: Color(0xFFD8D8D8), + ) + ], ..._model.appAdviceDetailVo!.appAdviceContentVos! .map((e) => _buildAdviceContent(e)) .toList(), diff --git a/lib/utils/bee_map.dart b/lib/utils/bee_map.dart index 386dabe8..af4d1bb1 100644 --- a/lib/utils/bee_map.dart +++ b/lib/utils/bee_map.dart @@ -37,6 +37,11 @@ class BeeMap { 1: '自己搬运', 2: '搬家公司', }; + static Map goodsOutStatus = { + 1:'审核中', + 2:'审核通过', + 3:'审核失败' + }; static Map borrowStatus = {1: '出借中', 2: '已归还'};