xt / Flutter-ReserveApp · Commits

Go to a project

Commit a8fbe793cbfebf8b916b4452d28e19bd5c5113aa

Authored by wdn127929
1 parent 012ea817

屏蔽未开发功能

Inline Side-by-side
Showing 12 changed files with 295 additions and 282 deletions
... ... @@ -164,10 +164,10 @@ class _CouponPageState extends State<CouponPage> with TickerProviderStateMixin {
Navigator.of(context).pop();
},
rightImgName: 'scan.png',
onTapRight: () {
_scan();
},
// rightImgName: 'scan.png',
// onTapRight: () {
// _scan();
// },
),
body: WillPopScope(
onWillPop: () {
... ...
... ... @@ -2028,7 +2028,7 @@ class InvicationPageState extends State<InvicationPage>
listen: false)
.user
.sellerid,
'id': Provider.of<UserModel>(context,
'uid': Provider.of<UserModel>(context,
listen: false)
.user
.openid,
... ... @@ -2074,65 +2074,65 @@ class InvicationPageState extends State<InvicationPage>
))
: SizedBox(),
//餐单类型
enterMore
? Container(
margin: EdgeInsets.only(
// top: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(40)),
height: ScreenUtil().setWidth(68),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(16)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(12)),
// color: Colors.red,
border: Border.all(
width: ScreenUtil().setWidth(2),
color: MyColours.color_DBDBDB)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
'餐单类型',
//输入文本的样式
style: TextStyle(
fontSize: ScreenUtil().setSp(28),
color: MyColours.color_353535),
),
InkWell(
onTap: () {
FocusScope.of(context)
.requestFocus(FocusNode()); //隐藏键盘
DialogUtil.showSelectCusmanDialog(
context, styleList, (value) async {
if (value != null) {
styleIndex = value.first;
styleShow = styleList[styleIndex];
setState(() {});
}
}, selecteds: [styleIndex ?? 0])
.then((value) {});
},
child: Row(children: [
Text(
styleShow,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(28),
),
),
Image.asset(Utils.getImgPath('quan_down_f'),
width: ScreenUtil().setWidth(28),
height: ScreenUtil().setWidth(28)),
]),
)
],
))
: SizedBox(),
// enterMore
// ? Container(
// margin: EdgeInsets.only(
// // top: ScreenUtil().setWidth(40),
// bottom: ScreenUtil().setWidth(40)),
// height: ScreenUtil().setWidth(68),
// padding: EdgeInsets.symmetric(
// horizontal: ScreenUtil().setWidth(16)),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(
// ScreenUtil().setWidth(12)),
// // color: Colors.red,
// border: Border.all(
// width: ScreenUtil().setWidth(2),
// color: MyColours.color_DBDBDB)),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Text(
// '餐单类型',
// //输入文本的样式
// style: TextStyle(
// fontSize: ScreenUtil().setSp(28),
// color: MyColours.color_353535),
// ),
// InkWell(
// onTap: () {
// FocusScope.of(context)
// .requestFocus(FocusNode()); //隐藏键盘
// DialogUtil.showSelectCusmanDialog(
// context, styleList, (value) async {
// if (value != null) {
// styleIndex = value.first;
// styleShow = styleList[styleIndex];
// setState(() {});
// }
// }, selecteds: [styleIndex ?? 0])
// .then((value) {});
// },
// child: Row(children: [
// Text(
// styleShow,
// style: TextStyle(
// color: MyColours.color_515151,
// fontSize: ScreenUtil().setSp(28),
// ),
// ),
// Image.asset(Utils.getImgPath('quan_down_f'),
// width: ScreenUtil().setWidth(28),
// height: ScreenUtil().setWidth(28)),
// ]),
// )
// ],
// ))
// : SizedBox(),
//备注：
Column(
... ...
... ... @@ -173,7 +173,7 @@
// ///获取微信登录access_token
// _getAccessToken(String code) async {
// Response response = await DioUtil.getInstance().getDio().get(
// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code");
// LogUtil.v("access_token:${response.toString()}");
// Map<String, dynamic> responseData = json.decode(response.data.toString());
// if (responseData["errcode"] != null) {
... ...
... ... @@ -434,35 +434,40 @@ class _MyContactListPageState extends State<MyContactListPage> {
),
child: Row(
children: [
model.rnameStr != null && model.rnameStr != ''
? Row(
// crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
width: w(72),
child: Text(
model.rnameStr,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(36),
fontWeight: FontWeight.bold),
)),
HEmptyView(10),
Text(
model.sexStr != '' && model.sexStr != null
? '${model.sexStr}'
: '',
style: TextStyle(
Row(
// crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
width: w(72),
child: Text(
model.rnameStr != null && model.rnameStr != ''
? model.rnameStr
: '',
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
fontSize: ScreenUtil().setSp(36),
fontWeight: FontWeight.bold),
)),
HEmptyView(10),
Container(
width: w(26),
child: Text(
model.rnameStr != null &&
model.rnameStr != '' &&
model.sexStr != '' &&
model.sexStr != null
? '${model.sexStr}'
: '',
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
HEmptyView(10),
],
)
: SizedBox(),
)),
HEmptyView(10),
],
),
Spacer(),
Container(
width: w(70),
... ...
... ... @@ -210,7 +210,7 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> {
if (name == nameController.text && nameController.text.endsWith(suffix)) {
return;
}
nameController.text = name + suffix ?? "";
nameController.text = name.trim() == '' || name == null ? '' : name + suffix ?? "";
}
//姓名后缀
... ...
... ... @@ -292,30 +292,33 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(
children: [
Container(
constraints: BoxConstraints(
maxWidth: ScreenUtil().setWidth(260)),
child: Text(
customerProvider.guestInfoSunModel.guest.rnameStr,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
HEmptyView(10),
Container(
child: Text(
customerProvider.guestInfoSunModel.guest.sexStr != ''
? '${customerProvider.guestInfoSunModel.guest.sexStr}'
: '',
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
)),
HEmptyView(6),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '')
Container(
constraints: BoxConstraints(
maxWidth: ScreenUtil().setWidth(260)),
child: Text(
customerProvider.guestInfoSunModel.guest.rnameStr,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(36)),
)),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '')
HEmptyView(10),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '')
Container(
child: Text(
customerProvider.guestInfoSunModel.guest.sexStr != ''
? '${customerProvider.guestInfoSunModel.guest.sexStr}'
: '',
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
)),
if (customerProvider.guestInfoSunModel.guest.rnameStr != '') HEmptyView(6),
Text(
customerProvider.guestInfoSunModel.guest.phone,
overflow: TextOverflow.ellipsis,
... ...
... ... @@ -419,35 +419,40 @@ class _ContactListPageState extends State<ContactListPage> {
),
child: Row(
children: [
model.rnameStr != null && model.rnameStr != ''
? Row(
// crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
width: w(72),
child: Text(
model.rnameStr,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(36),
fontWeight: FontWeight.bold),
)),
HEmptyView(10),
Text(
model.sexStr != '' && model.sexStr != null
? '${model.sexStr}'
: '',
style: TextStyle(
Row(
// crossAxisAlignment: CrossAxisAlignment.end,
children: [
Container(
width: w(72),
child: Text(
model.rnameStr != null && model.rnameStr != ''
? model.rnameStr
: '',
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
fontSize: ScreenUtil().setSp(36),
fontWeight: FontWeight.bold),
)),
HEmptyView(10),
Container(
width: w(26),
child: Text(
model.rnameStr != null &&
model.rnameStr != '' &&
model.sexStr != '' &&
model.sexStr != null
? '${model.sexStr}'
: '',
style: TextStyle(
color: MyColours.color_515151,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(20),
),
HEmptyView(10),
],
)
: SizedBox(),
)),
HEmptyView(10),
],
),
HEmptyView(74),
Container(
width: w(70),
... ...
... ... @@ -273,102 +273,102 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(10),
children: _buildLabelItem(customerProvider.labelList)),
VEmptyView(34),
MyDivider(
double.infinity,
w(1),
color: MyColours.color_DBDBDB,
),
VEmptyView(52),
InkWell(
onTap: () {
setState(() {
swichSync = !swichSync;
});
// _sellerGuestSet();
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('是否与会员系统同步',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32))),
Image.asset(
swichSync
? Utils.getImgPath('f_swich_on')
: Utils.getImgPath('f_swich_off'),
width: ScreenUtil().setWidth(70),
// height: ScreenUtil().setWidth(82),
),
],
),
),
VEmptyView(48),
InkWell(
onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
// DialogUtil.showSelectCusmanDialog(context, memberList,
// (value) {
// if (value != null) {
// setState(() {
// memberIndex = value.first;
// memberShow = memberList[memberIndex];
// });
// }
// }, selecteds: memberIndex == null ? [] : [memberIndex])
// .then((value) {});
},
child: Container(
// height: ScreenUtil().setWidth(60),
padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(50)),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
// color: Colors.red,
width: ScreenUtil().setWidth(150),
height: ScreenUtil().setWidth(35),
child: Text(
'会员系统选择',
style: TextStyle(
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_515151),
),
),
Expanded(
child: Text(
memberShow,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(28),
),
)),
HEmptyView(10),
Image.asset(
Utils.getImgPath(
showLabel ? 'c_arrow_up' : 'c_arrow_down'),
width: ScreenUtil().setWidth(24),
// height: ScreenUtil().setWidth(10),
)
],
),
)),
_itemWidget('企业代码或账号', "点击这里输入企业代码或账号", null, null),
VEmptyView(50),
_itemWidget('管理员账号', "点击这里输入管理员账号", null, null),
VEmptyView(50),
_itemWidget('密码', "点击这里输入管理员密码", null, null),
VEmptyView(40),
Center(
child: Text(
'请与纳极客服400-000-9690 联系对接事宜',
style: TextStyle(
color: MyColours.color_999999, fontSize: font(12)),
))
// VEmptyView(34),
// MyDivider(
// double.infinity,
// w(1),
// color: MyColours.color_DBDBDB,
// ),
// VEmptyView(52),
// InkWell(
// onTap: () {
// setState(() {
// swichSync = !swichSync;
// });
// // _sellerGuestSet();
// },
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Text('是否与会员系统同步',
// style: TextStyle(
// color: MyColours.color_515151,
// fontSize: ScreenUtil().setSp(32))),
// Image.asset(
// swichSync
// ? Utils.getImgPath('f_swich_on')
// : Utils.getImgPath('f_swich_off'),
// width: ScreenUtil().setWidth(70),
// // height: ScreenUtil().setWidth(82),
// ),
// ],
// ),
// ),
// VEmptyView(48),
// InkWell(
// onTap: () {
// FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
// // DialogUtil.showSelectCusmanDialog(context, memberList,
// // (value) {
// // if (value != null) {
// // setState(() {
// // memberIndex = value.first;
// // memberShow = memberList[memberIndex];
// // });
// // }
// // }, selecteds: memberIndex == null ? [] : [memberIndex])
// // .then((value) {});
// },
// child: Container(
// // height: ScreenUtil().setWidth(60),
// padding: EdgeInsets.only(bottom: ScreenUtil().setWidth(50)),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Container(
// // color: Colors.red,
// width: ScreenUtil().setWidth(150),
// height: ScreenUtil().setWidth(35),
// child: Text(
// '会员系统选择',
// style: TextStyle(
// fontSize: ScreenUtil().setSp(32),
// color: MyColours.color_515151),
// ),
// ),
// Expanded(
// child: Text(
// memberShow,
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// color: MyColours.color_353535,
// fontSize: ScreenUtil().setSp(28),
// ),
// )),
// HEmptyView(10),
// Image.asset(
// Utils.getImgPath(
// showLabel ? 'c_arrow_up' : 'c_arrow_down'),
// width: ScreenUtil().setWidth(24),
// // height: ScreenUtil().setWidth(10),
// )
// ],
// ),
// )),
// _itemWidget('企业代码或账号', "点击这里输入企业代码或账号", null, null),
// VEmptyView(50),
// _itemWidget('管理员账号', "点击这里输入管理员账号", null, null),
// VEmptyView(50),
// _itemWidget('密码', "点击这里输入管理员密码", null, null),
// VEmptyView(40),
// Center(
// child: Text(
// '请与纳极客服400-000-9690 联系对接事宜',
// style: TextStyle(
// color: MyColours.color_999999, fontSize: font(12)),
// ))
],
),
),
... ...
... ... @@ -107,41 +107,41 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
child: SingleChildScrollView(
child: Column(
children: [
InkWell(
onTap: () {
NavigatorUtil.goRechargeHomePage(context);
},
child: Padding(
padding: EdgeInsets.only(
left: w(16),
top: w(12),
bottom: w(12),
right: w(12)),
child: Row(
children: [
Text(
'会员充值优惠活动',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(
horizontal: w(7), vertical: w(4)),
child: Image.asset(
"assets/arrow_right_new.png",
width: ScreenUtil().setWidth(18),
height: ScreenUtil().setWidth(32),
),
)
],
))),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: MyDivider(double.infinity, w(0.5),
color: MyColours.color_E7E7E7)),
VEmptyView(24),
// InkWell(
// onTap: () {
// NavigatorUtil.goRechargeHomePage(context);
// },
// child: Padding(
// padding: EdgeInsets.only(
// left: w(16),
// top: w(12),
// bottom: w(12),
// right: w(12)),
// child: Row(
// children: [
// Text(
// '会员充值优惠活动',
// style: TextStyle(
// color: MyColours.color_515151,
// fontSize: ScreenUtil().setWidth(32)),
// ),
// Spacer(),
// Container(
// padding: EdgeInsets.symmetric(
// horizontal: w(7), vertical: w(4)),
// child: Image.asset(
// "assets/arrow_right_new.png",
// width: ScreenUtil().setWidth(18),
// height: ScreenUtil().setWidth(32),
// ),
// )
// ],
// ))),
// Padding(
// padding: EdgeInsets.only(left: w(16)),
// child: MyDivider(double.infinity, w(0.5),
// color: MyColours.color_E7E7E7)),
// VEmptyView(24),
InkWell(
onTap: () {
setState(() {
... ...
... ... @@ -282,7 +282,7 @@ class _PersonnelDetailPageState extends State<PersonnelDetailPage> {
// Response response = await DioUtil.getInstance().getDio().get(
// "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid");
// Response response = await DioUtil.getInstance().getDio().get(
// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code");
LogUtil.v("access_token:${response.toString()}");
Map<String, dynamic> responseData = json.decode(response.toString());
print(responseData);
... ...
... ... @@ -224,7 +224,7 @@
// // Response response = await DioUtil.getInstance().getDio().get(
// // "https://xt.colorcun.com/WechatApi/WechatApi/CreateDcSubQrcode?sellerid=$sid&uid=$uid");
// // Response response = await DioUtil.getInstance().getDio().get(
// // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
// // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code");
// LogUtil.v("access_token:${response.toString()}");
// Map<String, dynamic> responseData = json.decode(response.toString());
// print(responseData);
... ...
... ... @@ -646,7 +646,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
Provider.of<UserModel>(context, listen: false)
.user
.sellerid,
'id': Provider.of<UserModel>(context, listen: false)
'uid': Provider.of<UserModel>(context, listen: false)
.user
.openid,
};
... ... @@ -657,10 +657,10 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
pramas['is_member'] = memberIndex == 0 ? '1' : '0';
}
if (nameC.text.trim().length > 0) {
pramas['rname'] = nameC.text;
pramas['sex'] = '${sexSelectIndex + 1}';
}
// if (nameC.text.trim().length > 0) {
// pramas['rname'] = nameC.text;
// pramas['sex'] = '${sexSelectIndex + 1}';
// }
await customerProvider.setInsGuest(context, pramas);
}
... ...