diff --git a/circle_app/lib/app/call_out/logic.dart b/circle_app/lib/app/call_out/logic.dart index 30efb70..640b152 100644 --- a/circle_app/lib/app/call_out/logic.dart +++ b/circle_app/lib/app/call_out/logic.dart @@ -54,7 +54,10 @@ class Call_outLogic extends GetxController { if (myConfigData != null) { // print(myConfigData.name); numbers.addAll(myConfigData); - circleName = numbers[0].name; + if(numbers.length>0){ + circleName = numbers[0].name; + } + SharedPreferencesHelper.getInstance().then((sharedPreferences) { vip = sharedPreferences.getInt(SharedPreferencesHelper.VIP); print(vip); diff --git a/circle_app/lib/app/select_circle/logic.dart b/circle_app/lib/app/select_circle/logic.dart index 74d5996..e520eaf 100644 --- a/circle_app/lib/app/select_circle/logic.dart +++ b/circle_app/lib/app/select_circle/logic.dart @@ -17,13 +17,18 @@ class Select_circleLogic extends GetxController { for (var entry in entries.asMap().entries) { MyConfigData bean = MyConfigData(entry.value.key, entry.value.value, false); - selectCircle.forEach((element) { - if(entry.value.key==element.id){ - bean.isSelect = true; - selectIndex = entry.key; - } + if(selectCircle.isEmpty){ arrList.add(bean); - }); + }else{ + selectCircle.forEach((element) { + if(entry.value.key==element.id){ + bean.isSelect = true; + selectIndex = entry.key; + } + arrList.add(bean); + }); + } + } }else{ interestMap.forEach((key, value) { @@ -36,7 +41,7 @@ class Select_circleLogic extends GetxController { arrList.add(bean); }); } - +print(arrList.length.toString()); update(); } diff --git a/circle_app/lib/app/userinfo/view.dart b/circle_app/lib/app/userinfo/view.dart index 0ac4ebc..d064c81 100644 --- a/circle_app/lib/app/userinfo/view.dart +++ b/circle_app/lib/app/userinfo/view.dart @@ -375,6 +375,17 @@ class MyTabbedScreenState extends State } Widget titleTab(UserinfoLogic controller) { + String buttonText = ""; + + if (controller.isMe) { + if (logic.isShowAlbum) { + buttonText = controller.isEdit ? "完成" : "管理"; + } else { + buttonText = "发布喊话"; + } + } else { + buttonText = controller.isUrgeStatus ? "已催更" : "催更"; + } return Container( alignment: Alignment.centerLeft, padding: EdgeInsets.symmetric(horizontal: 10.sp), @@ -414,7 +425,7 @@ class MyTabbedScreenState extends State ), logic.isBlack||logic.isDestroy||logic.isBlackBeen?Container(): GestureDetector( onTap: () { - if(!logic.isShowAlbum){ + if(!logic.isShowAlbum&&controller.isMe){ List numbers = []; var data = Get.toNamed(AppRoutes.Call_out, arguments: {'numbers': numbers}); return ; @@ -445,14 +456,7 @@ class MyTabbedScreenState extends State horizontal: 12.sp, ), child: Text( - logic.isShowAlbum? - controller.isMe - ? controller.isEdit - ? "完成" - : "管理" - : controller.isUrgeStatus - ? "已催更" - : "催更":"发布喊话", + buttonText, style: const TextStyle( color: Colors.white, fontSize: 12, @@ -523,7 +527,7 @@ class MyTabbedScreenState extends State ? controller.state.imaglist.length+1 : controller.state.imaglist.length , itemBuilder: (BuildContext context, int index) { - print("123123123123"); + // print("123123123123"); if (controller.isMe ) { if (index == 0) { return GestureDetector( diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart index f07a137..22686a8 100644 --- a/circle_app/lib/network/dio_manager.dart +++ b/circle_app/lib/network/dio_manager.dart @@ -255,7 +255,7 @@ class DioManager { // String? errorMsg = isNetworkConnected // ? e.requestOptions.extra["errorMsg"] // : "网络连接断开,请检查网络设置"; - return {'code': 500, 'msg': '加载中${e.message}'}; + return {'code': 500, 'msg': '加载中'}; } catch (e) { // 其他一些意外的报错 return {'code': 500, 'msg': '加载中...'};