Merge branch 'develop' into release

This commit is contained in:
Daisy 2024-05-18 15:00:32 +08:00
commit cfb0c21224
2 changed files with 15 additions and 5 deletions

View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:star_lock/flavors.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import '../../appRouters.dart';
import '../../app_settings/app_colors.dart';
@ -90,9 +91,14 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
),
Obx(() => GestureDetector(
onTap: () {
if (state.isVip.value == null || !state.isVip.value) {
Get.toNamed(Routers.advancedFeaturesWebPage,
arguments: {'isShop': true});
if (!state.isVip.value) {
if (CommonDataManage().currentKeyInfo.isLockOwner !=
1) {
logic.showToast('请先添加锁');
} else {
Get.toNamed(Routers.advancedFeaturesWebPage,
arguments: {'isShop': true});
}
} else {
Get.toNamed(
Routers.valueAddedServicesHighFunctionPage);

View File

@ -66,8 +66,12 @@ class _ValueAddedServicesPageListState
TranslationLoader.lanKeys!.advancedFunction!.tr, () async {
var isVip = await Storage.getBool(saveIsVip);
if (isVip == null || !isVip) {
Get.toNamed(Routers.advancedFeaturesWebPage,
arguments: {'isShop': true});
if (CommonDataManage().currentKeyInfo.isLockOwner != 1) {
logic.showToast('请先添加锁');
} else {
Get.toNamed(Routers.advancedFeaturesWebPage,
arguments: {'isShop': true});
}
} else {
Get.toNamed(Routers.valueAddedServicesHighFunctionPage);
}