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..8c9cf9d 100644 --- a/wp/Other/Info.plist +++ b/wp/Other/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.01 + 1.12 CFBundleSignature ???? CFBundleURLTypes @@ -44,7 +44,7 @@ CFBundleVersion - 20170527 + 20170614 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 93a53c4..0000000 Binary files a/wp/Resource/image/bankImg/jiaotong@2x.png and /dev/null differ diff --git a/wp/Resource/image/bankImg/jiaotong@3x.png b/wp/Resource/image/bankImg/jiaotong@3x.png deleted file mode 100644 index efe9430..0000000 Binary files a/wp/Resource/image/bankImg/jiaotong@3x.png and /dev/null differ diff --git a/wp/Resource/storyboard/Home.storyboard b/wp/Resource/storyboard/Home.storyboard index 46dadc4..acf69eb 100644 --- a/wp/Resource/storyboard/Home.storyboard +++ b/wp/Resource/storyboard/Home.storyboard @@ -164,7 +164,7 @@ - +