From fd029f722c5140b7b1059c3d4d18c8d02157236d Mon Sep 17 00:00:00 2001 From: laiiihz Date: Sat, 12 Sep 2020 21:31:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=EF=BC=8C=E9=80=89=E6=8B=A9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E5=BC=B9=E6=A1=86=E4=B8=AD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BD=A3=E9=87=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/classify/sku_choose_page.dart | 51 +++++++++++-------- .../home/widget/modify_detail_bottom_bar.dart | 1 - 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/lib/pages/home/classify/sku_choose_page.dart b/lib/pages/home/classify/sku_choose_page.dart index f5e70c4..5dbf4e8 100644 --- a/lib/pages/home/classify/sku_choose_page.dart +++ b/lib/pages/home/classify/sku_choose_page.dart @@ -11,9 +11,11 @@ import 'package:flutter/material.dart'; import 'package:recook/base/base_store_state.dart'; import 'package:recook/constants/api.dart'; +import 'package:recook/manager/user_manager.dart'; import 'package:recook/models/goods_detail_model.dart'; import 'package:recook/pages/home/widget/plus_minus_view.dart'; import 'package:recook/constants/header.dart'; +import 'package:recook/utils/user_level_tool.dart'; import 'package:recook/widgets/custom_cache_image.dart'; import 'package:recook/widgets/custom_image_button.dart'; import 'package:recook/widgets/selected_list.dart'; @@ -161,27 +163,34 @@ class _SkuChoosePageState extends BaseStoreState { mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ - RichText( - text: TextSpan(children: [ - TextSpan( - text: - "¥${_sku != null ? _sku.discountPrice.toStringAsFixed(2) : _price}${_sku != null && _sku.commission != null ? "/" : ""}", - // "¥ ${_sku.discountPrice}", - style: AppTextStyle.generate( - ScreenAdapterUtils.setSp(18), - fontWeight: FontWeight.w500, - color: Colors.black), - ), - TextSpan( - text: _sku != null && _sku.commission != null - ? " 赚${_sku.commission.toStringAsFixed(2)}" - : "", - // "¥ ${_sku.discountPrice}", - style: AppTextStyle.generate( - ScreenAdapterUtils.setSp(12), - color: Color(0xffC92219)), - ), - ]), + Builder( + builder: (context) { + final skuNotNull = + _sku != null && _sku.commission != null; + final haveLogin = UserManager.instance.haveLogin; + return RichText( + text: TextSpan(children: [ + TextSpan( + text: + "¥${_sku != null ? _sku.discountPrice.toStringAsFixed(2) : _price}${skuNotNull && haveLogin ? "/" : ""}", + // "¥ ${_sku.discountPrice}", + style: AppTextStyle.generate( + ScreenAdapterUtils.setSp(18), + fontWeight: FontWeight.w500, + color: Colors.black), + ), + TextSpan( + text: skuNotNull && haveLogin + ? " 赚${_sku.commission.toStringAsFixed(2)}" + : "", + // "¥ ${_sku.discountPrice}", + style: AppTextStyle.generate( + ScreenAdapterUtils.setSp(12), + color: Color(0xffC92219)), + ), + ]), + ); + }, ), Text( "库存 ${_sku != null ? _sku.inventory : widget.model.data.inventory}件", diff --git a/lib/pages/home/widget/modify_detail_bottom_bar.dart b/lib/pages/home/widget/modify_detail_bottom_bar.dart index 7a3cf85..15faa37 100644 --- a/lib/pages/home/widget/modify_detail_bottom_bar.dart +++ b/lib/pages/home/widget/modify_detail_bottom_bar.dart @@ -11,7 +11,6 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:recook/constants/header.dart'; -import 'package:recook/manager/user_manager.dart'; import 'package:recook/models/goods_detail_model.dart'; import 'package:recook/utils/user_level_tool.dart'; import 'package:recook/widgets/custom_image_button.dart';