修复若干问题

master
zhang 5 years ago
parent 063d67086d
commit b8732a39de

@ -47,7 +47,7 @@ void main() async {
// useEncrypt: true
);
//
bool isDebug = true;
bool isDebug = false;
AppConfig.setDebug(isDebug);
bool inTest = Test.test();

@ -328,7 +328,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
color: Colors.white,
child: _discountContent(context),
),
widget.goodsDetail.data.isImport == 1
widget.goodsDetail.data.storehouse != 1
? Container(
margin: EdgeInsets.only(bottom: 13),
padding: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
@ -511,7 +511,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
widget.goodsDetail.data.storehouse == 2
widget.goodsDetail.data.storehouse == 2 | 3
? Text(
"跨境商品不支持开发票",
style: AppTextStyle.generate(
@ -519,6 +519,9 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
color: Color(0xff373737)),
)
: SizedBox(),
widget.goodsDetail.data.storehouse == 2 | 3
? rHBox(rSize(4))
: SizedBox(),
Text(
"不支持7天无理由退换货",
style: AppTextStyle.generate(
@ -793,7 +796,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
),
rHBox(5),
Text(
'品保障',
'品保障',
style: TextStyle(
color: Color(0xFFCCCCCC),
fontSize: rSP(12),

@ -597,7 +597,7 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
bool isOversea = false;
for (var item in _orderModel.data.brands) {
for (var childItem in item.goods) {
if (childItem.isImport == 1) isOversea = true;
if (childItem.storehouse == 1) isOversea = true;
}
}

@ -1414,7 +1414,7 @@ class _HomePageState extends BaseStoreState<HomePage>
}
_getNoticeList() async {
// // await NoticeListTool.diamondRecommendation(context, title: "您成功推荐了X位大咖,恭喜获得X张升级卡和保级");
// // await NoticeListTool.diamondRecommendation(context, title: "您成功推荐了X位大咖,恭喜获得X张晋升卡和保障");
// // await NoticeListTool.vipAlert(context);
// await NoticeListTool.perfectInformation(context, getStore());
// // await NoticeListTool.inputExpressInformation(context);

@ -27,13 +27,13 @@ class _LotteryPageState extends State<LotteryPage> {
cardFaceBack: Image.asset('assets/lottery/fail.png'),
cardFaceFront: cardFace,
),
//
//
BingoCardModel(
isBingo: 1 == widget.cardIndex,
cardFaceBack: Image.asset('assets/lottery/keep_level.png'),
cardFaceFront: cardFace,
),
//
//
BingoCardModel(
isBingo: 2 == widget.cardIndex,
cardFaceBack: Image.asset('assets/lottery/upgrade.png'),

@ -184,7 +184,7 @@ class _LiveBlurPageState extends State<LiveBlurPage> {
value: _saveVideo,
onChanged: widget.exitModel.duration<60?
(state){
Toast.showError('直播时长过短,禁止录制');
Toast.showError('直播时长过短,禁止录制',align: Alignment.center);
}
:(state) {
setState(() {

@ -86,7 +86,7 @@ class _UpgradeCardSendUserListPageState
TextSpan(
style: TextStyle(color: Colors.black, fontSize: 15,),
children: [
TextSpan(text:isUpCard?'将赠送一张卡给\n':'将赠送一张保卡给\n',),
TextSpan(text:isUpCard?'将赠送一张升卡给\n':'将赠送一张保卡给\n',),
TextSpan(text: inviteMode.nickname, style: TextStyle(color: Colors.red)),
]
),

@ -84,7 +84,7 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
codeId: model.codeId);
},
)
: _noDataWidget("暂无卡可赠送,快去邀请吧~"),
: _noDataWidget("暂无升卡可赠送,快去邀请吧~"),
),
)
],
@ -164,7 +164,7 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Text(
isUpgrade ? "升级卡" : "保级",
isUpgrade ? "晋升卡" : "保障",
style: TextStyle(
color: textColor,
fontSize: 18,
@ -191,8 +191,8 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
//
if (UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip) {
Alert.show(context, NormalTextDialog(
title: isUpgrade ? "升级卡" : "保级",
content: isUpgrade ? "会员角色无法使用" : "会员角色无法使用保",
title: isUpgrade ? "晋升卡" : "保障",
content: isUpgrade ? "会员角色无法使用升卡" : "会员角色无法使用保",
items: ["确认"],
listener: (index){
Alert.dismiss(context);
@ -200,11 +200,11 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
));
return;
}
//
//
if (UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Master && !isUpgrade) {
Alert.show(context, NormalTextDialog(
title:"",
content: "店主无须使用保",
title:"",
content: "店主无须使用保",
items: ["确认"],
listener: (index){
Alert.dismiss(context);
@ -212,11 +212,11 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
));
return;
}
//
//
if (UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Gold && isUpgrade) {
Alert.show(context, NormalTextDialog(
title:"",
content: "黄金店铺无法使用",
title:"升卡",
content: "黄金店铺无法使用升卡",
items: ["确认"],
listener: (index){
Alert.dismiss(context);
@ -234,7 +234,7 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
isUpgrade?TextSpan(
style: TextStyle(color: Colors.black, fontSize: 15,),
children: [
TextSpan(text:'使用卡您将由\n',),
TextSpan(text:'使用升卡您将由\n',),
TextSpan(text: "${UserLevelTool.roleLevelWithEnum(roleLevel)}", style: TextStyle(color: Colors.red)),
TextSpan(text:'升至',),
TextSpan(text: "${UserLevelTool.roleLevelWithEnum(nextRoleLevel)}", style: TextStyle(color: Colors.red)),
@ -243,7 +243,7 @@ class _UpgradeCardTabWidgetState extends BaseStoreState<UpgradeCardTabWidget> {
: TextSpan(
style: TextStyle(color: Colors.black, fontSize: 15,),
children: [
TextSpan(text:'使用保卡您的',),
TextSpan(text:'使用保卡您的',),
TextSpan(text: "${UserLevelTool.roleLevelWithEnum(roleLevel)}\n", style: TextStyle(color: Colors.red)),
TextSpan(text:'考核期将会延至',),
TextSpan(text: _upgradeCardModel.data.nextAssessTime, style: TextStyle(color: Colors.red)),

@ -590,7 +590,7 @@ final Map<String, RouteBuilder> _routes = {
//
RouteName.RESULT_PAGE: (context, {arguments}) =>
ResultPage(arguments: arguments),
//
//
RouteName.UPGRADE_CARD_PAGE: (context, {arguments}) => UpgradeCardPage(),
RouteName.UPGRADE_CARD_SEND_USER_LIST_PAGE: (context, {arguments}) =>
UpgradeCardSendUserListPage(

@ -19,14 +19,14 @@ enum Gravity {
}
class Toast {
static showError(msg, {int millisecond = 2500, offset = 0.0 }) {
static showError(msg, {int millisecond = 2500, offset = 0.0, AlignmentGeometry align=Alignment.bottomCenter} ) {
showToast(
msg,
textStyle: TextStyle(fontSize: ScreenAdapterUtils.setSp(14)),
textPadding: EdgeInsets.only(left: 15, right: 15, top: 5, bottom: 5),
backgroundColor: Colors.red,
duration: Duration(milliseconds: millisecond),
position: ToastPosition(align: Alignment.bottomCenter, offset: offset),
position: ToastPosition(align: align, offset: offset),
dismissOtherToast: true
);
}

Loading…
Cancel
Save