Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

张旭
2 parents 01058e77 68aba181
Showing 3 changed files with 32 additions and 8 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
@@ -45,9 +45,6 @@ target &#39;metaCode&#39; do
   #轮播图
   pod 'FSPagerView', '0.8.3'
 #  pod 'SDCycleScrollView', '~> 1.82'
-  
-  #应用调试工具
-  pod 'FWDebug', :configurations => ['Debug']
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -1435,8 +1435,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "元码";
@@ -1457,7 +1458,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1479,8 +1480,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "元码";
@@ -1501,7 +1503,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -78,10 +78,35 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
         addSubview(expressName)
         expressName.snp.makeConstraints { make in
             make.top.equalTo(logoImageView.snp.top).offset(adapt_length(length: 0.5))
-            
+            make.left.equalTo(logoImageView.snp.right).offset(adapt_length(length: 15))
+        }
+        addSubview(expressCopy)
+        expressCopy.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 20))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.width.equalTo(adapt_length(length: 77))
+            make.height.equalTo(adapt_length(length: 30))
+        }
+        addSubview(expressNo)
+        expressNo.snp.makeConstraints { make in
+            make.top.equalTo(expressName.snp.bottom).offset(adapt_length(length: 2.5))
+            make.left.equalTo(expressName.snp.left)
+            make.right.equalTo(expressCopy.snp.left).offset(adapt_length(length: 5))
+        }
+        addSubview(expressTime)
+        expressTime.snp.makeConstraints { make in
+            make.top.equalTo(logoImageView.snp.bottom).offset(adapt_length(length: 5))
+            make.left.equalTo(logoImageView.snp.left)
+        }
+        addSubview(expressAddress)
+        expressAddress.snp.makeConstraints { make in
+            make.top.equalTo(expressTime.snp.bottom).offset(adapt_length(length: 2))
+            make.left.equalTo(expressTime.snp.left)
+            make.right.equalToSuperview().offset(-adapt_length(length: 15))
         }
     }
+    
     var _listModel: ShopOrderExpressListModel!
     func setupDataSource(listModel: ShopOrderExpressListModel) {
         _listModel = listModel