fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

ff_new
fmk 3 years ago
parent
b81bfaf993 83b8b98098
commit
9b51dc6ad5
11 changed files with 214 additions and 166 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      lib/community/community_page.dart
  2. 4
      lib/community/community_view/community_dynamic.dart
  3. 31
      lib/community/release_dynamic.dart
  4. 8
      lib/home/home_page.dart
  5. 2
      lib/login/login_page.dart
  6. 8
      lib/main_page.dart
  7. 257
      lib/retrofit/data/login_info.dart
  8. 2
      lib/retrofit/retrofit_api.g.dart
  9. 24
      lib/store/store_view/product_sku.dart
  10. 26
      lib/view_widget/new_people_reward.dart
  11. 3
      lib/web/web_view/comment_list.dart

15
lib/community/community_page.dart
Unescape View File

@ -38,14 +38,15 @@ class _CommunityPage extends State<CommunityPage>
} }
_toRelease() async { _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'); 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 @override

4
lib/community/community_view/community_dynamic.dart
Unescape View File

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

31
lib/community/release_dynamic.dart
Unescape View File

@ -85,6 +85,37 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
child: Column( child: Column(
children: [ children: [
buildEdit(), 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( Expanded(
child: GridView.builder( child: GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(

8
lib/home/home_page.dart
Unescape View File

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

2
lib/login/login_page.dart
Unescape View File

@ -342,7 +342,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Navigator.of(context).pushNamedAndRemoveUntil( Navigator.of(context).pushNamedAndRemoveUntil(
'/router/main_page', '/router/main_page',
(route) => false,arguments:{"invite":invite,"interviewCouponList":value.data.interviewCouponList, (route) => false,arguments:{"invite":invite,"interviewCouponList":value.data.interviewCouponList,
"newUserCouponList":value.data.newUserCouponList}); "firstLoginCouponList":value.data.firstLoginCouponList});
EasyLoading.dismiss(); EasyLoading.dismiss();
} else { } else {

8
lib/main_page.dart
Unescape View File

@ -82,15 +82,15 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
String invite = ""; String invite = "";
var interviewCouponList; var interviewCouponList;
var newUserCouponList; var firstLoginCouponList;
if(widget.arguments != null && (widget.arguments["invite"]??"") != "" if(widget.arguments != null && (widget.arguments["invite"]??"") != ""
&& widget.arguments["interviewCouponList"] != null ){ && widget.arguments["interviewCouponList"] != null ){
invite = widget.arguments["invite"]; invite = widget.arguments["invite"];
interviewCouponList = widget.arguments["interviewCouponList"]; interviewCouponList = widget.arguments["interviewCouponList"];
} }
if(widget.arguments != null && widget.arguments["newUserCouponList"] != null ){ if(widget.arguments != null && widget.arguments["firstLoginCouponList"] != null ){
newUserCouponList = widget.arguments["newUserCouponList"]; firstLoginCouponList = widget.arguments["firstLoginCouponList"];
} }
_widgetOptions = <Widget>[ _widgetOptions = <Widget>[
@ -99,7 +99,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
setState(() { setState(() {
pageController.jumpToPage(index); pageController.jumpToPage(index);
}); });
},invite:invite,interviewCouponList:interviewCouponList,newUserCouponList:newUserCouponList,), },invite:invite,interviewCouponList:interviewCouponList,firstLoginCouponList:firstLoginCouponList,),
// MainHomePage(), // MainHomePage(),
UnionPage(), UnionPage(),
CommunityPage(), CommunityPage(),

257
lib/retrofit/data/login_info.dart
Unescape View File

@ -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"} /// 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":"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}] /// 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 : [{"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}] /// 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 { class LoginInfo {
LoginInfo({ LoginInfo({
AuthInfo authInfo, AuthInfo authInfo,
List<InterviewCouponList> interviewCouponList, List<InterviewCouponList> interviewCouponList,
List<NewUserCouponList> newUserCouponList,}){ dynamic newUserCouponList,
List<FirstLoginCouponList> firstLoginCouponList,}){
_authInfo = authInfo; _authInfo = authInfo;
_interviewCouponList = interviewCouponList; _interviewCouponList = interviewCouponList;
_newUserCouponList = newUserCouponList; _newUserCouponList = newUserCouponList;
} _firstLoginCouponList = firstLoginCouponList;
}
LoginInfo.fromJson(dynamic json) { LoginInfo.fromJson(dynamic json) {
_authInfo = json['authInfo'] != null ? AuthInfo.fromJson(json['authInfo']) : null; _authInfo = json['authInfo'] != null ? AuthInfo.fromJson(json['authInfo']) : null;
@ -20,20 +23,23 @@ class LoginInfo {
_interviewCouponList.add(InterviewCouponList.fromJson(v)); _interviewCouponList.add(InterviewCouponList.fromJson(v));
}); });
} }
if (json['newUserCouponList'] != null) { _newUserCouponList = json['newUserCouponList'];
_newUserCouponList = []; if (json['firstLoginCouponList'] != null) {
json['newUserCouponList'].forEach((v) { _firstLoginCouponList = [];
_newUserCouponList.add(NewUserCouponList.fromJson(v)); json['firstLoginCouponList'].forEach((v) {
_firstLoginCouponList.add(FirstLoginCouponList.fromJson(v));
}); });
} }
} }
AuthInfo _authInfo; AuthInfo _authInfo;
List<InterviewCouponList> _interviewCouponList; List<InterviewCouponList> _interviewCouponList;
List<NewUserCouponList> _newUserCouponList; dynamic _newUserCouponList;
List<FirstLoginCouponList> _firstLoginCouponList;
AuthInfo get authInfo => _authInfo; AuthInfo get authInfo => _authInfo;
List<InterviewCouponList> get interviewCouponList => _interviewCouponList; List<InterviewCouponList> get interviewCouponList => _interviewCouponList;
List<NewUserCouponList> get newUserCouponList => _newUserCouponList; dynamic get newUserCouponList => _newUserCouponList;
List<FirstLoginCouponList> get firstLoginCouponList => _firstLoginCouponList;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
@ -43,79 +49,80 @@ class LoginInfo {
if (_interviewCouponList != null) { if (_interviewCouponList != null) {
map['interviewCouponList'] = _interviewCouponList.map((v) => v.toJson()).toList(); map['interviewCouponList'] = _interviewCouponList.map((v) => v.toJson()).toList();
} }
if (_newUserCouponList != null) { map['newUserCouponList'] = _newUserCouponList;
map['newUserCouponList'] = _newUserCouponList.map((v) => v.toJson()).toList(); if (_firstLoginCouponList != null) {
map['firstLoginCouponList'] = _firstLoginCouponList.map((v) => v.toJson()).toList();
} }
return map; return map;
} }
} }
/// id : "1463398002331746304" /// id : "1484456566340976640"
/// createTime : "2021-11-24 14:44:07" /// createTime : "2022-01-21 17:23:20"
/// createUser : "1333246101196636160" /// createUser : "1333246101196636160"
/// updateTime : "2021-11-24 14:44:07" /// updateTime : "2022-01-21 17:23:20"
/// updateUser : "1333246101196636160" /// updateUser : "1333246101196636160"
/// storeId : "0" /// storeId : "1333246101343436800"
/// couponName : "满10-2" /// couponName : "新会员"
/// bizType : 1 /// bizType : 1
/// allProduct : true /// allProduct : true
/// productSkuId : [] /// productSkuId : []
/// fullAmount : "10.00" /// fullAmount : "14.00"
/// discountAmount : "2.00" /// discountAmount : "7.00"
/// fullNumber : 1 /// fullNumber : 1
/// discountPercent : 100 /// discountPercent : 100
/// sellPrice : "0.00" /// sellPrice : "0.00"
/// sellCount : 0 /// sellCount : 0
/// bizId : "" /// bizId : ""
/// publishStartTime : "2021-11-24 12:00:00" /// publishStartTime : "2022-01-01 00:00:00"
/// publishEndTime : "2021-11-30 12:00:00" /// publishEndTime : "2022-01-31 00:00:00"
/// useStartTime : "2021-11-24 12:00:00" /// useStartTime : "2022-01-01 00:00:00"
/// useEndTime : "2021-11-30 12:00:00" /// useEndTime : "2022-02-01 00:00:00"
/// promotionId : "0" /// promotionId : "0"
/// dateOrDay : false /// dateOrDay : false
/// startAfterDays : 0 /// startAfterDays : 0
/// daysValidate : 0 /// daysValidate : 0
/// businessType : 0 /// businessType : 0
/// centreDisplay : true /// centreDisplay : false
/// tenantCode : "1175" /// tenantCode : "1175"
/// isDelete : 0 /// isDelete : 0
/// storeName : "海峡姐妹奶茶店" /// storeName : "海峡姐妹茶（汉街店）"
/// number : 1 /// number : 1
class NewUserCouponList { class FirstLoginCouponList {
NewUserCouponList({ FirstLoginCouponList({
String id, String id,
String createTime, String createTime,
String createUser, String createUser,
String updateTime, String updateTime,
String updateUser, String updateUser,
String storeId, String storeId,
String couponName, String couponName,
int bizType, int bizType,
bool allProduct, bool allProduct,
List<dynamic> productSkuId, List<dynamic> productSkuId,
String fullAmount, String fullAmount,
String discountAmount, String discountAmount,
int fullNumber, int fullNumber,
int discountPercent, int discountPercent,
String sellPrice, String sellPrice,
int sellCount, int sellCount,
String bizId, String bizId,
String publishStartTime, String publishStartTime,
String publishEndTime, String publishEndTime,
String useStartTime, String useStartTime,
String useEndTime, String useEndTime,
String promotionId, String promotionId,
bool dateOrDay, bool dateOrDay,
int startAfterDays, int startAfterDays,
int daysValidate, int daysValidate,
int businessType, int businessType,
bool centreDisplay, bool centreDisplay,
String tenantCode, String tenantCode,
int isDelete, int isDelete,
String storeName, String storeName,
int number,}){ int number,}){
_id = id; _id = id;
_createTime = createTime; _createTime = createTime;
_createUser = createUser; _createUser = createUser;
@ -147,9 +154,9 @@ class NewUserCouponList {
_isDelete = isDelete; _isDelete = isDelete;
_storeName = storeName; _storeName = storeName;
_number = number; _number = number;
} }
NewUserCouponList.fromJson(dynamic json) { FirstLoginCouponList.fromJson(dynamic json) {
_id = json['id']; _id = json['id'];
_createTime = json['createTime']; _createTime = json['createTime'];
_createUser = json['createUser']; _createUser = json['createUser'];
@ -291,71 +298,71 @@ class NewUserCouponList {
} }
/// id : "1463398002331746304" /// id : "1478615682588344320"
/// createTime : "2021-11-24 14:44:07" /// createTime : "2022-01-05 14:33:45"
/// createUser : "1333246101196636160" /// createUser : "1333246101196636160"
/// updateTime : "2021-11-24 14:44:07" /// updateTime : "2022-01-05 14:33:45"
/// updateUser : "1333246101196636160" /// updateUser : "1333246101196636160"
/// storeId : "0" /// storeId : "0"
/// couponName : "满10-2" /// couponName : "新品10-5"
/// bizType : 1 /// bizType : 1
/// allProduct : true /// allProduct : true
/// productSkuId : [] /// productSkuId : []
/// fullAmount : "10.00" /// fullAmount : "10.00"
/// discountAmount : "2.00" /// discountAmount : "5.00"
/// fullNumber : 1 /// fullNumber : 1
/// discountPercent : 100 /// discountPercent : 100
/// sellPrice : "0.00" /// sellPrice : "0.00"
/// sellCount : 0 /// sellCount : 0
/// bizId : "" /// bizId : ""
/// publishStartTime : "2021-11-24 12:00:00" /// publishStartTime : "2022-01-01 00:00:00"
/// publishEndTime : "2021-11-30 12:00:00" /// publishEndTime : "2022-01-31 00:00:00"
/// useStartTime : "2021-11-24 12:00:00" /// useStartTime : "2022-01-02 00:00:00"
/// useEndTime : "2021-11-30 12:00:00" /// useEndTime : "2022-01-30 00:00:00"
/// promotionId : "0" /// promotionId : "0"
/// dateOrDay : false /// dateOrDay : false
/// startAfterDays : 0 /// startAfterDays : 0
/// daysValidate : 0 /// daysValidate : 0
/// businessType : 0 /// businessType : 0
/// centreDisplay : true /// centreDisplay : false
/// tenantCode : "1175" /// tenantCode : "1175"
/// isDelete : 0 /// isDelete : 0
/// storeName : "海峡姐妹奶茶店" /// storeName : "海峡姐妹茶"
/// number : 1 /// number : 1
class InterviewCouponList { class InterviewCouponList {
InterviewCouponList({ InterviewCouponList({
String id, String id,
String createTime, String createTime,
String createUser, String createUser,
String updateTime, String updateTime,
String updateUser, String updateUser,
String storeId, String storeId,
String couponName, String couponName,
int bizType, int bizType,
bool allProduct, bool allProduct,
List<dynamic> productSkuId, List<dynamic> productSkuId,
String fullAmount, String fullAmount,
String discountAmount, String discountAmount,
int fullNumber, int fullNumber,
int discountPercent, int discountPercent,
String sellPrice, String sellPrice,
int sellCount, int sellCount,
String bizId, String bizId,
String publishStartTime, String publishStartTime,
String publishEndTime, String publishEndTime,
String useStartTime, String useStartTime,
String useEndTime, String useEndTime,
String promotionId, String promotionId,
bool dateOrDay, bool dateOrDay,
int startAfterDays, int startAfterDays,
int daysValidate, int daysValidate,
int businessType, int businessType,
bool centreDisplay, bool centreDisplay,
String tenantCode, String tenantCode,
int isDelete, int isDelete,
String storeName, String storeName,
int number,}){ int number,}){
_id = id; _id = id;
_createTime = createTime; _createTime = createTime;
_createUser = createUser; _createUser = createUser;
@ -387,7 +394,7 @@ class InterviewCouponList {
_isDelete = isDelete; _isDelete = isDelete;
_storeName = storeName; _storeName = storeName;
_number = number; _number = number;
} }
InterviewCouponList.fromJson(dynamic json) { InterviewCouponList.fromJson(dynamic json) {
_id = json['id']; _id = json['id'];
@ -531,33 +538,33 @@ class InterviewCouponList {
} }
/// token : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJhY2NvdW50IjoiMTU2MTU2OTg3NDUiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.KHiw51SQ2RkARJhGKFTXgI7IrYXOhN-YqFZCwJ1jkEc" /// token : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5Zue5LmhXzg4ODg4OCIsInRva2VuX3R5cGUiOiJ0b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJhY2NvdW50IjoiMTU0NDc4OTg3NTYiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.dIGWaCR6uuJ4YcgTfEEeVGJtOmpAlLaxQ2sEnd_9_zw"
/// tokenType : "token" /// tokenType : "token"
/// refreshToken : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0NzA3MDI1OTIzMDM1NjI3NTIiLCJleHAiOjE2NDIwNjk3OTksIm5iZiI6MTYzOTQ3Nzc5OX0.jjI0dTviahPq6p4J_tx_Sn-Fg-q51kE3WPpqdVcEIMw" /// refreshToken : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0ODQ0Nzc5NDQ4Mzg0ODgwNjQiLCJleHAiOjE2NDUzNTQwOTksIm5iZiI6MTY0Mjc2MjA5OX0.ZrG-JCemN_HtFzE512311Tksh2o21ywgjHhhGeXXWrE"
/// name : "回乡_888888" /// name : "回乡_888888"
/// account : "15615698745" /// account : "15447898756"
/// avatar : null /// avatar : null
/// workDescribe : null /// workDescribe : null
/// userId : "1470702592303562752" /// userId : "1484477944838488064"
/// userType : "PLATFORM_APP" /// userType : "PLATFORM_APP"
/// expire : "2592000" /// expire : "2592000"
/// expiration : "2022-01-13 18:29:59" /// expiration : "2022-02-20 18:48:19"
/// mobile : "15615698745" /// mobile : "15447898756"
class AuthInfo { class AuthInfo {
AuthInfo({ AuthInfo({
String token, String token,
String tokenType, String tokenType,
String refreshToken, String refreshToken,
String name, String name,
String account, String account,
dynamic avatar, dynamic avatar,
dynamic workDescribe, dynamic workDescribe,
String userId, String userId,
String userType, String userType,
String expire, String expire,
String expiration, String expiration,
String mobile,}){ String mobile,}){
_token = token; _token = token;
_tokenType = tokenType; _tokenType = tokenType;
_refreshToken = refreshToken; _refreshToken = refreshToken;
@ -570,7 +577,7 @@ class AuthInfo {
_expire = expire; _expire = expire;
_expiration = expiration; _expiration = expiration;
_mobile = mobile; _mobile = mobile;
} }
AuthInfo.fromJson(dynamic json) { AuthInfo.fromJson(dynamic json) {
_token = json['token']; _token = json['token'];

2
lib/retrofit/retrofit_api.g.dart
Unescape View File

@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService { class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) { _ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio'); ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.236:8766/app/'; baseUrl ??= 'http://192.168.10.142:8766/app/';
} }
final Dio _dio; final Dio _dio;

24
lib/store/store_view/product_sku.dart
Unescape View File

@ -355,15 +355,23 @@ class _ProductSku extends State<ProductSku> {
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RoundButton( Container(
width: 68.w, width: 70.w,
height: 29.h, height: 29.h,
text: name, alignment: Alignment.center,
textColor: !isCheck ? Color(0xFF727272) : Colors.white, decoration: BoxDecoration(
fontWeight: MyFontWeight.regular, color: !isCheck ? Color(0xFFE5E5E5) : Color(0xFF32A060),
radius: 4, borderRadius: BorderRadius.all(Radius.circular(4)),
backgroup: !isCheck ? Color(0xFFE5E5E5) : Color(0xFF32A060), ),
fontSize: 12.sp, child:Text(
name,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color:!isCheck ? Color(0xFF727272) : Colors.white,
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
),
),
), ),
], ],
), ),

26
lib/view_widget/new_people_reward.dart
Unescape View File

@ -5,9 +5,9 @@ import 'package:huixiang/retrofit/data/login_info.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
class NewPeopleReward extends StatefulWidget { class NewPeopleReward extends StatefulWidget {
final List<NewUserCouponList> newUserCouponList; final List<FirstLoginCouponList> firstLoginCouponList;
NewPeopleReward(this.newUserCouponList); NewPeopleReward(this.firstLoginCouponList);
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -93,22 +93,22 @@ class _NewPeopleReward extends State<NewPeopleReward> {
Widget reward() { Widget reward() {
return ListView.builder( return ListView.builder(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
itemCount: widget.newUserCouponList.length, itemCount: widget.firstLoginCouponList.length,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
itemBuilder: (context, position) { itemBuilder: (context, position) {
return GestureDetector( return GestureDetector(
onTap: () {}, onTap: () {},
child: rewardItem(widget.newUserCouponList[position]), child: rewardItem(widget.firstLoginCouponList[position]),
); );
}, },
); );
} }
Widget rewardItem(NewUserCouponList newUserCouponList) { Widget rewardItem(FirstLoginCouponList firstLoginCouponList) {
return Container( return Container(
height: 69.h, height:80.h,
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
@ -135,7 +135,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
), ),
TextSpan( TextSpan(
text: double.tryParse( text: double.tryParse(
"${newUserCouponList.discountAmount}" ?? "0") "${firstLoginCouponList.discountAmount}" ?? "0")
.toInt() .toInt()
.toString() ?? .toString() ??
"", "",
@ -149,13 +149,13 @@ class _NewPeopleReward extends State<NewPeopleReward> {
), ),
), ),
Expanded(child:Padding( Expanded(child:Padding(
padding: EdgeInsets.only(top: 4, bottom: 4,left:10), padding: EdgeInsets.only(top: 4, bottom: 4,left:30),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
newUserCouponList.storeName, firstLoginCouponList.storeName,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(
@ -165,7 +165,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
), ),
), ),
Text( Text(
newUserCouponList.couponName, firstLoginCouponList.couponName,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(
@ -175,9 +175,9 @@ class _NewPeopleReward extends State<NewPeopleReward> {
), ),
), ),
Text( Text(
"有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") "有效期至:${(firstLoginCouponList.useEndTime != null && firstLoginCouponList.useEndTime != "")
? newUserCouponList.useEndTime.split(" ")[0] ? firstLoginCouponList.useEndTime.split(" ")[0]
: "$newUserCouponList.useEndTime"}", : "$firstLoginCouponList.useEndTime"}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(

3
lib/web/web_view/comment_list.dart
Unescape View File

@ -139,7 +139,6 @@ class CommentListState extends State<CommentList> {
), ),
if (memberList != null && memberList.length > 0) if (memberList != null && memberList.length > 0)
Container( Container(
height: commentHeight,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFF2F2F2), color: Color(0xFFF2F2F2),
boxShadow: [ boxShadow: [
@ -152,7 +151,7 @@ class CommentListState extends State<CommentList> {
], ],
), ),
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: 22.h), padding: EdgeInsets.only(top: 22.h, bottom: 22.h),
child: Text( child: Text(
S.of(context).yixiansquanbupinglun, S.of(context).yixiansquanbupinglun,
style: TextStyle( style: TextStyle(

Write Preview
Loading…
Cancel
Save