iOS Team / CNLiveMateCode · Commits

Commit dc957507b0ca795f3de86b6b3f8cc2c77b065b7c

Authored by 张旭
2 parents 01058e77 68aba181

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

Inline Side-by-side
Showing 3 changed files with 32 additions and 8 deletions
... ... @@ -45,9 +45,6 @@ target 'metaCode' do
45 45 #轮播图
46 46 pod 'FSPagerView', '0.8.3'
47 47 # pod 'SDCycleScrollView', '~> 1.82'
48   -
49   - #应用调试工具
50   - pod 'FWDebug', :configurations => ['Debug']
51 48  
52 49 target 'metaCodeTests' do
53 50 inherit! :search_paths
... ...
metaCode.xcodeproj/project.pbxproj
  View file @dc95750
... ... @@ -1435,8 +1435,9 @@
1435 1435 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1436 1436 CLANG_ENABLE_MODULES = YES;
1437 1437 CODE_SIGN_STYLE = Automatic;
1438   - CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
  1438 + CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
1439 1439 DEVELOPMENT_TEAM = 94X49GG3ZW;
  1440 + EXCLUDED_ARCHS = "";
1440 1441 GENERATE_INFOPLIST_FILE = YES;
1441 1442 INFOPLIST_FILE = metaCode/Info.plist;
1442 1443 INFOPLIST_KEY_CFBundleDisplayName = "元码";
... ... @@ -1457,7 +1458,7 @@
1457 1458 "$(inherited)",
1458 1459 "@executable_path/Frameworks",
1459 1460 );
1460   - MARKETING_VERSION = 1.0.0;
  1461 + MARKETING_VERSION = 1.0.1;
1461 1462 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1462 1463 PRODUCT_NAME = "$(TARGET_NAME)";
1463 1464 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ... @@ -1479,8 +1480,9 @@
1479 1480 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1480 1481 CLANG_ENABLE_MODULES = YES;
1481 1482 CODE_SIGN_STYLE = Automatic;
1482   - CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
  1483 + CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.13;
1483 1484 DEVELOPMENT_TEAM = 94X49GG3ZW;
  1485 + EXCLUDED_ARCHS = "";
1484 1486 GENERATE_INFOPLIST_FILE = YES;
1485 1487 INFOPLIST_FILE = metaCode/Info.plist;
1486 1488 INFOPLIST_KEY_CFBundleDisplayName = "元码";
... ... @@ -1501,7 +1503,7 @@
1501 1503 "$(inherited)",
1502 1504 "@executable_path/Frameworks",
1503 1505 );
1504   - MARKETING_VERSION = 1.0.0;
  1506 + MARKETING_VERSION = 1.0.1;
1505 1507 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1506 1508 PRODUCT_NAME = "$(TARGET_NAME)";
1507 1509 SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
... ...
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
  View file @dc95750
... ... @@ -78,10 +78,35 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell {
78 78 addSubview(expressName)
79 79 expressName.snp.makeConstraints { make in
80 80 make.top.equalTo(logoImageView.snp.top).offset(adapt_length(length: 0.5))
81   -
  81 + make.left.equalTo(logoImageView.snp.right).offset(adapt_length(length: 15))
  82 + }
  83 + addSubview(expressCopy)
  84 + expressCopy.snp.makeConstraints { make in
  85 + make.top.equalToSuperview().offset(adapt_length(length: 20))
  86 + make.right.equalToSuperview().offset(-adapt_length(length: 20))
  87 + make.width.equalTo(adapt_length(length: 77))
  88 + make.height.equalTo(adapt_length(length: 30))
  89 + }
  90 + addSubview(expressNo)
  91 + expressNo.snp.makeConstraints { make in
  92 + make.top.equalTo(expressName.snp.bottom).offset(adapt_length(length: 2.5))
  93 + make.left.equalTo(expressName.snp.left)
  94 + make.right.equalTo(expressCopy.snp.left).offset(adapt_length(length: 5))
  95 + }
  96 + addSubview(expressTime)
  97 + expressTime.snp.makeConstraints { make in
  98 + make.top.equalTo(logoImageView.snp.bottom).offset(adapt_length(length: 5))
  99 + make.left.equalTo(logoImageView.snp.left)
  100 + }
  101 + addSubview(expressAddress)
  102 + expressAddress.snp.makeConstraints { make in
  103 + make.top.equalTo(expressTime.snp.bottom).offset(adapt_length(length: 2))
  104 + make.left.equalTo(expressTime.snp.left)
  105 + make.right.equalToSuperview().offset(-adapt_length(length: 15))
82 106 }
83 107 }
84 108  
  109 +
85 110 var _listModel: ShopOrderExpressListModel!
86 111 func setupDataSource(listModel: ShopOrderExpressListModel) {
87 112 _listModel = listModel
... ...