From 323427942f822dff4ac210bb14dcd911c838b397 Mon Sep 17 00:00:00 2001 From: PH2 <1293456824@qq.com> Date: Wed, 11 Nov 2020 11:17:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=8E=B7=E5=8F=96page=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=90=8E=E7=BC=80=E7=9A=84=E6=96=B9=E5=BC=8F=E6=9D=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=202=E3=80=81=E6=96=B0=E5=A2=9E=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=B8=A0=E9=81=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/util/global_config.dart | 21 ++++++++++++++++----- lib/util/page_factory.dart | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/lib/util/global_config.dart b/lib/util/global_config.dart index 23ceeda..a33bbbb 100644 --- a/lib/util/global_config.dart +++ b/lib/util/global_config.dart @@ -7,6 +7,18 @@ class GlobalConfig { /// 成功返回的CODE值 static final int RESPONSE_SUCCESS_CODE = 1; + /// 通用标志key + static final String SKIP_IDENTIFIER = 'skip_identifier'; + + /// ====================== 各个渠道的key ====================== /// + static final String PROVIDER_TB = 'taobao'; // 淘宝 + static final String PROVIDER_TM = 'tianmao'; // 天猫 + static final String PROVIDER_JD = 'jd'; // 京东 + static final String PROVIDER_KL = 'kaola'; // 考拉 + static final String PROVIDER_VIP = 'vip'; // 唯品会 + static final String PROVIDER_SN = 'suning'; // 苏宁 + static final String PROVIDER_PDD = 'pdd'; // 拼多多 + /// ====================== Shared_prefe_key ====================== /// /// 用户token static final String SHARED_KEY_TOKEN = 'sp_token'; @@ -20,11 +32,10 @@ class GlobalConfig { /// 用户json static final String SHARED_KEY_USER_INFO = 'sp_userinfo'; - - /// 货币类型 static final String MONEY_TYPE = "¥ "; - /// 天猫 淘宝类型 - static final String PROVIDER_TM = 'tianmao'; - static final String PROVIDER_TB = 'taobao'; + +// /// 天猫 淘宝类型 +// static final String PROVIDER_TM = 'tianmao'; +// static final String PROVIDER_TB = 'taobao'; } diff --git a/lib/util/page_factory.dart b/lib/util/page_factory.dart index b871450..9478075 100644 --- a/lib/util/page_factory.dart +++ b/lib/util/page_factory.dart @@ -30,6 +30,23 @@ class PageFactory { if (pageCreater.containsKey(name)) { return pageCreater[name](model); } + // ⚠️ 由于使用了跳转标志带有后缀,所以需要判断是否带有后缀,如果带有并且是数字,则清除后缀获取page + String tempName; + try{ + String suffixStr = name.substring(name.lastIndexOf('.') + 1, name.length); + tempName = name.substring(0, name.lastIndexOf('.')); + Logger.log('sufix = $suffixStr , prefix = $tempName'); + int suffixNum = int.parse(suffixStr); + Logger.log('suffixNum = $suffixNum}'); + }catch(e){ + tempName = null; + Logger.debug(e); + } + + if(!EmptyUtil.isEmpty(tempName) && pageCreater.containsKey(tempName)){ + return pageCreater[tempName](model); + } + return EmptyPage(); }