From 1959eb69e3e9d5297ff840a226d2d9aca97fc978 Mon Sep 17 00:00:00 2001 From: mu <1755731709@qq.com> Date: Mon, 29 May 2017 18:11:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20=E5=91=A8=E5=85=AD=E5=91=A8=E6=97=A5?= =?UTF-8?q?=E5=81=9C=E7=9B=98UI=E8=B0=83=E6=95=B4=20-=20bug=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20-=20=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DKColorTable.txt | 1 + wp.xcodeproj/project.pbxproj | 8 -- wp/AppAPI/SocketAPI/SocketConst.swift | 1 + wp/Marco/AppConst.swift | 1 + wp/Other/Info.plist | 4 +- wp/Resource/image/bankImg/jiaotong@2x.png | Bin 1124 -> 0 bytes wp/Resource/image/bankImg/jiaotong@3x.png | Bin 2739 -> 0 bytes wp/Resource/storyboard/Home.storyboard | 72 +++++++++--------- wp/Resource/storyboard/Login.storyboard | 25 ++++-- .../Deal/CustomView/ProductsiCarousel.swift | 2 +- wp/Scenes/Deal/DealVC.swift | 15 +++- wp/Scenes/Home/ProdectCell.swift | 12 ++- wp/Scenes/Login/LoginVC.swift | 8 +- wp/Scenes/Login/RegisterVC.swift | 47 +++++++++++- wp/Scenes/Login/ResetLoginPasswordVC.swift | 16 ++++ .../Share/RechageVC/EasyRechargeVC.swift | 9 ++- .../Share/RechageVC/InputBankPhone.swift | 37 ++------- 17 files changed, 159 insertions(+), 99 deletions(-) delete mode 100644 wp/Resource/image/bankImg/jiaotong@2x.png delete mode 100644 wp/Resource/image/bankImg/jiaotong@3x.png diff --git a/DKColorTable.txt b/DKColorTable.txt index f47d116..d19d1ff 100755 --- a/DKColorTable.txt +++ b/DKColorTable.txt @@ -5,6 +5,7 @@ NORMAL NIGHT RED #0eaf56 #0eaf56 #0eaf56 buyDown #f5f5f5 #f5f5f5 #f5f5f5 background #2795d9 #2795d9 #2795d9 lightBlue +#333333 #2795d9 #2795d9 stopBusiness diff --git a/wp.xcodeproj/project.pbxproj b/wp.xcodeproj/project.pbxproj index c6792bb..323738f 100644 --- a/wp.xcodeproj/project.pbxproj +++ b/wp.xcodeproj/project.pbxproj @@ -41,8 +41,6 @@ 8EC879551E77F1B2004A42E8 /* shouye-shujujiazai@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EC879511E77F1B2004A42E8 /* shouye-shujujiazai@3x.png */; }; 8ED4ADE91E56EF0B00E4BB7B /* WPWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ED4ADE81E56EF0B00E4BB7B /* WPWebViewController.swift */; }; 8EF59D151E571D6E00BABBD0 /* BankList.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D141E571D6E00BABBD0 /* BankList.plist */; }; - 8EF59DB11E571D8200BABBD0 /* jiaotong@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D181E571D8200BABBD0 /* jiaotong@2x.png */; }; - 8EF59DB21E571D8200BABBD0 /* jiaotong@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D191E571D8200BABBD0 /* jiaotong@3x.png */; }; 8EF59DB31E571D8200BABBD0 /* nongye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D1A1E571D8200BABBD0 /* nongye@2x.png */; }; 8EF59DB41E571D8200BABBD0 /* nongye@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D1B1E571D8200BABBD0 /* nongye@3x.png */; }; 8EF59DB51E571D8200BABBD0 /* gongshang@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EF59D1C1E571D8200BABBD0 /* gongshang@2x.png */; }; @@ -347,8 +345,6 @@ 8EC879561E79750E004A42E8 /* wp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = wp.entitlements; sourceTree = ""; }; 8ED4ADE81E56EF0B00E4BB7B /* WPWebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WPWebViewController.swift; sourceTree = ""; }; 8EF59D141E571D6E00BABBD0 /* BankList.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = BankList.plist; sourceTree = ""; }; - 8EF59D181E571D8200BABBD0 /* jiaotong@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "jiaotong@2x.png"; sourceTree = ""; }; - 8EF59D191E571D8200BABBD0 /* jiaotong@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "jiaotong@3x.png"; sourceTree = ""; }; 8EF59D1A1E571D8200BABBD0 /* nongye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nongye@2x.png"; sourceTree = ""; }; 8EF59D1B1E571D8200BABBD0 /* nongye@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nongye@3x.png"; sourceTree = ""; }; 8EF59D1C1E571D8200BABBD0 /* gongshang@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gongshang@2x.png"; sourceTree = ""; }; @@ -743,8 +739,6 @@ 8EF59D171E571D8200BABBD0 /* bankImg */ = { isa = PBXGroup; children = ( - 8EF59D181E571D8200BABBD0 /* jiaotong@2x.png */, - 8EF59D191E571D8200BABBD0 /* jiaotong@3x.png */, 8EF59D1A1E571D8200BABBD0 /* nongye@2x.png */, 8EF59D1B1E571D8200BABBD0 /* nongye@3x.png */, 8EF59D1C1E571D8200BABBD0 /* gongshang@2x.png */, @@ -1553,7 +1547,6 @@ 6E320ECD1E67C92D006C656E /* personal_tixian@3x.png in Resources */, 8EF59E031E571D8200BABBD0 /* sina@3x.png in Resources */, 8EF59DDC1E571D8200BABBD0 /* detail@2x.png in Resources */, - 8EF59DB11E571D8200BABBD0 /* jiaotong@2x.png in Resources */, 8EF59DE61E571D8200BABBD0 /* icon-13.png in Resources */, 8EF59DD81E571D8200BABBD0 /* addFocusOn@2x.png in Resources */, 8EF59E131E571D8200BABBD0 /* ShareSelect@2x.png in Resources */, @@ -1697,7 +1690,6 @@ A0E9F5761E6FA2BB0077E669 /* weixinpay@2x.png in Resources */, 8EF59E1A1E571D8200BABBD0 /* Account@3x.png in Resources */, 6E320ECC1E67C92D006C656E /* personal_tixian@2x.png in Resources */, - 8EF59DB21E571D8200BABBD0 /* jiaotong@3x.png in Resources */, 8EF59DBC1E571D8200BABBD0 /* zhaoshang@3x.png in Resources */, 8EF59DD91E571D8200BABBD0 /* addFocusOn@3x.png in Resources */, BF3A0D701E2C5FAB004CEE4D /* Share.storyboard in Resources */, diff --git a/wp/AppAPI/SocketAPI/SocketConst.swift b/wp/AppAPI/SocketAPI/SocketConst.swift index c5f90aa..e5a87cf 100644 --- a/wp/AppAPI/SocketAPI/SocketConst.swift +++ b/wp/AppAPI/SocketAPI/SocketConst.swift @@ -36,6 +36,7 @@ class SocketConst: NSObject { case getUserinfo = 1001 //每天的数据 case accinfo = 3007 + //token case tokenLogin = 3009 //银行卡列表 case bankcardList = 8003 diff --git a/wp/Marco/AppConst.swift b/wp/Marco/AppConst.swift index 247c190..4d659ae 100644 --- a/wp/Marco/AppConst.swift +++ b/wp/Marco/AppConst.swift @@ -56,6 +56,7 @@ class AppConst { static let buyDown = "buyDown" static let auxiliary = "auxiliary" static let lightBlue = "lightBlue" + static let stopBusiness = "stopBusiness" }; diff --git a/wp/Other/Info.plist b/wp/Other/Info.plist index 29ec350..df2a585 100644 --- a/wp/Other/Info.plist +++ b/wp/Other/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.01 + 1.11 CFBundleSignature ???? CFBundleURLTypes @@ -44,7 +44,7 @@ CFBundleVersion - 20170527 + 20170627 Fabric APIKey diff --git a/wp/Resource/image/bankImg/jiaotong@2x.png b/wp/Resource/image/bankImg/jiaotong@2x.png deleted file mode 100644 index 93a53c44ca87326f312cbae47d5815d3d7cc3a1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 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 i!$iJ7LT5KyPXG+x*-{6Sb#_nxIRM - +