xt / Flutter-ReserveApp · Commits

Go to a project

Commit 85c5dc94d15a24585ec1b46aabde491ab6ee7589

Authored by wdn127929
1 parent cfe7b1c0
build: skipped

经理信息溢出

Inline Side-by-side
Showing 4 changed files with 75 additions and 35 deletions
... ... @@ -457,7 +457,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
addManager
? Row(
children: [
HEmptyView(72),
HEmptyView(20),
ClipRRect(
borderRadius: BorderRadius.circular(r(35)),
child: Image.network(
... ... @@ -476,8 +476,10 @@ class _BookInfoPageState extends State<BookInfoPage> {
height: w(70),
),
),
Spacer(),
Column(
HEmptyView(20),
// Spacer(),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
... ... @@ -496,8 +498,8 @@ class _BookInfoPageState extends State<BookInfoPage> {
fontSize: font(12)),
),
],
),
HEmptyView(6),
)),
HEmptyView(10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
... ... @@ -566,7 +568,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
fontWeight: FontWeight.bold,
fontSize: font(14))),
VEmptyView(10),
Text('${address??''}',
Text('${address ?? ''}',
style: TextStyle(
height: 1.3,
color: MyColours.color_000000,
... ...
... ... @@ -992,17 +992,17 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
onTap: () async {
if (Utils.getAuthority(
context, '店铺信息')) {
Map image = await NavigatorUtil
await NavigatorUtil
.goStoreBaseInfoPage(context);
print(image['image']);
UserModel userModel =
Provider.of<UserModel>(context,
listen: false);
User user = userModel.user;
user.sellerimage = image['image'];
await App.sp.setString('user',
json.encode(user.toJson()));
print(userModel.user);
// print(image['image']);
// UserModel userModel =
// Provider.of<UserModel>(context,
// listen: false);
// User user = userModel.user;
// user.sellerimage = image['image'];
// await App.sp.setString('user',
// json.encode(user.toJson()));
// print(userModel.user);
setState(() {});
}
},
... ...
import 'dart:convert';
import 'dart:io';
import 'dart:ui';
... ... @@ -111,13 +112,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
// bool success =
// await _baseIndoProvider.getCustomerActivityBaseinfo(context, params);
// if (success) {
_nameController.text = widget.sunModel.nickName??'';
nameStr = widget.sunModel.nickName??"";
_nameController.text = widget.sunModel.nickName ?? '';
nameStr = widget.sunModel.nickName ?? "";
// _uploadImageProvider.touxiang.qiniuUrl =
// _baseIndoProvider.baseInfoSunModel.photo;
// _uploadImageProvider.erweima.qiniuUrl =
// _baseIndoProvider.baseInfoSunModel.qrcode;
_phoneController.text = widget.sunModel.phone??"";
_phoneController.text = widget.sunModel.phone ?? "";
phoneStr = widget.sunModel.phone ?? '';
// _wechatController.text = _baseIndoProvider.baseInfoSunModel.wechat;
// if (_baseIndoProvider.baseInfoSunModel.wechat != null &&
... ... @@ -671,7 +672,7 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
ScreenUtil().setWidth(40),
ScreenUtil().setWidth(56)),
child: RoundButton(
onPressed: () {
onPressed: () async {
if (_phoneController.text.trim().length ==
0 ||
_nameController.text.trim().length == 0) {
... ... @@ -685,7 +686,7 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
Future.wait<bool>([
_editAuthUser(nameTemp),
_bindPhoneSellerUser(phoneTemp)
]).then((results) {
]).then((results) async {
print(results[0]);
if (results[0] && results[1]) {
//成功
... ... @@ -693,6 +694,23 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
EventBus()
.emit('personnel_manage_detail_page');
Navigator.pop(context);
if (widget.sunModel.id ==
Provider.of<UserModel>(context,
listen: false)
.user
.openid &&
App.sp.containsKey('user')) {
String s = App.sp.getString('user');
User _user =
User.fromJson(json.decode(s));
_user.userphone = phoneTemp;
_user.nickName = nameTemp;
// print(userModel.user);
await UserModel().saveUserInfo(_user);
}
} else {
if (!results[0]) {
Utils.showToast('修改姓名失败');
... ...
... ... @@ -37,6 +37,8 @@ import 'package:image_picker/image_picker.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import '../../app.dart';
class StoreBaseInfoPage extends StatefulWidget {
StoreBaseInfoPage({Key key}) : super(key: key);
... ... @@ -426,16 +428,37 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
SetSellerInfoSunModel sunModel =
await _baseIndoProvider.setSellerInfoById(context, formData);
if (sunModel != null) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.user.morning = morningStr;
userModel.user.noon = noonStr;
userModel.user.night = nightStr;
userModel.user.sellername = _nameController.text;
userModel.user.sellerphone =
_phoneController.text + ',' + _phoneController2.text;
userModel.user.sellerAddr = _addressController.text;
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
// userModel.user.morning = morningStr;
// userModel.user.noon = noonStr;
// userModel.user.night = nightStr;
// userModel.user.sellername = _nameController.text;
// userModel.user.sellerphone =
// _phoneController.text + ',' + _phoneController2.text;
// userModel.user.sellerAddr = _addressController.text;
// print(userModel.user);
if (App.sp.containsKey('user')) {
String s = App.sp.getString('user');
User _user = User.fromJson(json.decode(s));
_user.morning = morningStr;
_user.noon = noonStr;
_user.night = nightStr;
_user.sellername = _nameController.text;
_user.sellerphone = params['seller_tel'];
_user.sellerAddr = _addressController.text;
if (_uploadImageProvider.mentou.path != null &&
_uploadImageProvider.mentou.path != '') {
_user.sellerimage = _uploadImageProvider.mentou.qiniuUrl;
}
print(userModel.user);
// print(userModel.user);
await UserModel().saveUserInfo(_user);
}
// morning =
// userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
// noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
... ... @@ -445,11 +468,8 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
Utils.showToast('保存店铺信息成功');
EventBus().emit('changeStatusColor');
Navigator.pop(
context,
_uploadImageProvider.mentou.qiniuUrl != null &&
_uploadImageProvider.mentou.qiniuUrl != ''
? {'image': _uploadImageProvider.mentou.qiniuUrl}
: {'image': ''});
context,
);
} else {
// Utils.showToast('保存失败');
}
... ...