Browse Source

更改

null_safety
w-R 4 years ago
parent
commit
a0750ca393
  1. 15
      lib/retrofit/retrofit_api.dart
  2. 9
      lib/retrofit/retrofit_api.g.dart
  3. 82
      lib/union/store_details_page.dart

15
lib/retrofit/retrofit_api.dart

@ -18,16 +18,18 @@ part 'retrofit_api.g.dart';
// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///
const base_url = "http://192.168.10.236:8766/app/";
const baseUrl = "http://192.168.10.236:8766/app/";///
const baseUrl = "http://192.168.10.236:8766/app/";
///
@RestApi(baseUrl: baseUrl)
abstract class ApiService {
factory ApiService(Dio dio,
{String baseUrl,
BuildContext context,
String token,
bool showLoading = true, bool pay = false}) {
bool showLoading = true,
bool pay = false}) {
Map<String, dynamic> headers =
(token == null || token == "") ? {} : {'token': "Bearer $token"};
if (pay) {
@ -44,7 +46,8 @@ abstract class ApiService {
debugPrint("method = ${options.method.toString()}");
debugPrint("url = ${options.uri.toString()}");
debugPrint("headers = ${options.headers}");
if (showLoading) { //loading
if (showLoading) {
//loading
SmartDialog.showLoading(msg: S.current.zhengzaijiazai);
}
if (options.data is FormData) {
@ -73,7 +76,8 @@ abstract class ApiService {
value.setString("mobile", "");
value.setString("nick", "");
});
Navigator.of(context).pushNamed('/router/login_page', arguments: {"login":"login"});
Navigator.of(context).pushNamed('/router/login_page',
arguments: {"login": "login"});
},
),
clickBgDismissTemp: false,
@ -311,5 +315,4 @@ abstract class ApiService {
////
@GET("/memberComment/likes/{id}")
Future<BaseData> commentLike(@Path("id") String id);
}

9
lib/retrofit/retrofit_api.g.dart

@ -824,7 +824,8 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>('/information/likes/$id',
final _result = await _dio.request<Map<String, dynamic>>(
'/information/likes/$id',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
@ -843,8 +844,7 @@ class _ApiService implements ApiService {
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
_data.addAll(param ?? <String, dynamic>{});
final _result = await _dio.request<Map<String, dynamic>>(
'/memberComment',
final _result = await _dio.request<Map<String, dynamic>>('/memberComment',
queryParameters: queryParameters,
options: RequestOptions(
method: 'POST',
@ -882,7 +882,8 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>('/memberComment/likes/$id',
final _result = await _dio.request<Map<String, dynamic>>(
'/memberComment/likes/$id',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',

82
lib/union/store_details_page.dart

@ -178,8 +178,10 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
///
queryInformationLikes() async {
BaseData baseData =
await apiService.commentLike(widget.arguments["activityId"] ?? widget.arguments["articleId"]).catchError((onError) {});
BaseData baseData = await apiService
.commentLike(
widget.arguments["activityId"] ?? widget.arguments["articleId"])
.catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
setState(() {
isLiked = true;
@ -192,9 +194,10 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
//
queryMemberComment(String content) async {
BaseData baseData = await apiService.memberComment({
"content":content,
"parentId":0,
"relationalId":widget.arguments["activityId"] ?? widget.arguments["articleId"],
"content": content,
"parentId": 0,
"relationalId":
widget.arguments["activityId"] ?? widget.arguments["articleId"],
"relationalType": 1
}).catchError((error) {
_refreshController.refreshFailed();
@ -383,7 +386,8 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
SizedBox(
width: 16.w,
),
Text("喜欢(${article?.likes??activity?.likes??"0"})",
Text(
"喜欢(${article?.likes ?? activity?.likes ?? "0"})",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
@ -399,7 +403,8 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {},
child: commentItem(memberList[position],position,memberList.length),
child: commentItem(memberList[position], position,
memberList.length),
);
},
),
@ -459,14 +464,14 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
Padding(
padding: EdgeInsets.only(left: 20.w, right: 20.w),
child: GestureDetector(
onTap: (){
onTap: () {
var commentText = commentTextController.text;
if (commentText == "") {
return;
}
queryMemberComment(commentText);
},
child:Text(
child: Text(
"发送",
style: TextStyle(
fontSize: 16.sp,
@ -475,9 +480,14 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
),
),
),
GestureDetector(onTap: (){
queryInformationLikes();
},child: Image.asset(isLiked?"assets/image/icon_like.png":"assets/image/icon_like_h.png"),)
GestureDetector(
onTap: () {
queryInformationLikes();
},
child: Image.asset(isLiked
? "assets/image/icon_like.png"
: "assets/image/icon_like_h.png"),
)
],
),
),
@ -539,7 +549,7 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
);
}
Widget commentItem(MemberCommentList memberList,int index,int max) {
Widget commentItem(MemberCommentList memberList, int index, int max) {
return Container(
child: Column(
children: [
@ -634,30 +644,32 @@ class _StoreDetailsPage extends State<StoreDetailsPage> {
SizedBox(
height: 12.h,
),
if(memberList.parentContent != null)
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 68.w, right: 16.w),
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0),
),
child: Padding(
padding: EdgeInsets.only(left: 4.w, top: 4.h, bottom: 4.h),
child: Row(
children: [
Text(
memberList.parentUserName??"",
style: TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
Text(
memberList.parentContent ?? "",
style: TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
],
if (memberList.parentContent != null)
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 68.w, right: 16.w),
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0),
),
child: Padding(
padding: EdgeInsets.only(left: 4.w, top: 4.h, bottom: 4.h),
child: Row(
children: [
Text(
memberList.parentUserName ?? "",
style:
TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
Text(
memberList.parentContent ?? "",
style:
TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
],
),
),
),
),
if (index == max - 1)
Container(
height: 63.h,

Loading…
Cancel
Save