南鑫林 5 роки тому
батько
коміт
294a0d6dd3

+ 2 - 0
RainbowPlanet/Podfile

@@ -46,6 +46,8 @@ target 'RainbowPlanet' do
   pod 'FWPopupView'
   # 存储数据Keychain
   pod 'KeychainAccess'
+  # TabBar
+  pod 'ESTabBarController-swift'
   # mvvm
 #  pod 'ReactorKit'
   # 富文本

+ 5 - 1
RainbowPlanet/Podfile.lock

@@ -4,6 +4,7 @@ PODS:
   - BMKLocationKit (1.5.0)
   - Cache (5.2.0)
   - DeviceKit (2.0.0)
+  - ESTabBarController-swift (2.7)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -59,6 +60,7 @@ DEPENDENCIES:
   - BMKLocationKit (= 1.5.0)
   - Cache
   - DeviceKit
+  - ESTabBarController-swift
   - FMDB
   - FSPagerView
   - FWPopupView
@@ -93,6 +95,7 @@ SPEC REPOS:
     - BMKLocationKit
     - Cache
     - DeviceKit
+    - ESTabBarController-swift
     - FMDB
     - FSPagerView
     - FWPopupView
@@ -124,6 +127,7 @@ SPEC CHECKSUMS:
   BMKLocationKit: 40d267478acd8704ddebd0e9deaddc727b13df9f
   Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
   DeviceKit: 72d36709552d4b3582abd76a53949148acad9811
+  ESTabBarController-swift: 4fb52ad03d94d0717ef97bc9eb09a5abfdded0a2
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   FSPagerView: 816a18842306973cc7cc6df8a5332272f7815c30
   FWPopupView: 50e0db3245879b9b73552c897b17a215ac0f9199
@@ -149,6 +153,6 @@ SPEC CHECKSUMS:
   UMCSecurityPlugins: 0831a08f3988f3cea9f1d3a7626cd9bee4fef150
   UMCShare: 552b29753f1b4da87b51d96545ed19e6263df397
 
-PODFILE CHECKSUM: 4a01ace7f7c9830f6f0d05d8b32b73e6e6dd61fa
+PODFILE CHECKSUM: 737295f2e7556094caab18f75bba749d0cfe3d55
 
 COCOAPODS: 1.7.1

+ 1 - 9
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2074,7 +2074,6 @@
 				A77F2CA92232010F001BD3F6 /* MineModule */,
 				A7FF155A228C689C00A85748 /* OrderModule */,
 				A77F2CA32232010F001BD3F6 /* ShoppingMallModule */,
-				A77F2CAF2232010F001BD3F6 /* ShoppingCartModule */,
 				A729B5A52266DBC9004AE098 /* CommonModules */,
 			);
 			path = Modules;
@@ -2083,6 +2082,7 @@
 		A77F2CA32232010F001BD3F6 /* ShoppingMallModule */ = {
 			isa = PBXGroup;
 			children = (
+				A77F2CB02232010F001BD3F6 /* ShoppingCart */,
 				A7DF50D922A556C300998908 /* BrowsePictures */,
 				A77F2CA42232010F001BD3F6 /* ShoppingMall */,
 				A7FF1550228AC22700A85748 /* ProductAllComment */,
@@ -2159,14 +2159,6 @@
 			path = RegisterLoginModule;
 			sourceTree = "<group>";
 		};
-		A77F2CAF2232010F001BD3F6 /* ShoppingCartModule */ = {
-			isa = PBXGroup;
-			children = (
-				A77F2CB02232010F001BD3F6 /* ShoppingCart */,
-			);
-			path = ShoppingCartModule;
-			sourceTree = "<group>";
-		};
 		A77F2CB02232010F001BD3F6 /* ShoppingCart */ = {
 			isa = PBXGroup;
 			children = (

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartAccountView.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartAccountView.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartHotSale/ShoppingCartHotSaleTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartHotSale/ShoppingCartHotSaleTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListNoneItemCell.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListNoneItemCell.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewHeader.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewHeader.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartView.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartView.swift


RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/ViewController/ShoppingCartViewController.swift → RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/ViewController/ShoppingCartViewController.swift