xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7d59ce6af3b7c9c289f6ee3e37007ebabe57c86f

Authored by wdn127929
1 parent 6f686dba
build: skipped

预订数据导出需开通客情维护功能&&消息中心不显示其他经理取消预订的消息

Inline Side-by-side
Showing 4 changed files with 65 additions and 28 deletions
... ... @@ -21,6 +21,8 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../../provider/collect_store_provider.dart';
import '../../../../utils/dialog_util.dart';
import '../../../../utils/screen_util.dart';
import '../../../../widgets/page_loading.dart';
import '../month_item.dart';
... ... @@ -41,6 +43,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
int year;
int month;
CollectStoreProvider collectStoreProvider;
@override
void initState() {
super.initState();
... ... @@ -51,6 +55,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
// _getSellerGuestManage();
_getMarketingBySeller();
_getSellerCountsList();
getSellerVersion();
});
bus.on("refresh_store_customer_home", (arg) {
_getMarketingBySeller();
... ... @@ -66,6 +72,12 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
super.dispose();
}
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
setState(() {});
}
///全店客情首页
_getSellerGuestManage() async {
StoreCustomerHomeSunModel model =
... ... @@ -845,7 +857,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
@override
Widget build(BuildContext context) {
// widget.customerProvider = Provider.of<widget.customerProvider>(context, listen: true);
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
return Scaffold(
// backgroundColor: Color.fromRGBO(246, 248, 250, 1),
// appBar: SystemAppBar('全店客情', onTap: () {
... ... @@ -1582,6 +1595,14 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
flex: 1,
child: RoundButton(
onPressed: () {
if (!collectStoreProvider.sellerPreserve) {
//没有购买客情维护模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '客情维护', (v) {});
return;
}
NavigatorUtil.goExportBookDataPage(
context,
);
... ...
... ... @@ -266,23 +266,26 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
// 获取当前光标位置
// int cursorPosition = _cursorPosition;
int cursorPosition = controller.selection.baseOffset;
// 插入文本
controller.text = controller.text.substring(0, cursorPosition) +
marketingCenterProvider.smsChangeFieldData[i].show +
controller.text.substring(cursorPosition);
print(controller.text);
// 设置新的光标位置
controller.selection = TextSelection.fromPosition(TextPosition(
offset: cursorPosition +
marketingCenterProvider.smsChangeFieldData[i].show.length,
affinity: TextAffinity.downstream));
setState(() {
_cursorPosition = controller.selection.baseOffset;
// cursorPosition = _cursorPosition;
});
if (cursorPosition != -1) {
// 插入文本
controller.text = controller.text.substring(0, cursorPosition) +
marketingCenterProvider.smsChangeFieldData[i].show +
controller.text.substring(cursorPosition);
print(controller.text);
// 设置新的光标位置
controller.selection = TextSelection.fromPosition(TextPosition(
offset: cursorPosition +
marketingCenterProvider.smsChangeFieldData[i].show.length,
affinity: TextAffinity.downstream));
setState(() {
_cursorPosition = controller.selection.baseOffset;
// cursorPosition = _cursorPosition;
});
} else {
controller.text += marketingCenterProvider.smsChangeFieldData[i].show;
}
}));
}
return data;
... ...
... ... @@ -125,11 +125,15 @@ class MessageDialogModel extends ChangeNotifier {
///此状态移除，不展示
return true;
}
} else if (message.message_type.toString() == "16" &&
message.uid == uid) {
//移除自己取消的订单
} else if (message.message_type.toString() == "16") {
//移除经理取消的订单
return true;
}
// else if (message.message_type.toString() == "16" &&
// message.uid == uid) {
// //移除自己取消的订单
// return true;
// }
return false;
});
... ... @@ -158,7 +162,7 @@ class MessageDialogModel extends ChangeNotifier {
.catchError((error) {
print(error.toString());
});
if (baseResp.code == Constant.status_success) {
} else {
Utils.showToast(baseResp.msg);
... ...
... ... @@ -77,7 +77,10 @@ class MessageModel extends ChangeNotifier {
temp.addAll(messagesHas);
messagesHas = [];
temp.forEach((element) {
if (element.uid == uid && element.message_type == '16') {
// if (element.uid == uid && element.message_type == '16') {
// print('object');
// }
if (element.message_type == '16') {
print('object');
} else {
messagesHas.add(element);
... ... @@ -159,7 +162,10 @@ class MessageModel extends ChangeNotifier {
messagesUnTemp = [];
temp.forEach((element) {
if (element.uid == uid && element.message_type == '16') {
// if (element.uid == uid && element.message_type == '16') {
// tempnum++;
// }
if (element.message_type == '16') {
tempnum++;
} else {
messagesUnTemp.add(element);
... ... @@ -226,15 +232,18 @@ class MessageModel extends ChangeNotifier {
messagesUn = [];
temp.forEach((element) {
if (element.uid == uid && element.message_type == '16') {
tempnum++;
// if (element.uid == uid && element.message_type == '16') {
// tempnum++; // 自己取消的预订消息删除去
// }
if (element.message_type == '16') {
tempnum++; // 经理取消的预订消息删除去
} else {
messagesUnTemp.add(element);
messagesUnTemp.add(element); //其他消息加进来出去
}
});
messagesUn.addAll(messagesUnTemp);
if (tempnum > 0) {
allUnNum = baseResp.data['count'] - tempnum;
allUnNum = baseResp.data['count'] - tempnum; // 对应消息数
} else {
allUnNum = baseResp.data['count'];
}
... ...