Commit 546171fa353fecf9b89ccc9b41466073c28b6c7d

Authored by weixin_45529955
1 parent a2d191a0

结构调整OK

... ... @@ -245,7 +245,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
create: (_) => UserModel(),
child: ChangeNotifierProvider<PersonnelProvider>(
create: (_) => PersonnelProvider(),
child: MyPage())))),
child: ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: MyPage()))))),
)));
WidgetsBinding.instance.addPostFrameCallback((_) async {
// bus.on('refresh_token', (arg) {
... ... @@ -1882,7 +1884,10 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
child: ChangeNotifierProvider<
PersonnelProvider>(
create: (_) => PersonnelProvider(),
child: MyPage())))),
child: ChangeNotifierProvider<
BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: MyPage()))))),
)));
setState(() {});
}
... ...
import 'dart:async';
import 'dart:convert';
import 'dart:io';
... ... @@ -136,7 +135,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
bool success =
await _baseIndoProvider.getCustomerActivityBaseinfo(context, params);
if (success) {
_nameController.text = _baseIndoProvider.baseInfoSunModel!.name??"";
_nameController.text = _baseIndoProvider.baseInfoSunModel!.name ?? "";
nameStr = _baseIndoProvider.baseInfoSunModel!.name;
_uploadImageProvider.touxiang.qiniuUrl =
_baseIndoProvider.baseInfoSunModel!.photo;
... ... @@ -145,9 +144,9 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
_uploadImageProvider.erweima.qiniuUrl =
_baseIndoProvider.baseInfoSunModel!.qrcode;
_uploadImageProvider.erweima.process = 1;
_phoneController.text = _baseIndoProvider.baseInfoSunModel!.phone??"";
_phoneController.text = _baseIndoProvider.baseInfoSunModel!.phone ?? "";
phoneStr = _baseIndoProvider.baseInfoSunModel!.phone ?? '';
_wechatController.text = _baseIndoProvider.baseInfoSunModel!.wechat??"";
_wechatController.text = _baseIndoProvider.baseInfoSunModel!.wechat ?? "";
if (_baseIndoProvider.baseInfoSunModel!.wechat != null &&
_baseIndoProvider.baseInfoSunModel!.wechat != '' &&
phoneStr != '' &&
... ... @@ -156,7 +155,8 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
} else {
isSelect = false;
}
_positionController.text = _baseIndoProvider.baseInfoSunModel!.position??"";
_positionController.text =
_baseIndoProvider.baseInfoSunModel!.position ?? "";
_uploadImageProvider.imgSizeErweima = 64;
// setState(() {});
_uploadImageProvider.notifyListeners();
... ... @@ -216,7 +216,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
params['id'] = _baseIndoProvider.baseInfoSunModel!.id;
}
bool isSuccess =
await _baseIndoProvider.setCustomerActivityBaseinfo(context, params) ;
await _baseIndoProvider.setCustomerActivityBaseinfo(context, params);
// _baseIndoProvider.baseInfoSunModel = null;
if (isSuccess) {
// imgAll和images 比较,挑出不一样的,删除七牛云
... ... @@ -236,6 +236,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
//成功之后跳回前一个页面
// bus.emit('refresh_coupon_list');
Utils.showToast('保存成功');
bus.emit('refreshMyImage');
if (App.sp!.containsKey('user')) {
String s = App.sp!.getString('user')!;
User _user = User.fromJson(json.decode(s));
... ... @@ -421,7 +422,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
}
///#相机拍照,单图选择
Future _getFromPictureOrCamera(
Future _getFromPictureOrCamera(
String title, UploadImgModel imgModel, imageSource) async {
final pickedFile = await picker.pickImage(source: imageSource);
if (pickedFile != null) {
... ... @@ -733,8 +734,10 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
_uploadImageProvider.touxiang.qiniuUrl ==
'http://nosqn.colorcun.com/yd_person.png') {
} else {
if (_uploadImageProvider.touxiang.process! < 1 &&
_uploadImageProvider.touxiang.process! > 0.01 &&
if (_uploadImageProvider.touxiang.process! <
1 &&
_uploadImageProvider.touxiang.process! >
0.01 &&
_uploadImageProvider.touxiang.qiniuUrl !=
'') {
Utils.showToast('正在上传图片,请稍等!');
... ... @@ -756,8 +759,8 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
}
//接口
JhCommonUtils.debounce(() => _setCustomerActivityBaseinfo(), 500);
JhCommonUtils.debounce(
() => _setCustomerActivityBaseinfo(), 500);
},
text: '保存',
fontSize: 34,
... ...
... ... @@ -73,7 +73,7 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
}
}
_getNewRechargeData() async {
_getNewRechargeData() async {
(bool, bool) result =
await (_getNewRechargeList(), getSellerTemplateConf(context)).wait;
... ... @@ -83,6 +83,7 @@ class _RechargeHomePageState extends State<RechargeHomePage> {
marketingCenterProvider.rechargeList!.forEach((element) {
if (element.id == rechargeData!.id) {
element.isMarking = true;
}
});
}
... ...
... ... @@ -11,6 +11,7 @@ import 'package:one_key/models/sms_info.dart';
import 'package:one_key/models/store_info.dart';
import 'package:one_key/models/user.dart';
import 'package:one_key/models/version.dart';
import 'package:one_key/provider/base_info_provider.dart';
import 'package:one_key/provider/create_store_model.dart';
import 'package:one_key/provider/my_model.dart';
import 'package:one_key/provider/update_model.dart';
... ... @@ -63,6 +64,10 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
late CollectStoreProvider collectStoreProvider;
bool isStoreWine = false;
late BaseIndoProvider _baseIndoProvider;
String? selfImage;
@override
void initState() {
// TODO: implement initState
... ... @@ -107,6 +112,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
'迎宾') {
_getAuthUserLists(showLoading: false);
}
_getCustomerActivityBaseinfo();
getMyPageCountData();
///apk版本检测
... ... @@ -120,6 +126,12 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
_getSmsInfo(context);
// getMyPageCountData();
});
EventBus().on('refreshMyImage', (arg) {
// _getSmsInfo(context);
_getCustomerActivityBaseinfo();
// getMyPageCountData();
});
}
@override
... ... @@ -129,6 +141,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
// AzhonAppUpdate.dispose();
EventBus().off('changeStatusColor');
EventBus().off('refreshMySms');
EventBus().off('refreshMyImage');
}
@override
... ... @@ -184,6 +198,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
// }
// }
_getCustomerActivityBaseinfo() async {
Map<String, String?> params = {
'sellerid': Provider.of<UserModel>(context, listen: false).user!.sellerid,
"uid": Provider.of<UserModel>(context, listen: false).user!.openid,
};
bool success =
await _baseIndoProvider.getCustomerActivityBaseinfo(context, params);
if (success) {
selfImage = _baseIndoProvider.baseInfoSunModel!.photo;
}
}
//获取员工信息列表
_getAuthUserLists({bool showLoading = true}) async {
Map<String, String?> params = {
... ... @@ -489,6 +516,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
createStoreModel = Provider.of<CreateStoreModel>(context, listen: false);
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
_baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_f3f3f3,
// appBar: AppBar(
... ... @@ -534,86 +563,125 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(left: w(13)),
child: model.user!.sellerimage ==
null ||
model.user!.sellerimage == ''
? Image.asset(
Utils.getImgPath('base_tx_bg'),
fit: BoxFit.cover,
width: ScreenUtil()
.setWidth(44 * 2),
height: ScreenUtil()
.setWidth(44 * 2),
)
: Container(
width: w(44),
height: w(44),
decoration: BoxDecoration(
border: Border.all(
width: w(2),
color: Colors.white),
borderRadius:
BorderRadius.all(Radius
.circular(r(44))),
image: DecorationImage(
image: NetworkImage(model
.user!.sellerimage!),
)))),
VEmptyView(8),
Container(
constraints: BoxConstraints(
maxWidth: ScreenUtil().setWidth(400),
),
child: Text(
'杨经理 店长 >',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
letterSpacing: 0.2,
fontWeight: FontWeight.w600,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(24)),
),
),
VEmptyView(8),
Text(
'员工编号:' +
model.user!.account! +
" " +
(model.user!.role_name_addition ??
''),
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_ffffff,
fontSize: font(10)),
),
],
),
InkWell(
onTap: () {
if (outDay == '0') {
return;
}
if (Utils.getAuthority(context, '个人信息')) {
NavigatorUtil.goBaseInfoPage(
context, FromPage.FromPageMyPage);
}
},
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Padding(
padding:
EdgeInsets.only(left: w(13)),
child: selfImage == null ||
selfImage == ''
? Image.asset(
Utils.getImgPath(
'base_tx_bg'),
fit: BoxFit.cover,
width: ScreenUtil()
.setWidth(44 * 2),
height: ScreenUtil()
.setWidth(44 * 2),
)
: Container(
width: w(44),
height: w(44),
decoration: BoxDecoration(
border: Border.all(
width: w(2),
color:
Colors.white),
borderRadius:
BorderRadius.all(
Radius.circular(
r(44))),
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
selfImage!),
)))),
VEmptyView(8),
Container(
constraints: BoxConstraints(
maxWidth:
ScreenUtil().setWidth(400),
),
child: Text(
'${model.user!.nickName} ${model.user!.role_name_addition} >',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
letterSpacing: 0.2,
fontWeight: FontWeight.w600,
color: MyColours.color_ffffff,
fontSize:
ScreenUtil().setSp(24)),
),
),
VEmptyView(8),
Text(
'员工编号:' + model.user!.account!,
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_ffffff,
fontSize: font(10)),
),
],
)),
HEmptyView(22),
Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
child: Text(
'${model.user!.sellername} >',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
letterSpacing: 0.2,
fontWeight: FontWeight.w600,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(32)),
),
),
VEmptyView(12),
InkWell(
onTap: () async {
//
if (outDay == '0') {
return;
}
if (Utils.getAuthority(
context, '店铺信息')) {
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);
setState(() {});
}
},
child: Container(
padding:
EdgeInsets.only(bottom: w(6)),
child: Text(
'${model.user!.sellername} >',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
letterSpacing: 0.2,
fontWeight: FontWeight.w600,
color: MyColours.color_ffffff,
fontSize:
ScreenUtil().setSp(32)),
),
)),
Text(
'店铺编号:' +
model.user!.sellerid!.padLeft(6, '0'),
... ...