修复权限显示

master
laiiihz 5 years ago
parent ca2ab4c32c
commit db0fcd29e4

@ -173,7 +173,7 @@
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = HV8WM8C68W;
LastSwiftMigration = 1140;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Push = {
enabled = 1;
@ -390,8 +390,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 145;
DEVELOPMENT_TEAM = HV8WM8C68W;
ENABLE_BITCODE = NO;
@ -409,7 +409,7 @@
MARKETING_VERSION = 1.1.4;
PRODUCT_BUNDLE_IDENTIFIER = com.reecook.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = recook_appstore;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
@ -524,8 +524,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 145;
DEVELOPMENT_TEAM = HV8WM8C68W;
ENABLE_BITCODE = NO;
@ -543,7 +543,7 @@
MARKETING_VERSION = 1.1.4;
PRODUCT_BUNDLE_IDENTIFIER = com.reecook.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = recook_appstore;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@ -559,8 +559,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 145;
DEVELOPMENT_TEAM = HV8WM8C68W;
ENABLE_BITCODE = NO;
@ -578,7 +578,7 @@
MARKETING_VERSION = 1.1.4;
PRODUCT_BUNDLE_IDENTIFIER = com.reecook.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = recook_appstore;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;

@ -56,7 +56,6 @@ class AppConfig {
// showCommission = canShowCommission;
// }
///
///
///showExtraCommission
@ -64,14 +63,24 @@ class AppConfig {
///
static bool getShowCommission() {
if (showExtraCommission) {
return true;
} else {
if ((!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.None)) {
return false;
}
return true;
}
return showCommission;
}
static bool get commissionByRoleLevel {
if ((!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.None)) {
return false;
} else
return true;
}
}

@ -657,7 +657,7 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
AppConfig.getShowCommission()
AppConfig.commissionByRoleLevel
? Container(
alignment: Alignment.center,
padding: EdgeInsets.symmetric(

@ -167,15 +167,11 @@ class _SkuChoosePageState extends BaseStoreState<SkuChoosePage> {
builder: (context) {
final skuNotNull =
_sku != null && _sku.commission != null;
final haveLogin = UserManager.instance.haveLogin;
final isNotVIP =
UserLevelTool.currentRoleLevelEnum() !=
UserRoleLevel.Vip;
return RichText(
text: TextSpan(children: [
TextSpan(
text:
"${_sku != null ? _sku.discountPrice.toStringAsFixed(2) : _price}${skuNotNull && haveLogin && isNotVIP ? "/" : ""}",
"${_sku != null ? _sku.discountPrice.toStringAsFixed(2) : _price}${skuNotNull && AppConfig.commissionByRoleLevel ? "/" : ""}",
// "${_sku.discountPrice}",
style: AppTextStyle.generate(
ScreenAdapterUtils.setSp(18),
@ -183,7 +179,8 @@ class _SkuChoosePageState extends BaseStoreState<SkuChoosePage> {
color: Colors.black),
),
TextSpan(
text: skuNotNull && haveLogin && isNotVIP
text: skuNotNull &&
AppConfig.commissionByRoleLevel
? "${_sku.commission.toStringAsFixed(2)}"
: "",
// "${_sku.discountPrice}",

@ -124,14 +124,14 @@ class _GoodsOrderItemState extends State<GoodsOrderItem> {
ScreenAdapterUtils.setSp(13),
color: Color.fromARGB(255, 249, 62, 13),
)),
AppConfig.getShowCommission()
AppConfig.commissionByRoleLevel
? TextSpan(
text: " 赚:",
style: AppTextStyle.generate(
ScreenAdapterUtils.setSp(13),
))
: TextSpan(text: ''),
AppConfig.getShowCommission()
AppConfig.commissionByRoleLevel
? TextSpan(
text: '$commission',
style: AppTextStyle.generate(

@ -247,7 +247,7 @@ class _ShoppingCartItemState extends State<ShoppingCartItem> {
),
Row(
children: <Widget>[
AppConfig.getShowCommission()
AppConfig.commissionByRoleLevel
? Container(
decoration: BoxDecoration(
border: Border.all(

@ -44,13 +44,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
VersionTool.checkVersionInfo(_context);
});
_tabController = TabController(
length: (!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() ==
UserRoleLevel.Vip) &&
!AppConfig.showExtraCommission
? 4
: 5,
vsync: this);
length: !AppConfig.getShowCommission() ? 4 : 5, vsync: this);
_bottomBarController = BottomBarController();
UserManager.instance.login.addListener(_loginListener);
@ -82,10 +76,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
controller: _tabController,
children:
// AppConfig.getShowCommission()
(!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() ==
UserRoleLevel.Vip) &&
!AppConfig.showExtraCommission
!AppConfig.getShowCommission()
? <Widget>[
HomePage(),
BusinessPage(),
@ -107,8 +98,7 @@ class _TabBarWidgetState extends State<TabBarWidget>
return BottomBar(
barController: _bottomBarController,
tabChangeListener: (index) {
if ((!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip)) {
if (!AppConfig.getShowCommission()) {
// if(AppConfig.getShowCommission()){
// if (index == 2) {
// UserManager.instance.refreshShopPage.value = !UserManager.instance.refreshShopPage.value;
@ -190,9 +180,7 @@ class _BottomBarState extends State<BottomBar> {
iconUnSelectedColor: unSelectedColor,
protrudingColor: selectedColor,
// items: AppConfig.getShowCommission()
items: (!UserManager.instance.haveLogin ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip) &&
!AppConfig.showExtraCommission
items: !AppConfig.getShowCommission()
? [
NavigationItemBean(
textStr: '特卖',

@ -577,10 +577,8 @@ class GoodsItemWidget extends StatelessWidget {
),
)
: SizedBox(),
(UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.None ||
UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Vip)
? Container()
: Container(
AppConfig.commissionByRoleLevel
? Container(
child: Stack(
alignment: Alignment.center,
children: <Widget>[
@ -616,7 +614,8 @@ class GoodsItemWidget extends StatelessWidget {
: SizedBox(),
],
),
),
)
: SizedBox(),
Spacer(),
],
),

@ -2,7 +2,7 @@ name: recook
description: Recook Market App.
publish_to: "none"
version: 1.1.14+156
version: 1.1.16+158
environment:
sdk: ">=2.1.0 <3.0.0"

Loading…
Cancel
Save