xt / Flutter-ReserveApp · Commits

Go to a project

Commit 765450202c6157adf08c976ad5b928088323350d

Authored by wdn127929
1 parent 3e3fb1d0
build: skipped

周到安排商家

Inline Side-by-side
Showing 7 changed files with 17 additions and 13 deletions
@@ -167,7 +167,8 @@ class MyAppState extends State<MyApp> { @@ -167,7 +167,8 @@ class MyAppState extends State<MyApp> {
167 //初始化微信SDK 167 //初始化微信SDK
168 _initFluwx() async { 168 _initFluwx() async {
169 await registerWxApi( 169 await registerWxApi(
170 - appId: "wx85aa3cdd0f791e65", 170 + // appId: "wx85aa3cdd0f791e65",
  171 + appId: "wx4d105e36a36a6139",
171 doOnAndroid: true, 172 doOnAndroid: true,
172 doOnIOS: true, 173 doOnIOS: true,
173 universalLink: "https://xt04.colorcun.com/link/OneKey/"); 174 universalLink: "https://xt04.colorcun.com/link/OneKey/");
@@ -243,7 +244,7 @@ class MyAppState extends State<MyApp> { @@ -243,7 +244,7 @@ class MyAppState extends State<MyApp> {
243 builder: (context, child) { 244 builder: (context, child) {
244 return MaterialApp( 245 return MaterialApp(
245 debugShowCheckedModeBanner: false, 246 debugShowCheckedModeBanner: false,
246 - title: '一键订', 247 + title: '周到安排商家',
247 // navigatorKey: App.getIt<NavigateService>().key, 248 // navigatorKey: App.getIt<NavigateService>().key,
248 //国际化 249 //国际化
249 localizationsDelegates: const [ 250 localizationsDelegates: const [
@@ -1029,7 +1029,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1029,7 +1029,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1029 return true; 1029 return true;
1030 } 1030 }
1031 lastBack = DateTime.now(); 1031 lastBack = DateTime.now();
1032 - Utils.showToast("再次返回退出一键订"); 1032 + Utils.showToast("再次返回退出周到安排商家");
1033 return false; 1033 return false;
1034 }, 1034 },
1035 ); 1035 );
@@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> { @@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> {
58 //初始化微信SDK 58 //初始化微信SDK
59 _initFluwx() async { 59 _initFluwx() async {
60 await registerWxApi( 60 await registerWxApi(
61 - appId: "wx85aa3cdd0f791e65", 61 + // appId: "wx85aa3cdd0f791e65",
  62 + appId: "wx4d105e36a36a6139",
62 doOnAndroid: true, 63 doOnAndroid: true,
63 doOnIOS: true, 64 doOnIOS: true,
64 universalLink: "https://xt04.colorcun.com/link/OneKey/"); 65 universalLink: "https://xt04.colorcun.com/link/OneKey/");
@@ -134,7 +135,7 @@ class _FirstPageState extends State<FirstPage> { @@ -134,7 +135,7 @@ class _FirstPageState extends State<FirstPage> {
134 crossAxisAlignment: CrossAxisAlignment.start, 135 crossAxisAlignment: CrossAxisAlignment.start,
135 children: [ 136 children: [
136 Text( 137 Text(
137 - '亲爱的用户，感谢您信任并使用一键订!', 138 + '亲爱的用户，感谢您信任并使用周到安排商家!',
138 style: TextStyle( 139 style: TextStyle(
139 color: MyColours.color_333333, 140 color: MyColours.color_333333,
140 fontSize: ScreenUtil().setSp(28), 141 fontSize: ScreenUtil().setSp(28),
@@ -254,7 +255,7 @@ class _FirstPageState extends State<FirstPage> { @@ -254,7 +255,7 @@ class _FirstPageState extends State<FirstPage> {
254 //修改之前有内容，则弹框 255 //修改之前有内容，则弹框
255 DialogUtil.cupertinoAlertDialog(context, 256 DialogUtil.cupertinoAlertDialog(context,
256 title: "", 257 title: "",
257 - content: "您需要同意《一键订隐私政策》，才能继续使用我们的服务哦。", 258 + content: "您需要同意《周到安排商家隐私政策》，才能继续使用我们的服务哦。",
258 lTitle: "暂不", 259 lTitle: "暂不",
259 rTitle: "去同意", lCallback: () { 260 rTitle: "去同意", lCallback: () {
260 print("取消"); 261 print("取消");
@@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
134 } 134 }
135 } 135 }
136 136
137 - //判断是否登录 137 + //判断是否登录
138 void isLogin() async { 138 void isLogin() async {
139 UserModel userModel = Provider.of<UserModel>(context, listen: false); 139 UserModel userModel = Provider.of<UserModel>(context, listen: false);
140 userModel.initUser(); 140 userModel.initUser();
@@ -186,8 +186,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -186,8 +186,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
186 186
187 ///获取微信登录access_token 187 ///获取微信登录access_token
188 _getAccessToken(String code) async { 188 _getAccessToken(String code) async {
  189 + // Response response = await DioUtil.getInstance().getDio().get(
  190 + // "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
189 Response response = await DioUtil.getInstance().getDio().get( 191 Response response = await DioUtil.getInstance().getDio().get(
190 - "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code"); 192 + "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx4d105e36a36a6139&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code");
191 LogUtil.v("access_token:${response.toString()}"); 193 LogUtil.v("access_token:${response.toString()}");
192 Map<String, dynamic> responseData = json.decode(response.data.toString()); 194 Map<String, dynamic> responseData = json.decode(response.data.toString());
193 if (responseData["errcode"] != null) { 195 if (responseData["errcode"] != null) {
@@ -820,7 +822,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -820,7 +822,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
820 child: Row( 822 child: Row(
821 mainAxisAlignment: MainAxisAlignment.center, 823 mainAxisAlignment: MainAxisAlignment.center,
822 children: [ 824 children: [
823 - Text('一键订账号登录', 825 + Text('账号登录',
824 style: TextStyle( 826 style: TextStyle(
825 color: MyColours.color_ffffff, 827 color: MyColours.color_ffffff,
826 fontSize: ScreenUtil().setSp(28), 828 fontSize: ScreenUtil().setSp(28),
@@ -166,7 +166,7 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> { @@ -166,7 +166,7 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
166 ///弹出提示框 166 ///弹出提示框
167 /// 167 ///
168 DialogUtil.openAlertDialog(context, '接单时间已修改', 168 DialogUtil.openAlertDialog(context, '接单时间已修改',
169 - '如果您在使用一键订电话机，需要将电话机重新启动后，电话机上才能生效。', '知道了', 372, 169 + '如果您在使用周到安排商家电话机，需要将电话机重新启动后，电话机上才能生效。', '知道了', 372,
170 fontSize: 30, onTap: () { 170 fontSize: 30, onTap: () {
171 EventBus().emit('changeStatusColor'); 171 EventBus().emit('changeStatusColor');
172 Navigator.of(context).pop(); 172 Navigator.of(context).pop();
@@ -30,7 +30,7 @@ class _WebViewPageState extends State<WebViewPage> { @@ -30,7 +30,7 @@ class _WebViewPageState extends State<WebViewPage> {
30 // We're using a Builder here so we have a context that is below the Scaffold 30 // We're using a Builder here so we have a context that is below the Scaffold
31 // to allow calling Scaffold.of(context) so we can show a snackbar. 31 // to allow calling Scaffold.of(context) so we can show a snackbar.
32 appBar: SystemAppBar( 32 appBar: SystemAppBar(
33 - '一键订', 33 + '周到安排商家',
34 onTap: () { 34 onTap: () {
35 EventBus().emit('changeStatusColor'); 35 EventBus().emit('changeStatusColor');
36 Navigator.of(context).pop(); 36 Navigator.of(context).pop();
@@ -5182,7 +5182,7 @@ class DialogUtil { @@ -5182,7 +5182,7 @@ class DialogUtil {
5182 Container( 5182 Container(
5183 height: ScreenUtil().setWidth(48), 5183 height: ScreenUtil().setWidth(48),
5184 alignment: Alignment.center, 5184 alignment: Alignment.center,
5185 - child: Text('欢迎使用一键订', 5185 + child: Text('欢迎使用周到安排商家',
5186 style: TextStyle( 5186 style: TextStyle(
5187 fontSize: ScreenUtil().setSp(fontSize), 5187 fontSize: ScreenUtil().setSp(fontSize),
5188 fontWeight: FontWeight.bold, 5188 fontWeight: FontWeight.bold,
@@ -5202,7 +5202,7 @@ class DialogUtil { @@ -5202,7 +5202,7 @@ class DialogUtil {
5202 ScreenUtil() 5202 ScreenUtil()
5203 .setWidth(2)), //1为 StrutStyle 的 leading的值 5203 .setWidth(2)), //1为 StrutStyle 的 leading的值
5204 child: Text( 5204 child: Text(
5205 - '登录一键订前，请先阅读并同意', 5205 + '登录周到安排商家前，请先阅读并同意',
5206 style: TextStyle( 5206 style: TextStyle(
5207 color: MyColours.color_333333, 5207 color: MyColours.color_333333,
5208 fontSize: ScreenUtil().setSp(30), 5208 fontSize: ScreenUtil().setSp(30),