Commit c407f98d94e8f367b6d439b0435cc4a85223b4c1

Authored by wdn127929
1 parent cc65b6f4

存酒推送跳转存酒详情

... ... @@ -137,6 +137,9 @@ class NewUnmessage extends Object {
@JsonKey(name: 'dtime')
String dtime;
@JsonKey(name: 'wid')
String wid;
NewUnmessage(
this.id,
this.uid,
... ... @@ -167,7 +170,8 @@ class NewUnmessage extends Object {
this.phone,
this.storeCdate,
this.desc,
this.dtime);
this.dtime,
this.wid);
String get rnameStr {
if (rname == null || rname == '' || rname == ' ') return "";
... ...
... ... @@ -71,7 +71,10 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) {
json['phone'] as String,
json['store_cdate'] as String,
json['desc'] as String,
json['dtime'] as String);
json['dtime'] as String,
json['wid'] as String,
);
}
Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
... ... @@ -105,5 +108,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
'phone': instance.phone,
'store_cdate': instance.storeCdate,
'desc': instance.desc,
'dtime': instance.dtime
'dtime': instance.dtime,
'wid':instance.wid
};
... ...
... ... @@ -195,14 +195,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
create: (_) => MarketingCenterProvider(),
child: ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
child:ChangeNotifierProvider<CollectStoreProvider>(
create: (_) => CollectStoreProvider(),
child: SafeArea(
child: NoteBookPage(
tabIndex: widget.mine ? 1 : 0,
date: widget.date,
solt: widget.solt,
))),
child: ChangeNotifierProvider<CollectStoreProvider>(
create: (_) => CollectStoreProvider(),
child: SafeArea(
child: NoteBookPage(
tabIndex: widget.mine ? 1 : 0,
date: widget.date,
solt: widget.solt,
))),
))))
..add(ChangeNotifierProvider<MyModel>(
create: (_) => MyModel(),
... ... @@ -870,33 +870,15 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
break;
case "18":
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
null,
null,
notifyParam['phone'],
null,
null,
null,
null,
null,
null,
null,
null,
notifyParam['id'],
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(
context, userHistoryEntity, FromPage.FromPageMessagePage);
NavigatorUtil.goWineDetailPage(context, notifyParam['wid']);
MessageDialogModel messageDialogModel =
Provider.of<MessageDialogModel>(context, listen: false);
... ... @@ -1225,35 +1207,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
break;
case "18":
//存酒
print('fff');
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
custom['phone'],
null,
null,
null,
null,
null,
null,
null,
null,
custom['id'],
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(
context, userHistoryEntity, FromPage.FromPageMessagePage);
NavigatorUtil.goWineDetailPage(context, custom['wid']);
MessageDialogModel messageDialogModel =
Provider.of<MessageDialogModel>(context, listen: false);
... ...
... ... @@ -213,35 +213,16 @@ class MessageDialogItemF extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
//存酒超期
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
message.phone,
null,
null,
null,
null,
null,
null,
null,
null,
message.gid,
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(
context, userHistoryEntity, FromPage.FromPageMessagePage);
if (message.wid != null) {
NavigatorUtil.goWineDetailPage(context, message.wid);
}
bus.emit("remove_untreated_message", message.id);
Map<String, String> params1 = {
... ... @@ -737,37 +718,17 @@ class MessageDialogItemF extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '客情维护', (v) {});
context, '存酒管理', (v) {});
return;
}
//存酒超期
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
message.phone,
null,
null,
null,
null,
null,
null,
null,
null,
message.gid,
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(context,
userHistoryEntity, FromPage.FromPageMessagePage);
if (message.wid != null) {
NavigatorUtil.goWineDetailPage(context, message.wid);
}
bus.emit("remove_untreated_message", message.id);
Map<String, String> params1 = {
... ...
... ... @@ -141,37 +141,41 @@ class MessageItemF extends StatelessWidget {
//会员充值
NavigatorUtil.goMessageRechargeInfoPage(context, message.payid);
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
//存酒超期
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
message.phone,
// '057128223456',
null,
null,
null,
null,
null,
null,
null,
null,
message.gid,
// '19358',
null,
null,
null,
null);
if (message.wid != null) {
NavigatorUtil.goWineDetailPage(context, message.wid);
}
NavigatorUtil.goCustomerDetailPage(
context, userHistoryEntity, FromPage.FromPageMessagePage);
// //存酒超期
// CustomerBySellerSunModel userHistoryEntity =
// CustomerBySellerSunModel(
// null,
// null,
// message.phone,
// // '057128223456',
// null,
// null,
// null,
// null,
// null,
// null,
// null,
// null,
// message.gid,
// // '19358',
// null,
// null,
// null,
// null);
// NavigatorUtil.goCustomerDetailPage(
// context, userHistoryEntity, FromPage.FromPageMessagePage);
} else if (message.message_type == "19") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
... ... @@ -326,35 +330,16 @@ class MessageItemF extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
//存酒超期
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
message.phone,
null,
null,
null,
null,
null,
null,
null,
null,
message.gid,
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(
context, userHistoryEntity, FromPage.FromPageMessagePage);
if (message.wid != null) {
NavigatorUtil.goWineDetailPage(context, message.wid);
}
bus.emit("remove_untreated_message", message.id);
Map<String, String> params1 = {
... ... @@ -854,36 +839,17 @@ class MessageItemF extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
if (!collectStoreProvider.sellerWine) {
//没有购买存酒管理
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '客情维护', (v) {});
context, '存酒管理', (v) {});
return;
}
//存酒超期
CustomerBySellerSunModel userHistoryEntity =
CustomerBySellerSunModel(
null,
null,
message.phone,
null,
null,
null,
null,
null,
null,
null,
null,
message.gid,
null,
null,
null,
null);
NavigatorUtil.goCustomerDetailPage(context,
userHistoryEntity, FromPage.FromPageMessagePage);
if (message.wid != null) {
NavigatorUtil.goWineDetailPage(context, message.wid);
}
bus.emit("remove_untreated_message", message.id);
Map<String, String> params1 = {
... ...
... ... @@ -730,7 +730,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
height: w(22),
onPressed: () {
NavigatorUtil.goWineDetailPage(context,
customerProvider.guestInfoSunModel.store.id, true,
customerProvider.guestInfoSunModel.store.id,
onlyShow: true);
},
)
... ...
... ... @@ -639,7 +639,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
height: w(22),
onPressed: () {
NavigatorUtil.goWineDetailPage(context,
customerProvider.guestInfoSunModel.store.id, true,
customerProvider.guestInfoSunModel.store.id,
onlyShow: true);
},
)
... ...
... ... @@ -10,7 +10,9 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:provider/provider.dart';
import '../../../constant/state.dart';
import '../../../models/personnel_manage_model.dart';
import '../../../models/wine_manage_model.dart';
import '../../../provider/personnel_provider.dart';
import '../../../provider/store_wine_provider.dart';
import '../../../res/colors.dart';
import '../../../route/navigator_util.dart';
... ... @@ -43,6 +45,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
// List dataWine = [];
String isMember = '';
bool isStoreWine = false;
@override
void initState() {
... ... @@ -53,10 +56,84 @@ class _WineDetailPageState extends State<WineDetailPage> {
// dataWine.add(wineManageModel);
WidgetsBinding.instance.addPostFrameCallback((_) async {
if (widget.isStoreWine == null) {
_getAuthUserLists(showLoading: false);
} else {
isStoreWine = widget.isStoreWine;
}
_getStoreWineById();
});
}
//获取员工信息列表
_getAuthUserLists({bool showLoading = true}) async {
Map<String, String> params = {
"sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
};
PersonnelProvider personnelProvider =
Provider.of<PersonnelProvider>(context, listen: false);
PersonnelManageSunModel data;
await personnelProvider.getAuthUserLists(context, params,
showLoading: showLoading);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
if (personnelProvider.dataMap != null) {
if (userModel.user.role_name == '管理员') {
personnelProvider.dataMap.admin.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '店长') {
personnelProvider.dataMap.shopowner.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '客户经理') {
personnelProvider.dataMap.manager.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '收银员') {
personnelProvider.dataMap.cashier.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '服务员') {
personnelProvider.dataMap.waiter.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '前台') {
personnelProvider.dataMap.reception.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
} else if (userModel.user.role_name == '迎宾') {
personnelProvider.dataMap.welcome.listdata.forEach((element) {
if (element.id == userModel.user.openid) {
//找到自己
data = element;
}
});
}
isStoreWine = data.isStoreWine == '1' ? true : false;
setState(() {});
}
}
_getStoreWineById() async {
Map<String, String> params = {"id": widget.idstr};
bool success = await storeWineProvider.getStoreWineById(context, params);
... ... @@ -168,8 +245,10 @@ class _WineDetailPageState extends State<WineDetailPage> {
VEmptyView(32),
_textItemWidget(
'联系电话',
widget.isStoreWine ? model.wineManageDetail.phone: Utils.starPhone(
model.wineManageDetail.phone)),
isStoreWine
? model.wineManageDetail.phone
: Utils.starPhone(
model.wineManageDetail.phone)),
Container(
height: ScreenUtil().setWidth(48 * 2),
padding: EdgeInsets.only(
... ... @@ -269,7 +348,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
// if (userModel.user.role_name == '管理员' ||
// userModel.user.role_name == '店长') {
NavigatorUtil.goOutStoreRecordPage(
context, widget.idstr,widget.isStoreWine);
context, widget.idstr, isStoreWine);
// } else {
// bool needRefresh =
// await NavigatorUtil.goCouponEditPage(context);
... ... @@ -292,15 +371,15 @@ class _WineDetailPageState extends State<WineDetailPage> {
height: ScreenUtil().setWidth(80),
radius: ScreenUtil().setWidth(10),
isBold: true,
gradientStart: !widget.isStoreWine
gradientStart: !isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
gradientEnd: !widget.isStoreWine
gradientEnd: !isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
fontSize: 32,
onPressed: () async {
if (!widget.isStoreWine) {
if (!isStoreWine) {
Utils.showToast('您不是店铺的存酒管理员,无权进行相关操作。');
return false;
}
... ... @@ -361,10 +440,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
// storeWineProvider.wineManageDetail.sexStr;
NavigatorUtil.goApplyOutStorePage(
context,
modelTemp,
widget.isStoreWine
);
context, modelTemp, isStoreWine);
// } else {
// bool needRefresh =
// await NavigatorUtil.goCouponEditPage(context);
... ...
... ... @@ -31,7 +31,7 @@ class _WineInStoreItemState extends State<WineInStoreItem> {
return InkWell(
onTap: () {
NavigatorUtil.goWineDetailPage(
context, widget.wineManageModel.id, widget.isStoreWine);
context, widget.wineManageModel.id,isStoreWine:widget.isStoreWine);
},
child: Container(
// width: ScreenUtil().setWidth(610),
... ...
... ... @@ -955,11 +955,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
break;
case "18":
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
// CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
... ... @@ -1311,11 +1311,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
case "18":
//存酒
print('fff');
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
// CustomerBySellerSunModel userHistoryEntity =
... ...
... ... @@ -213,11 +213,11 @@ class MessageDialogItemFSim extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
return;
}
//存酒超期
... ... @@ -737,12 +737,12 @@ class MessageDialogItemFSim extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '客情维护', (v) {});
context, '存酒管理', (v) {});
return;
}
... ...
... ... @@ -141,11 +141,11 @@ class MessageItemFSim extends StatelessWidget {
//会员充值
NavigatorUtil.goMessageRechargeInfoPage(context, message.payid);
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
return;
}
//存酒超期
... ... @@ -326,11 +326,11 @@ class MessageItemFSim extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
DialogUtil.showSellerVersionBuyDialog(context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
return;
}
//存酒超期
... ... @@ -853,12 +853,12 @@ class MessageItemFSim extends StatelessWidget {
bus.emit("refresh_untreated_num"); //刷新未读消息数目
} else if (message.message_type == "18") {
if (!collectStoreProvider.sellerPreserve) {
if (!collectStoreProvider.sellerWine) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
return;
}
//存酒超期
... ...
... ... @@ -1749,8 +1749,13 @@ class NavigatorUtil {
///我的------存酒详情
static Future<dynamic> goWineDetailPage(
BuildContext context, String idstr, bool isStoreWine,
{replace = false, bool onlyShow = false}) {
BuildContext context, String idstr,
{bool isStoreWine,replace = false, bool onlyShow = false}) {
if(isStoreWine == null){
return _navigateTo(context,
"${Routes.wine_detail_page}?idstr=$idstr&onlyShow=${onlyShow}",
replace: replace);
}
return _navigateTo(context,
"${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}",
replace: replace);
... ...
... ... @@ -3117,15 +3117,22 @@ var createStoreWinePageHandle = new Handler(
var wineDetailPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
String idstr = params["idstr"].first;
bool isStoreWine;
if (params.containsKey('isStoreWine')) {
isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
}
bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
return ChangeNotifierProvider<StoreWineProvider>(
create: (_) => StoreWineProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: WineDetailPage(
idstr: idstr, isStoreWine: isStoreWine, onlyShow: onlyShow)));
child: ChangeNotifierProvider<PersonnelProvider>(
create: (_) => PersonnelProvider(),
child: WineDetailPage(
idstr: idstr,
isStoreWine: isStoreWine,
onlyShow: onlyShow))));
});
///我的----存酒记录
... ... @@ -3137,7 +3144,7 @@ var outStoreRecordPageHandle = new Handler(
create: (_) => StoreWineProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: OutStoreRecordPage(wid: idstr,isStoreWine:isStoreWine)));
child: OutStoreRecordPage(wid: idstr, isStoreWine: isStoreWine)));
});
///我的----申请出库
... ... @@ -3152,7 +3159,9 @@ var applyOutStorePageHandle = new Handler(
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(),
child: ApplyOutStorePage(wineManageDetail: wineManageDetail,isStoreWine:isStoreWine))));
child: ApplyOutStorePage(
wineManageDetail: wineManageDetail,
isStoreWine: isStoreWine))));
});
///我的----申请出库短信验证输入
... ... @@ -3856,8 +3865,6 @@ var paymentSettingPageHandle = new Handler(
create: (_) => StoreBaseIndoProvider(), child: PaymentSettingPage()));
});
///小程序通知卡片样式
var miniprogramSettingPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -3869,13 +3876,9 @@ var miniprogramSettingPageHandle = new Handler(
// FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
return ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: MiniprogramSettingPage());
child: MiniprogramSettingPage());
});
///存酒短信模版设置
var wineSettingMsgPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
... ... @@ -3888,7 +3891,5 @@ var wineSettingMsgPageHandle = new Handler(
return ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: WineSettingMsgPage()));
create: (_) => CustomerProvider(), child: WineSettingMsgPage()));
});
... ...