Browse Source

头像更改

null_safety
w-R 3 years ago
parent
commit
3f0247609c
  1. 42
      lib/home/home_page.dart
  2. 4
      lib/mine/mine_page.dart
  3. 2
      lib/mine/vip_card_page.dart
  4. 4
      lib/mine/vip_detail_page.dart
  5. 0
      lib/retrofit/data/member_comment_list.dart
  6. 168
      lib/retrofit/data/vip_card.dart
  7. 2
      lib/union/store_details_page.dart
  8. 6
      lib/view_widget/hot_item.dart

42
lib/home/home_page.dart

@ -629,48 +629,6 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
);
}
// ban() {
// return Container(
// // height: 90.h,
// margin: EdgeInsets.only(bottom: 18.h),
// child: AspectRatio(
// aspectRatio:4/1,
// child: Swiper(
// viewportFraction: 0.5,
// scale: 0.5,
// // loop: false,
// // scrollDirection: Axis.horizontal,
// itemBuilder: (context, position) {
// return Container(
// height: 50.h,
// width: 106.w,
// margin: EdgeInsets.symmetric(horizontal: 3.w, vertical: 15.h),
// decoration: BoxDecoration(
// color: Colors.white,
// boxShadow: [
// BoxShadow(
// color: Colors.black.withAlpha(37),
// offset: Offset(0, 2),
// blurRadius: 5,
// spreadRadius: 0,
// )
// ],
// borderRadius: BorderRadius.circular(8),
// ),
// child: MImage(
// brandData != null ? brandData[position].image : "",
// radius: BorderRadius.circular(8),
// fit: BoxFit.cover,
// errorSrc: "assets/image/default_2_1.png",
// fadeSrc: "assets/image/default_2_1.png",
// ),
// );
// },
// itemCount: bannerData != null ? bannerData.length : 0),
// ),
// );
// }
banner() {
return Container(
child: AspectRatio(

4
lib/mine/mine_page.dart

@ -499,7 +499,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
Text(
S.of(context).kaquan,
style: TextStyle(
fontWeight: FontWeight.bold,
fontWeight: FontWeight.w500,
fontSize: 16.sp,
color: Color(0xFF353535),
),
@ -542,7 +542,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
Text(
S.of(context).dingdan,
style: TextStyle(
fontWeight: FontWeight.w600,
fontWeight: FontWeight.w500,
fontSize: 16.sp,
color: Color(0xFF353535),
),

2
lib/mine/vip_card_page.dart

@ -145,7 +145,7 @@ class _VipCardPage extends State<VipCardPage> {
Row(
children: [
MImage(
vipCard.tenantLogo,
(vipCard?.storeList?.length ?? 0) > 0 ? vipCard.storeList[0].logo : "",
width: 54.w,
height: 54.h,
fit: BoxFit.cover,

4
lib/mine/vip_detail_page.dart

@ -192,7 +192,9 @@ class _VipDetailPage extends State<VipDetailPage> {
Row(
children: [
MImage(
vipCard != null ? vipCard.tenantLogo : "",
(vipCard?.storeList?.length ?? 0) > 0
? vipCard.storeList[0].logo
: "",
width: 40.w,
height: 40.h,
radius: BorderRadius.circular(4),

0
lib/retrofit/data/memberCommentList.dart → lib/retrofit/data/member_comment_list.dart

168
lib/retrofit/data/vip_card.dart

@ -1,4 +1,3 @@
import 'StoreListBean.dart';
/// id : "1393457755217461248"
/// createTime : "2021-05-15 14:46:33"
@ -129,4 +128,171 @@ class VipCard {
"tenantLogo": tenantLogo,
"storeList": storeList,
};
}
/// id : "1381798825072525312"
/// createTime : "2021-04-13 10:38:07"
/// createUser : "1"
/// updateTime : "2021-06-12 21:20:22"
/// updateUser : "1381798824988639232"
/// tenantCode : "1\nI/flutter ( 6658): 180"
/// useErp : false
/// openStartTime : "09:30:00"
/// openEndTime : "18:30:00"
/// storeName : "稻田里的书店"
/// nickName : ""
/// logo : "https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png"
/// shipAddress : "上海市崇明区东风农场东风公路833弄1-22号C2-C3"
/// remark : ""
/// mobile : "13554204268"
/// longitude : "121.4789730000"
/// latitude : "31.7092220000"
/// refundAddress : null
/// refundTel : null
/// refundContact : null
/// isAutoSendRefundAddress : 1
/// province : "上海市"
/// city : "上海市"
/// district : "崇明区"
/// address : "上海市崇明区稻田里的书店咖啡茶饮区东平镇东风公路833号东风农场C2"
/// headName : ""
/// headMobile : "18672789329"
/// businessService : "WIFI,免费停车"
/// businessType : ""
/// deliveryInfo : null
/// miniParam : null
/// is_delete : 0
/// posType : {"desc":"快消餐饮","code":"FASTSTORE"}
class StoreListBean {
String id;
String createTime;
String createUser;
String updateTime;
String updateUser;
String tenantCode;
bool useErp;
String openStartTime;
String openEndTime;
String storeName;
String nickName;
String logo;
String shipAddress;
String remark;
String mobile;
String longitude;
String latitude;
dynamic refundAddress;
dynamic refundTel;
dynamic refundContact;
int isAutoSendRefundAddress;
String province;
String city;
String district;
String address;
String headName;
String headMobile;
String businessService;
String businessType;
dynamic deliveryInfo;
dynamic miniParam;
int isDelete;
PosTypeBean posType;
static StoreListBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
StoreListBean storeListBean = StoreListBean();
storeListBean.id = map['id'];
storeListBean.createTime = map['createTime'];
storeListBean.createUser = map['createUser'];
storeListBean.updateTime = map['updateTime'];
storeListBean.updateUser = map['updateUser'];
storeListBean.tenantCode = map['tenantCode'];
storeListBean.useErp = map['useErp'];
storeListBean.openStartTime = map['openStartTime'];
storeListBean.openEndTime = map['openEndTime'];
storeListBean.storeName = map['storeName'];
storeListBean.nickName = map['nickName'];
storeListBean.logo = map['logo'];
storeListBean.shipAddress = map['shipAddress'];
storeListBean.remark = map['remark'];
storeListBean.mobile = map['mobile'];
storeListBean.longitude = map['longitude'];
storeListBean.latitude = map['latitude'];
storeListBean.refundAddress = map['refundAddress'];
storeListBean.refundTel = map['refundTel'];
storeListBean.refundContact = map['refundContact'];
storeListBean.isAutoSendRefundAddress = map['isAutoSendRefundAddress'];
storeListBean.province = map['province'];
storeListBean.city = map['city'];
storeListBean.district = map['district'];
storeListBean.address = map['address'];
storeListBean.headName = map['headName'];
storeListBean.headMobile = map['headMobile'];
storeListBean.businessService = map['businessService'];
storeListBean.businessType = map['businessType'];
storeListBean.deliveryInfo = map['deliveryInfo'];
storeListBean.miniParam = map['miniParam'];
storeListBean.isDelete = map['is_delete'];
storeListBean.posType = PosTypeBean.fromMap(map['posType']);
return storeListBean;
}
Map toJson() => {
"id": id,
"createTime": createTime,
"createUser": createUser,
"updateTime": updateTime,
"updateUser": updateUser,
"tenantCode": tenantCode,
"useErp": useErp,
"openStartTime": openStartTime,
"openEndTime": openEndTime,
"storeName": storeName,
"nickName": nickName,
"logo": logo,
"shipAddress": shipAddress,
"remark": remark,
"mobile": mobile,
"longitude": longitude,
"latitude": latitude,
"refundAddress": refundAddress,
"refundTel": refundTel,
"refundContact": refundContact,
"isAutoSendRefundAddress": isAutoSendRefundAddress,
"province": province,
"city": city,
"district": district,
"address": address,
"headName": headName,
"headMobile": headMobile,
"businessService": businessService,
"businessType": businessType,
"deliveryInfo": deliveryInfo,
"miniParam": miniParam,
"is_delete": isDelete,
"posType": posType,
};
}
/// code : "NORMALSTORE"
/// desc : ""
class PosTypeBean {
String code;
String desc;
static PosTypeBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
PosTypeBean posTypeBean = PosTypeBean();
posTypeBean.code = map['code'];
posTypeBean.desc = map['desc'];
return posTypeBean;
}
Map toJson() => {
"code": code,
"desc": desc,
};
}

2
lib/union/store_details_page.dart

@ -7,7 +7,7 @@ import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_html/image_render.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/retrofit/data/memberCommentList.dart';
import 'package:huixiang/retrofit/data/member_comment_list.dart';
import 'package:huixiang/retrofit/data/activity.dart';
import 'package:huixiang/retrofit/data/article.dart';
import 'package:huixiang/retrofit/data/base_data.dart';

6
lib/view_widget/hot_item.dart

@ -166,9 +166,9 @@ class HotArticleItem extends StatelessWidget {
color: Color(0xFFB2B2B2),
),
),
// SizedBox(
// width: 5.w,
// ),
SizedBox(
width: 5.w,
),
Container(
alignment: Alignment.topRight,
child: Row(

Loading…
Cancel
Save