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> {
//初始化微信SDK
_initFluwx() async {
await registerWxApi(
appId: "wx85aa3cdd0f791e65",
// appId: "wx85aa3cdd0f791e65",
appId: "wx4d105e36a36a6139",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/OneKey/");
... ... @@ -243,7 +244,7 @@ class MyAppState extends State<MyApp> {
builder: (context, child) {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: '一键订',
title: '周到安排商家',
// navigatorKey: App.getIt<NavigateService>().key,
//国际化
localizationsDelegates: const [
... ...
... ... @@ -1029,7 +1029,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
return true;
}
lastBack = DateTime.now();
Utils.showToast("再次返回退出一键订");
Utils.showToast("再次返回退出周到安排商家");
return false;
},
);
... ...
... ... @@ -58,7 +58,8 @@ class _FirstPageState extends State<FirstPage> {
//初始化微信SDK
_initFluwx() async {
await registerWxApi(
appId: "wx85aa3cdd0f791e65",
// appId: "wx85aa3cdd0f791e65",
appId: "wx4d105e36a36a6139",
doOnAndroid: true,
doOnIOS: true,
universalLink: "https://xt04.colorcun.com/link/OneKey/");
... ... @@ -134,7 +135,7 @@ class _FirstPageState extends State<FirstPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'亲爱的用户，感谢您信任并使用一键订!',
'亲爱的用户，感谢您信任并使用周到安排商家!',
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(28),
... ... @@ -254,7 +255,7 @@ class _FirstPageState extends State<FirstPage> {
//修改之前有内容，则弹框
DialogUtil.cupertinoAlertDialog(context,
title: "",
content: "您需要同意《一键订隐私政策》，才能继续使用我们的服务哦。",
content: "您需要同意《周到安排商家隐私政策》，才能继续使用我们的服务哦。",
lTitle: "暂不",
rTitle: "去同意", lCallback: () {
print("取消");
... ...
... ... @@ -134,7 +134,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
}
}
//判断是否登录
//判断是否登录
void isLogin() async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
userModel.initUser();
... ... @@ -186,8 +186,10 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
///获取微信登录access_token
_getAccessToken(String code) async {
// Response response = await DioUtil.getInstance().getDio().get(
// "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
Response response = await DioUtil.getInstance().getDio().get(
"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx85aa3cdd0f791e65&secret=87c9a23c2e6032b2da75af6b0efc5424&code=$code&grant_type=authorization_code");
"https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx4d105e36a36a6139&secret=90ba794b30d2fe388309149174874603&code=$code&grant_type=authorization_code");
LogUtil.v("access_token:${response.toString()}");
Map<String, dynamic> responseData = json.decode(response.data.toString());
if (responseData["errcode"] != null) {
... ... @@ -820,7 +822,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text('一键订账号登录',
Text('账号登录',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(28),
... ...
... ... @@ -166,7 +166,7 @@ class _ReceiveOrdersTimeSetPageState extends State<ReceiveOrdersTimeSetPage> {
///弹出提示框
///
DialogUtil.openAlertDialog(context, '接单时间已修改',
'如果您在使用一键订电话机，需要将电话机重新启动后，电话机上才能生效。', '知道了', 372,
'如果您在使用周到安排商家电话机，需要将电话机重新启动后，电话机上才能生效。', '知道了', 372,
fontSize: 30, onTap: () {
EventBus().emit('changeStatusColor');
Navigator.of(context).pop();
... ...
... ... @@ -30,7 +30,7 @@ class _WebViewPageState extends State<WebViewPage> {
// We're using a Builder here so we have a context that is below the Scaffold
// to allow calling Scaffold.of(context) so we can show a snackbar.
appBar: SystemAppBar(
'一键订',
'周到安排商家',
onTap: () {
EventBus().emit('changeStatusColor');
Navigator.of(context).pop();
... ...
... ... @@ -5182,7 +5182,7 @@ class DialogUtil {
Container(
height: ScreenUtil().setWidth(48),
alignment: Alignment.center,
child: Text('欢迎使用一键订',
child: Text('欢迎使用周到安排商家',
style: TextStyle(
fontSize: ScreenUtil().setSp(fontSize),
fontWeight: FontWeight.bold,
... ... @@ -5202,7 +5202,7 @@ class DialogUtil {
ScreenUtil()
.setWidth(2)), //1为 StrutStyle 的 leading的值
child: Text(
'登录一键订前，请先阅读并同意',
'登录周到安排商家前，请先阅读并同意',
style: TextStyle(
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(30),
... ...