Commit 2a7741d6b61cf3029cabe25cf3c3532d1053f585

Authored by wdn127929
1 parent 7d59ce6a

模版换行问题

@@ -7,6 +7,7 @@ import 'package:one_key/widgets/system_app_bar.dart'; @@ -7,6 +7,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
7 import 'package:provider/provider.dart'; 7 import 'package:provider/provider.dart';
8 8
9 import '../../../../models/store_customer_home_model.dart'; 9 import '../../../../models/store_customer_home_model.dart';
  10 +import '../../../../provider/collect_store_provider.dart';
10 import '../../../../provider/customer_provider.dart'; 11 import '../../../../provider/customer_provider.dart';
11 import '../../../../res/colors.dart'; 12 import '../../../../res/colors.dart';
12 import '../../../../route/navigator_util.dart'; 13 import '../../../../route/navigator_util.dart';
@@ -130,13 +131,16 @@ class _StoreCustomerHomePageState extends State<StoreCustomerHomePage> @@ -130,13 +131,16 @@ class _StoreCustomerHomePageState extends State<StoreCustomerHomePage>
130 )), 131 )),
131 Expanded( 132 Expanded(
132 child: TabBarView(controller: tabController, children: [ 133 child: TabBarView(controller: tabController, children: [
133 - StoreCustomerHomeLeftPage(  
134 - customerProvider: customerProvider,  
135 - ), 134 + ChangeNotifierProvider<CollectStoreProvider>(
  135 + create: (_) => CollectStoreProvider(),
  136 + child: StoreCustomerHomeLeftPage(
  137 + customerProvider: customerProvider,
  138 + )),
136 StoreCustomerHomeRightPage(customerProvider: customerProvider) 139 StoreCustomerHomeRightPage(customerProvider: customerProvider)
137 ]), 140 ]),
138 ), 141 ),
139 ], 142 ],
  143 +
140 )); 144 ));
141 } 145 }
142 } 146 }
@@ -117,10 +117,16 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> { @@ -117,10 +117,16 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
117 temp = temp.replaceAll(element.code, element.show); 117 temp = temp.replaceAll(element.code, element.show);
118 } 118 }
119 }); 119 });
120 - // if(contentChangeStart.endsWith('\n')){  
121 - // controller.text = temp.startsWith('\n') ? temp.rep 120 + // if (contentChangeStart.endsWith('\n')) {
  121 + // print(temp);
  122 + // String result = temp.substring(1, temp.length);
  123 + // print(result);
  124 +
  125 + controller.text =
  126 + temp.startsWith('\n') ? temp.substring(1, temp.length) : temp;
122 // } 127 // }
123 - controller.text = temp; 128 + // controller.text = temp;
  129 + print(controller.text);
124 setState(() {}); 130 setState(() {});
125 } else { 131 } else {
126 // if (!results[0]) { 132 // if (!results[0]) {
@@ -152,7 +158,11 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> { @@ -152,7 +158,11 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
152 Map<String, String> params = { 158 Map<String, String> params = {
153 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, 159 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
154 'sms_code': smsSelectValue, 160 'sms_code': smsSelectValue,
155 - 'bookinginfo': text, 161 + 'bookinginfo': smsSelectValue == 'tqNH3' || smsSelectValue == 'EZXsN2'
  162 + ? text.startsWith('\n')
  163 + ? text
  164 + : '\n' + text
  165 + : text,
156 // 'bookinginfo': text.startsWith('\n') ? text : '\n' + text, 166 // 'bookinginfo': text.startsWith('\n') ? text : '\n' + text,
157 }; 167 };
158 168
@@ -200,7 +210,11 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> { @@ -200,7 +210,11 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
200 // i 的select = true; 210 // i 的select = true;
201 temData[i].select = true; 211 temData[i].select = true;
202 smsSelectValue = temData[i].temp; 212 smsSelectValue = temData[i].temp;
203 - controller.text = temData[i].content; 213 + // controller.text = temData[i].content;
  214 + // controller.text = temData[i].content;
  215 + String temp = temData[i].content;
  216 + controller.text =
  217 + temp.startsWith('\n') ? temp.substring(1, temp.length) : temp;
204 marketingCenterProvider.saiYouYunchangedData.forEach((element) { 218 marketingCenterProvider.saiYouYunchangedData.forEach((element) {
205 element.select = false; 219 element.select = false;
206 }); 220 });
@@ -230,8 +244,17 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> { @@ -230,8 +244,17 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
230 data.add(btnItem(temData[i].temp, temData[i].select, onTap: () { 244 data.add(btnItem(temData[i].temp, temData[i].select, onTap: () {
231 // if (!canChange) { 245 // if (!canChange) {
232 //从固定模版变更过来的,清空文本框内容 246 //从固定模版变更过来的,清空文本框内容
233 - controller.text =  
234 - temData[i].now == null ? '' : temData[i].now.content ?? ''; 247 +
  248 + controller.text = temData[i].now == null
  249 + ? ''
  250 + : temData[i].now.content == null
  251 + ? ''
  252 + : temData[i].now.content.startsWith('\n')
  253 + ? temData[i]
  254 + .now
  255 + .content
  256 + .substring(1, temData[i].now.content.length)
  257 + : temData[i].now.content;
235 // } 258 // }
236 canChange = true; 259 canChange = true;
237 marketingCenterProvider.saiYouYunchangedData.forEach((element) { 260 marketingCenterProvider.saiYouYunchangedData.forEach((element) {