Merge branch 'develop' into release
This commit is contained in:
commit
cfb0c21224
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:star_lock/flavors.dart';
|
import 'package:star_lock/flavors.dart';
|
||||||
|
import 'package:star_lock/tools/commonDataManage.dart';
|
||||||
|
|
||||||
import '../../appRouters.dart';
|
import '../../appRouters.dart';
|
||||||
import '../../app_settings/app_colors.dart';
|
import '../../app_settings/app_colors.dart';
|
||||||
@ -90,9 +91,14 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
|
|||||||
),
|
),
|
||||||
Obx(() => GestureDetector(
|
Obx(() => GestureDetector(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
if (state.isVip.value == null || !state.isVip.value) {
|
if (!state.isVip.value) {
|
||||||
Get.toNamed(Routers.advancedFeaturesWebPage,
|
if (CommonDataManage().currentKeyInfo.isLockOwner !=
|
||||||
arguments: {'isShop': true});
|
1) {
|
||||||
|
logic.showToast('请先添加锁');
|
||||||
|
} else {
|
||||||
|
Get.toNamed(Routers.advancedFeaturesWebPage,
|
||||||
|
arguments: {'isShop': true});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
Get.toNamed(
|
Get.toNamed(
|
||||||
Routers.valueAddedServicesHighFunctionPage);
|
Routers.valueAddedServicesHighFunctionPage);
|
||||||
|
|||||||
@ -66,8 +66,12 @@ class _ValueAddedServicesPageListState
|
|||||||
TranslationLoader.lanKeys!.advancedFunction!.tr, () async {
|
TranslationLoader.lanKeys!.advancedFunction!.tr, () async {
|
||||||
var isVip = await Storage.getBool(saveIsVip);
|
var isVip = await Storage.getBool(saveIsVip);
|
||||||
if (isVip == null || !isVip) {
|
if (isVip == null || !isVip) {
|
||||||
Get.toNamed(Routers.advancedFeaturesWebPage,
|
if (CommonDataManage().currentKeyInfo.isLockOwner != 1) {
|
||||||
arguments: {'isShop': true});
|
logic.showToast('请先添加锁');
|
||||||
|
} else {
|
||||||
|
Get.toNamed(Routers.advancedFeaturesWebPage,
|
||||||
|
arguments: {'isShop': true});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
Get.toNamed(Routers.valueAddedServicesHighFunctionPage);
|
Get.toNamed(Routers.valueAddedServicesHighFunctionPage);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user