From 83b8b9809877b676f5e6bb7560b0d45497987fe5 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Fri, 21 Jan 2022 20:28:06 +0800 Subject: [PATCH] =?UTF-8?q?+=E6=9B=B4=E6=94=B9,=E8=A6=8F=E6=A0=BC=E6=9B=B4?= =?UTF-8?q?=E6=94=B9,=E8=A7=86=E9=A2=91=E9=93=BA=E6=BB=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/community/community_page.dart | 15 +- .../community_view/community_dynamic.dart | 4 +- lib/community/release_dynamic.dart | 31 +++ lib/home/home_page.dart | 8 +- lib/login/login_page.dart | 2 +- lib/main_page.dart | 8 +- lib/retrofit/data/login_info.dart | 257 +++++++++--------- lib/retrofit/retrofit_api.g.dart | 2 +- lib/store/store_view/product_sku.dart | 24 +- lib/view_widget/new_people_reward.dart | 26 +- lib/web/web_view/comment_list.dart | 3 +- 11 files changed, 214 insertions(+), 166 deletions(-) diff --git a/lib/community/community_page.dart b/lib/community/community_page.dart index 897f4876..e972a4e5 100644 --- a/lib/community/community_page.dart +++ b/lib/community/community_page.dart @@ -38,14 +38,15 @@ class _CommunityPage extends State } _toRelease() async { - int tmpIndex = tabcontroller.index; - setState(() { - tabcontroller.index = (tabcontroller.index == lables.length -1)?0:tabcontroller.index+1; - }); var result = await Navigator.of(context).pushNamed('/router/release_dynamic'); - setState(() { - tabcontroller.index = tmpIndex; - }); + + // int tmpIndex = tabcontroller.index; + // setState(() { + // tabcontroller.index = (tabcontroller.index == lables.length -1)?0:tabcontroller.index+1; + // }); + // setState(() { + // tabcontroller.index = tmpIndex; + // }); } @override diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index cbb7949b..02c421ec 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -487,7 +487,9 @@ class _CommunityDynamic extends State { color: Colors.black, child: Stack( children: [ - Center( + Container( + width: double.infinity, + height: double.infinity, child: MImage( src, aspectRatio: videoPlayerController != null diff --git a/lib/community/release_dynamic.dart b/lib/community/release_dynamic.dart index 1ac329e9..5d19ede5 100644 --- a/lib/community/release_dynamic.dart +++ b/lib/community/release_dynamic.dart @@ -85,6 +85,37 @@ class _ReleaseDynamic extends State { child: Column( children: [ buildEdit(), + Container( + width: double.infinity, + margin: EdgeInsets.all(16), + padding: EdgeInsets.only(left: 16,right: 16), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + "!", + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize:18.sp, + color: Colors.red, + ), + ), + SizedBox(width: 10,), + Expanded(child: Text( + "用户发布内容需要等待系统审核，审核通过后才会在推荐广场展示", + maxLines:2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14.sp, + color: Colors.black, + ), + ),) + ], + ), + ), Expanded( child: GridView.builder( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 2722bb5e..6e523eba 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -46,10 +46,10 @@ class HomePage extends StatefulWidget { final Function changeTab; final String invite; final List interviewCouponList; - final List newUserCouponList; + final List firstLoginCouponList; HomePage(this.changeTab, - {this.invite, this.interviewCouponList, this.newUserCouponList}); + {this.invite, this.interviewCouponList, this.firstLoginCouponList}); @override State createState() { @@ -75,7 +75,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { widget.interviewCouponList != null && widget.interviewCouponList.length > 0) showInvite = true; - if (widget.newUserCouponList != null && widget.newUserCouponList.length > 0) + if (widget.firstLoginCouponList != null && widget.firstLoginCouponList.length > 0) showNew = true; } @@ -245,7 +245,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { showInvite = false; } if (showNew) { - newShowAlertDialog(widget.newUserCouponList); + newShowAlertDialog(widget.firstLoginCouponList); showNew = false; } } diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index 986c1ae8..e3b2f5ff 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -342,7 +342,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { Navigator.of(context).pushNamedAndRemoveUntil( '/router/main_page', (route) => false,arguments:{"invite":invite,"interviewCouponList":value.data.interviewCouponList, - "newUserCouponList":value.data.newUserCouponList}); + "firstLoginCouponList":value.data.firstLoginCouponList}); EasyLoading.dismiss(); } else { diff --git a/lib/main_page.dart b/lib/main_page.dart index cab022d4..e38f1926 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -82,15 +82,15 @@ class _MainPage extends State with WidgetsBindingObserver { String invite = ""; var interviewCouponList; - var newUserCouponList; + var firstLoginCouponList; if(widget.arguments != null && (widget.arguments["invite"]??"") != "" && widget.arguments["interviewCouponList"] != null ){ invite = widget.arguments["invite"]; interviewCouponList = widget.arguments["interviewCouponList"]; } - if(widget.arguments != null && widget.arguments["newUserCouponList"] != null ){ - newUserCouponList = widget.arguments["newUserCouponList"]; + if(widget.arguments != null && widget.arguments["firstLoginCouponList"] != null ){ + firstLoginCouponList = widget.arguments["firstLoginCouponList"]; } _widgetOptions = [ @@ -99,7 +99,7 @@ class _MainPage extends State with WidgetsBindingObserver { setState(() { pageController.jumpToPage(index); }); - },invite:invite,interviewCouponList:interviewCouponList,newUserCouponList:newUserCouponList,), + },invite:invite,interviewCouponList:interviewCouponList,firstLoginCouponList:firstLoginCouponList,), // MainHomePage(), UnionPage(), CommunityPage(), diff --git a/lib/retrofit/data/login_info.dart b/lib/retrofit/data/login_info.dart index 912454e1..4ba91f8e 100644 --- a/lib/retrofit/data/login_info.dart +++ b/lib/retrofit/data/login_info.dart @@ -1,16 +1,19 @@ -/// authInfo : {"token":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJhY2NvdW50IjoiMTU2MTU2OTg3NDUiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.KHiw51SQ2RkARJhGKFTXgI7IrYXOhN-YqFZCwJ1jkEc","tokenType":"token","refreshToken":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.jjI0dTviahPq6p4J_tx_Sn-Fg-q51kE3WPpqdVcEIMw","name":"回乡_888888","account":"15615698745","avatar":null,"workDescribe":null,"userId":"1470702592303562752","userType":"PLATFORM_APP","expire":"2592000","expiration":"2022-01-13 18:29:59","mobile":"15615698745"} -/// interviewCouponList : [{"id":"1463398002331746304","createTime":"2021-11-24 14:44:07","createUser":"1333246101196636160","updateTime":"2021-11-24 14:44:07","updateUser":"1333246101196636160","storeId":"0","couponName":"满10-2","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"2.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2021-11-24 12:00:00","publishEndTime":"2021-11-30 12:00:00","useStartTime":"2021-11-24 12:00:00","useEndTime":"2021-11-30 12:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":true,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹奶茶店","number":1}] -/// newUserCouponList : [{"id":"1463398002331746304","createTime":"2021-11-24 14:44:07","createUser":"1333246101196636160","updateTime":"2021-11-24 14:44:07","updateUser":"1333246101196636160","storeId":"0","couponName":"满10-2","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"2.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2021-11-24 12:00:00","publishEndTime":"2021-11-30 12:00:00","useStartTime":"2021-11-24 12:00:00","useEndTime":"2021-11-30 12:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":true,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹奶茶店","number":1},{"id":"1463398002331746304","createTime":"2021-11-24 14:44:07","createUser":"1333246101196636160","updateTime":"2021-11-24 14:44:07","updateUser":"1333246101196636160","storeId":"0","couponName":"满10-2","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"2.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2021-11-24 12:00:00","publishEndTime":"2021-11-30 12:00:00","useStartTime":"2021-11-24 12:00:00","useEndTime":"2021-11-30 12:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":true,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹奶茶店","number":1},{"id":"1463398002331746304","createTime":"2021-11-24 14:44:07","createUser":"1333246101196636160","updateTime":"2021-11-24 14:44:07","updateUser":"1333246101196636160","storeId":"0","couponName":"满10-2","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"2.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2021-11-24 12:00:00","publishEndTime":"2021-11-30 12:00:00","useStartTime":"2021-11-24 12:00:00","useEndTime":"2021-11-30 12:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":true,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹奶茶店","number":1}] +/// authInfo : {"token":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJhY2NvdW50IjoiMTU0NDc4OTg3NTYiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.dIGWaCR6uuJ4YcgTfEEeVGJtOmpAlLaxQ2sEnd_9_zw","tokenType":"token","refreshToken":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.ZrG-JCemN_HtFzE512311Tksh2o21ywgjHhhGeXXWrE","name":"回乡_888888","account":"15447898756","avatar":null,"workDescribe":null,"userId":"1484477944838488064","userType":"PLATFORM_APP","expire":"2592000","expiration":"2022-02-20 18:48:19","mobile":"15447898756"} +/// interviewCouponList : [{"id":"1478615682588344320","createTime":"2022-01-05 14:33:45","createUser":"1333246101196636160","updateTime":"2022-01-05 14:33:45","updateUser":"1333246101196636160","storeId":"0","couponName":"新品10-5","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"5.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2022-01-01 00:00:00","publishEndTime":"2022-01-31 00:00:00","useStartTime":"2022-01-02 00:00:00","useEndTime":"2022-01-30 00:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":false,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹茶","number":1}] +/// newUserCouponList : null +/// firstLoginCouponList : [{"id":"1484456566340976640","createTime":"2022-01-21 17:23:20","createUser":"1333246101196636160","updateTime":"2022-01-21 17:23:20","updateUser":"1333246101196636160","storeId":"1333246101343436800","couponName":"新会员","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"14.00","discountAmount":"7.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2022-01-01 00:00:00","publishEndTime":"2022-01-31 00:00:00","useStartTime":"2022-01-01 00:00:00","useEndTime":"2022-02-01 00:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":false,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹茶（汉街店）","number":1},{"id":"1484456980566245376","createTime":"2022-01-21 17:24:59","createUser":"1336877238389309440","updateTime":"2022-01-21 17:24:59","updateUser":"1336877238389309440","storeId":"1328618782985289728","couponName":"新会员8-8","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"8.00","discountAmount":"8.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2022-01-01 00:00:00","publishEndTime":"2022-01-31 00:00:00","useStartTime":"2022-01-01 00:00:00","useEndTime":"2022-01-31 00:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"businessType":0,"centreDisplay":false,"tenantCode":"1174","isDelete":0,"storeName":"前进麦味（凯德1818店）","number":1}] class LoginInfo { LoginInfo({ - AuthInfo authInfo, - List interviewCouponList, - List newUserCouponList,}){ + AuthInfo authInfo, + List interviewCouponList, + dynamic newUserCouponList, + List firstLoginCouponList,}){ _authInfo = authInfo; _interviewCouponList = interviewCouponList; _newUserCouponList = newUserCouponList; - } + _firstLoginCouponList = firstLoginCouponList; +} LoginInfo.fromJson(dynamic json) { _authInfo = json['authInfo'] != null ? AuthInfo.fromJson(json['authInfo']) : null; @@ -20,20 +23,23 @@ class LoginInfo { _interviewCouponList.add(InterviewCouponList.fromJson(v)); }); } - if (json['newUserCouponList'] != null) { - _newUserCouponList = []; - json['newUserCouponList'].forEach((v) { - _newUserCouponList.add(NewUserCouponList.fromJson(v)); + _newUserCouponList = json['newUserCouponList']; + if (json['firstLoginCouponList'] != null) { + _firstLoginCouponList = []; + json['firstLoginCouponList'].forEach((v) { + _firstLoginCouponList.add(FirstLoginCouponList.fromJson(v)); }); } } AuthInfo _authInfo; List _interviewCouponList; - List _newUserCouponList; + dynamic _newUserCouponList; + List _firstLoginCouponList; AuthInfo get authInfo => _authInfo; List get interviewCouponList => _interviewCouponList; - List get newUserCouponList => _newUserCouponList; + dynamic get newUserCouponList => _newUserCouponList; + List get firstLoginCouponList => _firstLoginCouponList; Map toJson() { final map = {}; @@ -43,79 +49,80 @@ class LoginInfo { if (_interviewCouponList != null) { map['interviewCouponList'] = _interviewCouponList.map((v) => v.toJson()).toList(); } - if (_newUserCouponList != null) { - map['newUserCouponList'] = _newUserCouponList.map((v) => v.toJson()).toList(); + map['newUserCouponList'] = _newUserCouponList; + if (_firstLoginCouponList != null) { + map['firstLoginCouponList'] = _firstLoginCouponList.map((v) => v.toJson()).toList(); } return map; } } -/// id : "1463398002331746304" -/// createTime : "2021-11-24 14:44:07" +/// id : "1484456566340976640" +/// createTime : "2022-01-21 17:23:20" /// createUser : "1333246101196636160" -/// updateTime : "2021-11-24 14:44:07" +/// updateTime : "2022-01-21 17:23:20" /// updateUser : "1333246101196636160" -/// storeId : "0" -/// couponName : "满10-2" +/// storeId : "1333246101343436800" +/// couponName : "新会员" /// bizType : 1 /// allProduct : true /// productSkuId : [] -/// fullAmount : "10.00" -/// discountAmount : "2.00" +/// fullAmount : "14.00" +/// discountAmount : "7.00" /// fullNumber : 1 /// discountPercent : 100 /// sellPrice : "0.00" /// sellCount : 0 /// bizId : "" -/// publishStartTime : "2021-11-24 12:00:00" -/// publishEndTime : "2021-11-30 12:00:00" -/// useStartTime : "2021-11-24 12:00:00" -/// useEndTime : "2021-11-30 12:00:00" +/// publishStartTime : "2022-01-01 00:00:00" +/// publishEndTime : "2022-01-31 00:00:00" +/// useStartTime : "2022-01-01 00:00:00" +/// useEndTime : "2022-02-01 00:00:00" /// promotionId : "0" /// dateOrDay : false /// startAfterDays : 0 /// daysValidate : 0 /// businessType : 0 -/// centreDisplay : true +/// centreDisplay : false /// tenantCode : "1175" /// isDelete : 0 -/// storeName : "海峡姐妹奶茶店" +/// storeName : "海峡姐妹茶（汉街店）" /// number : 1 -class NewUserCouponList { - NewUserCouponList({ - String id, - String createTime, - String createUser, - String updateTime, - String updateUser, - String storeId, - String couponName, - int bizType, - bool allProduct, - List productSkuId, - String fullAmount, - String discountAmount, - int fullNumber, - int discountPercent, - String sellPrice, - int sellCount, - String bizId, - String publishStartTime, - String publishEndTime, - String useStartTime, - String useEndTime, - String promotionId, - bool dateOrDay, - int startAfterDays, - int daysValidate, - int businessType, - bool centreDisplay, - String tenantCode, - int isDelete, - String storeName, - int number,}){ +class FirstLoginCouponList { + FirstLoginCouponList({ + String id, + String createTime, + String createUser, + String updateTime, + String updateUser, + String storeId, + String couponName, + int bizType, + bool allProduct, + List productSkuId, + String fullAmount, + String discountAmount, + int fullNumber, + int discountPercent, + String sellPrice, + int sellCount, + String bizId, + String publishStartTime, + String publishEndTime, + String useStartTime, + String useEndTime, + String promotionId, + bool dateOrDay, + int startAfterDays, + int daysValidate, + int businessType, + bool centreDisplay, + String tenantCode, + int isDelete, + String storeName, + int number,}){ _id = id; _createTime = createTime; _createUser = createUser; @@ -147,9 +154,9 @@ class NewUserCouponList { _isDelete = isDelete; _storeName = storeName; _number = number; - } +} - NewUserCouponList.fromJson(dynamic json) { + FirstLoginCouponList.fromJson(dynamic json) { _id = json['id']; _createTime = json['createTime']; _createUser = json['createUser']; @@ -291,71 +298,71 @@ class NewUserCouponList { } -/// id : "1463398002331746304" -/// createTime : "2021-11-24 14:44:07" +/// id : "1478615682588344320" +/// createTime : "2022-01-05 14:33:45" /// createUser : "1333246101196636160" -/// updateTime : "2021-11-24 14:44:07" +/// updateTime : "2022-01-05 14:33:45" /// updateUser : "1333246101196636160" /// storeId : "0" -/// couponName : "满10-2" +/// couponName : "新品10-5" /// bizType : 1 /// allProduct : true /// productSkuId : [] /// fullAmount : "10.00" -/// discountAmount : "2.00" +/// discountAmount : "5.00" /// fullNumber : 1 /// discountPercent : 100 /// sellPrice : "0.00" /// sellCount : 0 /// bizId : "" -/// publishStartTime : "2021-11-24 12:00:00" -/// publishEndTime : "2021-11-30 12:00:00" -/// useStartTime : "2021-11-24 12:00:00" -/// useEndTime : "2021-11-30 12:00:00" +/// publishStartTime : "2022-01-01 00:00:00" +/// publishEndTime : "2022-01-31 00:00:00" +/// useStartTime : "2022-01-02 00:00:00" +/// useEndTime : "2022-01-30 00:00:00" /// promotionId : "0" /// dateOrDay : false /// startAfterDays : 0 /// daysValidate : 0 /// businessType : 0 -/// centreDisplay : true +/// centreDisplay : false /// tenantCode : "1175" /// isDelete : 0 -/// storeName : "海峡姐妹奶茶店" +/// storeName : "海峡姐妹茶" /// number : 1 class InterviewCouponList { InterviewCouponList({ - String id, - String createTime, - String createUser, - String updateTime, - String updateUser, - String storeId, - String couponName, - int bizType, - bool allProduct, - List productSkuId, - String fullAmount, - String discountAmount, - int fullNumber, - int discountPercent, - String sellPrice, - int sellCount, - String bizId, - String publishStartTime, - String publishEndTime, - String useStartTime, - String useEndTime, - String promotionId, - bool dateOrDay, - int startAfterDays, - int daysValidate, - int businessType, - bool centreDisplay, - String tenantCode, - int isDelete, - String storeName, - int number,}){ + String id, + String createTime, + String createUser, + String updateTime, + String updateUser, + String storeId, + String couponName, + int bizType, + bool allProduct, + List productSkuId, + String fullAmount, + String discountAmount, + int fullNumber, + int discountPercent, + String sellPrice, + int sellCount, + String bizId, + String publishStartTime, + String publishEndTime, + String useStartTime, + String useEndTime, + String promotionId, + bool dateOrDay, + int startAfterDays, + int daysValidate, + int businessType, + bool centreDisplay, + String tenantCode, + int isDelete, + String storeName, + int number,}){ _id = id; _createTime = createTime; _createUser = createUser; @@ -387,7 +394,7 @@ class InterviewCouponList { _isDelete = isDelete; _storeName = storeName; _number = number; - } +} InterviewCouponList.fromJson(dynamic json) { _id = json['id']; @@ -531,33 +538,33 @@ class InterviewCouponList { } -/// token : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJhY2NvdW50IjoiMTU2MTU2OTg3NDUiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.KHiw51SQ2RkARJhGKFTXgI7IrYXOhN-YqFZCwJ1jkEc" +/// token : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJhY2NvdW50IjoiMTU0NDc4OTg3NTYiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.dIGWaCR6uuJ4YcgTfEEeVGJtOmpAlLaxQ2sEnd_9_zw" /// tokenType : "token" -/// refreshToken : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.jjI0dTviahPq6p4J_tx_Sn-Fg-q51kE3WPpqdVcEIMw" +/// refreshToken : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.ZrG-JCemN_HtFzE512311Tksh2o21ywgjHhhGeXXWrE" /// name : "回乡_888888" -/// account : "15615698745" +/// account : "15447898756" /// avatar : null /// workDescribe : null -/// userId : "1470702592303562752" +/// userId : "1484477944838488064" /// userType : "PLATFORM_APP" /// expire : "2592000" -/// expiration : "2022-01-13 18:29:59" -/// mobile : "15615698745" +/// expiration : "2022-02-20 18:48:19" +/// mobile : "15447898756" class AuthInfo { AuthInfo({ - String token, - String tokenType, - String refreshToken, - String name, - String account, - dynamic avatar, - dynamic workDescribe, - String userId, - String userType, - String expire, - String expiration, - String mobile,}){ + String token, + String tokenType, + String refreshToken, + String name, + String account, + dynamic avatar, + dynamic workDescribe, + String userId, + String userType, + String expire, + String expiration, + String mobile,}){ _token = token; _tokenType = tokenType; _refreshToken = refreshToken; @@ -570,7 +577,7 @@ class AuthInfo { _expire = expire; _expiration = expiration; _mobile = mobile; - } +} AuthInfo.fromJson(dynamic json) { _token = json['token']; diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 71083690..b39600ce 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.236:8766/app/'; + baseUrl ??= 'http://192.168.10.142:8766/app/'; } final Dio _dio; diff --git a/lib/store/store_view/product_sku.dart b/lib/store/store_view/product_sku.dart index 6ca52c67..8e7f6e0a 100644 --- a/lib/store/store_view/product_sku.dart +++ b/lib/store/store_view/product_sku.dart @@ -355,15 +355,23 @@ class _ProductSku extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ - RoundButton( - width: 68.w, + Container( + width: 70.w, height: 29.h, - text: name, - textColor: !isCheck ? Color(0xFF727272) : Colors.white, - fontWeight: MyFontWeight.regular, - radius: 4, - backgroup: !isCheck ? Color(0xFFE5E5E5) : Color(0xFF32A060), - fontSize: 12.sp, + alignment: Alignment.center, + decoration: BoxDecoration( + color: !isCheck ? Color(0xFFE5E5E5) : Color(0xFF32A060), + borderRadius: BorderRadius.all(Radius.circular(4)), + ), + child:Text( + name, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color:!isCheck ? Color(0xFF727272) : Colors.white, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), + ), ), ], ), diff --git a/lib/view_widget/new_people_reward.dart b/lib/view_widget/new_people_reward.dart index abbbb26b..b44c8b0c 100644 --- a/lib/view_widget/new_people_reward.dart +++ b/lib/view_widget/new_people_reward.dart @@ -5,9 +5,9 @@ import 'package:huixiang/retrofit/data/login_info.dart'; import 'package:huixiang/utils/font_weight.dart'; class NewPeopleReward extends StatefulWidget { - final List newUserCouponList; + final List firstLoginCouponList; - NewPeopleReward(this.newUserCouponList); + NewPeopleReward(this.firstLoginCouponList); @override State createState() { @@ -93,22 +93,22 @@ class _NewPeopleReward extends State { Widget reward() { return ListView.builder( padding: EdgeInsets.zero, - itemCount: widget.newUserCouponList.length, + itemCount: widget.firstLoginCouponList.length, scrollDirection: Axis.vertical, shrinkWrap: true, physics: BouncingScrollPhysics(), itemBuilder: (context, position) { return GestureDetector( onTap: () {}, - child: rewardItem(widget.newUserCouponList[position]), + child: rewardItem(widget.firstLoginCouponList[position]), ); }, ); } - Widget rewardItem(NewUserCouponList newUserCouponList) { + Widget rewardItem(FirstLoginCouponList firstLoginCouponList) { return Container( - height: 69.h, + height:80.h, width: double.infinity, decoration: BoxDecoration( image: DecorationImage( @@ -135,7 +135,7 @@ class _NewPeopleReward extends State { ), TextSpan( text: double.tryParse( - "${newUserCouponList.discountAmount}" ?? "0") + "${firstLoginCouponList.discountAmount}" ?? "0") .toInt() .toString() ?? "", @@ -149,13 +149,13 @@ class _NewPeopleReward extends State { ), ), Expanded(child:Padding( - padding: EdgeInsets.only(top: 4, bottom: 4,left:10), + padding: EdgeInsets.only(top: 4, bottom: 4,left:30), child: Column( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - newUserCouponList.storeName, + firstLoginCouponList.storeName, overflow: TextOverflow.ellipsis, maxLines: 2, style: TextStyle( @@ -165,7 +165,7 @@ class _NewPeopleReward extends State { ), ), Text( - newUserCouponList.couponName, + firstLoginCouponList.couponName, overflow: TextOverflow.ellipsis, maxLines: 2, style: TextStyle( @@ -175,9 +175,9 @@ class _NewPeopleReward extends State { ), ), Text( - "有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") - ? newUserCouponList.useEndTime.split(" ")[0] - : "$newUserCouponList.useEndTime"}", + "有效期至:${(firstLoginCouponList.useEndTime != null && firstLoginCouponList.useEndTime != "") + ? firstLoginCouponList.useEndTime.split(" ")[0] + : "$firstLoginCouponList.useEndTime"}", overflow: TextOverflow.ellipsis, maxLines: 2, style: TextStyle( diff --git a/lib/web/web_view/comment_list.dart b/lib/web/web_view/comment_list.dart index 156776d5..af5cac81 100644 --- a/lib/web/web_view/comment_list.dart +++ b/lib/web/web_view/comment_list.dart @@ -139,7 +139,6 @@ class CommentListState extends State { ), if (memberList != null && memberList.length > 0) Container( - height: commentHeight, decoration: BoxDecoration( color: Color(0xFFF2F2F2), boxShadow: [ @@ -152,7 +151,7 @@ class CommentListState extends State { ], ), alignment: Alignment.topCenter, - padding: EdgeInsets.only(top: 22.h), + padding: EdgeInsets.only(top: 22.h, bottom: 22.h), child: Text( S.of(context).yixiansquanbupinglun, style: TextStyle(