diff --git a/assets/svg/svg_login.svg b/assets/svg/svg_login.svg
new file mode 100644
index 00000000..497a0289
--- /dev/null
+++ b/assets/svg/svg_login.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/lib/integral/intergra_view/integral_task.dart b/lib/integral/intergra_view/integral_task.dart
index 0ec67080..30f7ead2 100644
--- a/lib/integral/intergra_view/integral_task.dart
+++ b/lib/integral/intergra_view/integral_task.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/sign_info.dart';
@@ -130,11 +131,17 @@ class _IntegralTask extends State {
alignment: Alignment.center,
child: Row(
children: [
- Image.asset(
- taskImg(task.type),
- width: 24.w,
- height: 24.h,
- ),
+ (task.type == "bill_type_point_login")
+ ? SvgPicture.asset(
+ "assets/svg/svg_login.svg",
+ width: 24.w,
+ height: 24.h,
+ )
+ : Image.asset(
+ taskImg(task.type),
+ width: 24.w,
+ height: 24.h,
+ ),
SizedBox(
width: 21.w,
),
diff --git a/lib/web/web_page.dart b/lib/web/web_page.dart
index 58810e97..e4fcbb75 100644
--- a/lib/web/web_page.dart
+++ b/lib/web/web_page.dart
@@ -287,12 +287,14 @@ class _WebPage extends State with WidgetsBindingObserver {
);
}
+ ///删除评论的提示
_delCommentTips() {
SmartDialog.show(widget: Tips(() {
delComment();
}));
}
+ ///删除评论
delComment() async {
BaseData baseData = await apiService.delComment(
widget.arguments["activityId"] ?? widget.arguments["articleId"]);
@@ -301,23 +303,22 @@ class _WebPage extends State with WidgetsBindingObserver {
}
}
+ ///评论 回复
_reply(memberComment) {
FocusScope.of(context).requestFocus(commentFocus);
parenId = memberComment.id;
hintText = S.of(context).huifu_("${memberComment.username}");
}
+ ///滑动到评论列表
_toComment() {
if (commentKey.currentContext == null) return;
RenderBox firstRenderBox = commentKey.currentContext.findRenderObject();
Offset first = firstRenderBox.localToGlobal(Offset.zero);
- scrollController.animateTo(
- first.dy +
- scrollController.offset -
+ scrollController.animateTo(first.dy + scrollController.offset -
(kToolbarHeight + MediaQuery.of(context).padding.top),
duration: Duration(milliseconds: 1000),
curve: Curves.easeIn);
}
-
}
diff --git a/pubspec.lock b/pubspec.lock
index 5ba6cbe2..00203e6d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -397,7 +397,7 @@ packages:
source: hosted
version: "0.4.0"
flutter_svg:
- dependency: transitive
+ dependency: "direct main"
description:
name: flutter_svg
url: "https://pub.flutter-io.cn"
diff --git a/pubspec.yaml b/pubspec.yaml
index f0a95151..b48eb6bb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -80,6 +80,7 @@ dependencies:
rive: ^0.6.8
flare_flutter: ^3.0.2
+ flutter_svg: ^0.20.0-nullsafety.3
font_awesome_flutter: ^9.1.0
# flutter_bugly: ^0.3.3
@@ -97,6 +98,7 @@ flutter:
- assets/image/
- assets/map_style/
- assets/riv/
+ - assets/svg/
# - assets/fonts/
# fonts: