Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp

lib/community/community_page.dart

@@ -38,14 +38,15 @@ class _CommunityPage extends State<CommunityPage>
   }
 
   _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

lib/community/community_view/community_dynamic.dart

@@ -487,7 +487,9 @@ class _CommunityDynamic extends State<CommunityDynamic> {
               color: Colors.black,
               child: Stack(
                 children: [
-                  Center(
+                  Container(
+                    width: double.infinity,
+                    height: double.infinity,
                     child: MImage(
                       src,
                       aspectRatio: videoPlayerController != null

lib/community/release_dynamic.dart

@@ -85,6 +85,37 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
         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(

lib/home/home_page.dart

@@ -46,10 +46,10 @@ class HomePage extends StatefulWidget {
   final Function changeTab;
   final String invite;
   final List<InterviewCouponList> interviewCouponList;
-  final List<NewUserCouponList> newUserCouponList;
+  final List<FirstLoginCouponList> firstLoginCouponList;
 
   HomePage(this.changeTab,
-      {this.invite, this.interviewCouponList, this.newUserCouponList});
+      {this.invite, this.interviewCouponList, this.firstLoginCouponList});
 
   @override
   State<StatefulWidget> createState() {
@@ -75,7 +75,7 @@ class _HomePage extends State<HomePage> 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<HomePage> with AutomaticKeepAliveClientMixin {
       showInvite = false;
     }
     if (showNew) {
-      newShowAlertDialog(widget.newUserCouponList);
+      newShowAlertDialog(widget.firstLoginCouponList);
       showNew = false;
     }
   }

lib/login/login_page.dart

@@ -342,7 +342,7 @@ class _MyLoginPageState extends State<LoginPage> 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 {

lib/main_page.dart

@@ -82,15 +82,15 @@ class _MainPage extends State<MainPage> 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 = <Widget>[
@@ -99,7 +99,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
         setState(() {
           pageController.jumpToPage(index);
         });
-      },invite:invite,interviewCouponList:interviewCouponList,newUserCouponList:newUserCouponList,),
+      },invite:invite,interviewCouponList:interviewCouponList,firstLoginCouponList:firstLoginCouponList,),
       // MainHomePage(),
       UnionPage(),
       CommunityPage(),

lib/retrofit/data/login_info.dart

@@ -1,15 +1,18 @@
-/// 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> interviewCouponList,
-    List<NewUserCouponList> newUserCouponList,}){
+      dynamic newUserCouponList,
+      List<FirstLoginCouponList> firstLoginCouponList,}){
     _authInfo = authInfo;
     _interviewCouponList = interviewCouponList;
     _newUserCouponList = newUserCouponList;
+    _firstLoginCouponList = firstLoginCouponList;
 }
 
   LoginInfo.fromJson(dynamic json) {
@@ -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> _interviewCouponList;
-  List<NewUserCouponList> _newUserCouponList;
+  dynamic _newUserCouponList;
+  List<FirstLoginCouponList> _firstLoginCouponList;
 
   AuthInfo get authInfo => _authInfo;
   List<InterviewCouponList> get interviewCouponList => _interviewCouponList;
-  List<NewUserCouponList> get newUserCouponList => _newUserCouponList;
+  dynamic get newUserCouponList => _newUserCouponList;
+  List<FirstLoginCouponList> get firstLoginCouponList => _firstLoginCouponList;
 
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
@@ -43,48 +49,49 @@ 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({
+class FirstLoginCouponList {
+  FirstLoginCouponList({
       String id,
       String createTime,
       String createUser,
@@ -149,7 +156,7 @@ class NewUserCouponList {
     _number = number;
 }
 
-  NewUserCouponList.fromJson(dynamic json) {
+  FirstLoginCouponList.fromJson(dynamic json) {
     _id = json['id'];
     _createTime = json['createTime'];
     _createUser = json['createUser'];
@@ -291,36 +298,36 @@ 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 {
@@ -531,18 +538,18 @@ 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({

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;

lib/store/store_view/product_sku.dart

@@ -355,15 +355,23 @@ class _ProductSku extends State<ProductSku> {
         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),
+            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,
+              ),
+            ),
           ),
         ],
       ),

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> newUserCouponList;
+  final List<FirstLoginCouponList> firstLoginCouponList;
 
-  NewPeopleReward(this.newUserCouponList);
+  NewPeopleReward(this.firstLoginCouponList);
 
   @override
   State<StatefulWidget> createState() {
@@ -93,22 +93,22 @@ class _NewPeopleReward extends State<NewPeopleReward> {
   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<NewPeopleReward> {
                 ),
                 TextSpan(
                   text: double.tryParse(
-                              "${newUserCouponList.discountAmount}" ?? "0")
+                              "${firstLoginCouponList.discountAmount}" ?? "0")
                           .toInt()
                           .toString() ??
                       "",
@@ -149,13 +149,13 @@ class _NewPeopleReward extends State<NewPeopleReward> {
             ),
           ),
                 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<NewPeopleReward> {
                           ),
                         ),
                         Text(
-                          newUserCouponList.couponName,
+                          firstLoginCouponList.couponName,
                           overflow: TextOverflow.ellipsis,
                           maxLines: 2,
                           style: TextStyle(
@@ -175,9 +175,9 @@ class _NewPeopleReward extends State<NewPeopleReward> {
                           ),
                         ),
                         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(

lib/web/web_view/comment_list.dart

@@ -139,7 +139,6 @@ class CommentListState extends State<CommentList> {
                 ),
               if (memberList != null && memberList.length > 0)
                 Container(
-                  height: commentHeight,
                   decoration: BoxDecoration(
                     color: Color(0xFFF2F2F2),
                     boxShadow: [
@@ -152,7 +151,7 @@ class CommentListState extends State<CommentList> {
                     ],
                   ),
                   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(