jd
/
app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复若干问题

Browse Source
master
zhang 5 years ago
parent 063d67086d
commit b8732a39de
10 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
lib/main.dart
Unescape View File

@ -47,7 +47,7 @@ void main() async {
// useEncrypt: true
);
// 设置当前是否为测试环境
bool isDebug = true;
bool isDebug = false;
AppConfig.setDebug(isDebug);
bool inTest = Test.test();

9
lib/pages/home/classify/goods_page.dart
Unescape View File

@ -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),

2
lib/pages/home/classify/order_preview_page.dart
Unescape View File

@ -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;
}
}

2
lib/pages/home/home_page.dart
Unescape View File

@ -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);

4
lib/pages/home/lottery_page.dart
Unescape View File

@ -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'),

2
lib/pages/live/live_stream/live_blur_page.dart
Unescape View File

@ -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(() {

2
lib/pages/upgradeCard/upgrade_card_send_user_list_page.dart
Unescape View File

@ -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)),
]
),

24
lib/pages/upgradeCard/upgrade_card_tab_widget.dart
Unescape View File

@ -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)),

2
lib/utils/app_router.dart
Unescape View File

@ -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(

4
lib/widgets/toast.dart
Unescape View File

@ -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
);
}

Write Preview
Loading…
Cancel
Save