xt / Flutter-ReserveApp · Commits

Go to a project

Commit 82ef8eca61458dd5f3420d3bc3d0776c8e326861

Authored by wdn127929
1 parent e9a80201
build: skipped

pc配置

Inline Side-by-side
Showing 4 changed files with 51 additions and 6 deletions
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 5326; 551 + CURRENT_PROJECT_VERSION = 5328;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 5326; 699 + CURRENT_PROJECT_VERSION = 5328;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 5326; 735 + CURRENT_PROJECT_VERSION = 5328;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -64,6 +64,7 @@ class GetDzSellerConfSunModel { @@ -64,6 +64,7 @@ class GetDzSellerConfSunModel {
64 String storePushSms; 64 String storePushSms;
65 65
66 String pcNotPhone; 66 String pcNotPhone;
  67 + String pcNotName;
67 String isCustomerCancel; 68 String isCustomerCancel;
68 69
69 String isAddOver; //是否允许新建过去订单 70 String isAddOver; //是否允许新建过去订单
@@ -107,6 +108,7 @@ class GetDzSellerConfSunModel { @@ -107,6 +108,7 @@ class GetDzSellerConfSunModel {
107 this.storePushMeg, 108 this.storePushMeg,
108 this.storePushSms, 109 this.storePushSms,
109 this.pcNotPhone, 110 this.pcNotPhone,
  111 + this.pcNotName,
110 this.isCustomerCancel, 112 this.isCustomerCancel,
111 this.isAddOver, 113 this.isAddOver,
112 this.isSetOver, 114 this.isSetOver,
@@ -162,6 +164,7 @@ class GetDzSellerConfSunModel { @@ -162,6 +164,7 @@ class GetDzSellerConfSunModel {
162 storePushSms = json['store_push_sms']; 164 storePushSms = json['store_push_sms'];
163 165
164 pcNotPhone = json['pc_not_phone']; 166 pcNotPhone = json['pc_not_phone'];
  167 + pcNotName = json['pc_not_rname'] ?? '1';
165 isCustomerCancel = json['is_customer_cancel']; 168 isCustomerCancel = json['is_customer_cancel'];
166 isAddOver = json['is_add_over']; 169 isAddOver = json['is_add_over'];
167 isSetOver = json['is_set_over']; 170 isSetOver = json['is_set_over'];
@@ -207,8 +210,8 @@ class GetDzSellerConfSunModel { @@ -207,8 +210,8 @@ class GetDzSellerConfSunModel {
207 data['store_push_meg'] = this.storePushMeg; 210 data['store_push_meg'] = this.storePushMeg;
208 data['store_push_sms'] = this.storePushSms; 211 data['store_push_sms'] = this.storePushSms;
209 data['pc_not_phone'] = this.pcNotPhone; 212 data['pc_not_phone'] = this.pcNotPhone;
  213 + data['pc_not_rname'] = this.pcNotName;
210 data['is_customer_cancel'] = this.isCustomerCancel; 214 data['is_customer_cancel'] = this.isCustomerCancel;
211 -  
212 data['is_add_over'] = this.isAddOver; 215 data['is_add_over'] = this.isAddOver;
213 data['is_set_over'] = this.isSetOver; 216 data['is_set_over'] = this.isSetOver;
214 data['is_reserve_over'] = this.isReserveOver; 217 data['is_reserve_over'] = this.isReserveOver;
@@ -66,10 +66,12 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -66,10 +66,12 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
66 marketingCenterProvider.dzSellerConfModel.isReserveOver == '1' 66 marketingCenterProvider.dzSellerConfModel.isReserveOver == '1'
67 ? true 67 ? true
68 : false; 68 : false;
69 - customerProvider.ispcphone =  
70 - marketingCenterProvider.dzSellerConfModel.pcNotPhone == '1' 69 +
  70 + customerProvider.ispcname =
  71 + marketingCenterProvider.dzSellerConfModel.pcNotName == '1'
71 ? true 72 ? true
72 : false; 73 : false;
  74 +
73 controllerDay.text = marketingCenterProvider.dzSellerConfModel.cancelDay; 75 controllerDay.text = marketingCenterProvider.dzSellerConfModel.cancelDay;
74 customerProvider.cancelOrderdayShopowner = 76 customerProvider.cancelOrderdayShopowner =
75 marketingCenterProvider.dzSellerConfModel.cancelShopowner == '1' 77 marketingCenterProvider.dzSellerConfModel.cancelShopowner == '1'
@@ -126,6 +128,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -126,6 +128,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
126 128
127 Future<bool> _setConfings() async { 129 Future<bool> _setConfings() async {
128 Map<String, dynamic> data = { 130 Map<String, dynamic> data = {
  131 + 'pc_not_rname': customerProvider.ispcname ? '1' : '0',
129 "pc_not_phone": customerProvider.ispcphone ? '1' : '0', 132 "pc_not_phone": customerProvider.ispcphone ? '1' : '0',
130 "is_add_over": customerProvider.isAddOver ? '1' : '0', 133 "is_add_over": customerProvider.isAddOver ? '1' : '0',
131 "is_set_over": customerProvider.isSetOver ? '1' : '0', 134 "is_set_over": customerProvider.isSetOver ? '1' : '0',
@@ -453,6 +456,44 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -453,6 +456,44 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
453 w(1), 456 w(1),
454 color: MyColours.color_E7E7E7, 457 color: MyColours.color_E7E7E7,
455 )), 458 )),
  459 + VEmptyView(24),
  460 + InkWell(
  461 + onTap: () {
  462 + setState(() {
  463 + customerProvider.ispcname = !customerProvider.ispcname;
  464 + });
  465 + },
  466 + child: Container(
  467 + padding: EdgeInsets.symmetric(
  468 + vertical: w(8), horizontal: w(14)),
  469 + child: Row(
  470 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  471 + crossAxisAlignment: CrossAxisAlignment.center,
  472 + children: [
  473 + Expanded(
  474 + child: Text('PC端预订需要录入客户姓名（占座除外）',
  475 + overflow: TextOverflow.ellipsis,
  476 + maxLines: 10,
  477 + style: TextStyle(
  478 + color: MyColours.color_515151,
  479 + fontSize: ScreenUtil().setSp(28)))),
  480 + Image.asset(
  481 + customerProvider.ispcname
  482 + ? Utils.getImgPath('swich_on')
  483 + : Utils.getImgPath('swich_off'),
  484 + width: ScreenUtil().setWidth(88),
  485 + // height: ScreenUtil().setWidth(82),
  486 + ),
  487 + ],
  488 + ),
  489 + )),
  490 + Padding(
  491 + padding: EdgeInsets.only(left: w(14), right: w(10)),
  492 + child: MyDivider(
  493 + double.infinity,
  494 + w(1),
  495 + color: MyColours.color_E7E7E7,
  496 + )),
456 VEmptyView(48), 497 VEmptyView(48),
457 Container( 498 Container(
458 padding: EdgeInsets.symmetric(vertical: w(8)), 499 padding: EdgeInsets.symmetric(vertical: w(8)),
@@ -125,6 +125,7 @@ class CustomerProvider extends ChangeNotifier { @@ -125,6 +125,7 @@ class CustomerProvider extends ChangeNotifier {
125 bool isrepair = false; 125 bool isrepair = false;
126 bool isselfphone = false; 126 bool isselfphone = false;
127 bool ispcphone = true; 127 bool ispcphone = true;
  128 + bool ispcname = true;
128 bool isAddOver = true; 129 bool isAddOver = true;
129 bool isSetOver = true; 130 bool isSetOver = true;
130 bool isReserveOver = true; 131 bool isReserveOver = true;