diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0.png" index 4fc064171b7e0d1837d775295aa0491c83976c46..c4cbc8ee56e582505312f8f4b68b08fc1b9db9c8 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0@2x.png" index e4a5081f6b07a9c2c50d6e25c6020cda56b32351..e4f0bb8f37576369bd4ecdcb5c8ff32066ea616b 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection0.imageset/homeCollection0@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1.png" index 823213998c54695b68fdb61b03b3633e0c9e71bd..e292f54ff12cdede47c5cd42a5c9875b1d9370fa 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1@2x.png" index d14d49a76aff195fc3304b1c5f7a104d1840e260..09789a336926774816fd798ceae6d55a041778e3 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection1.imageset/homeCollection1@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2.png" index 5cf35a313afb2492557b3c592aae96fd873416bc..5be0f9a8e9ae2a83b703dc78834bf4a9bff7c438 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2@2x.png" index 81991934a31d3c62afed58e915b0e341dbafe913..c55aedfd88a699f6f558b5f906bf4d4498391bec 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection2.imageset/homeCollection2@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3.png" index 332ed1528e332f7d861610196148fb86b715b53b..d1891d5e013a9f7be8c953e903e26b70335fa512 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3@2x.png" index 3bfce7fcca472b565b09ae81900c97303caf9c78..86d362a5c1de66e3df24d5c81f506e560a7ab822 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection3.imageset/homeCollection3@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4.png" index 50c6a4d4098f98a59afec10f15fd67a2c3d83a53..256982542bc4c0c9997525b7da4f77981774bbd8 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4@2x.png" index e9e5780d61b383b70efa675c141af6cf0a16c48b..ed741d1fd5e2998ca2e4053589eada236fe1a479 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection4.imageset/homeCollection4@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5.png" index 843a2717bfebbe4927199fa3a2d5b72202b0cd35..8b52d8d87ba588025616ef7e52026646c2b9c91b 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5@2x.png" index a3845c9f43622001c06ce7711ddb92c873201949..1ae8ee995a6644a89ff4109b61bda5ad38ce42a3 100644 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5@2x.png" and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection5.imageset/homeCollection5@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/Contents.json" index 7fafa6e1981b29ecb9887a52453563b6d212b247..80cb4a63d14f7578d15030ce1495a196aca1ed5d 100644 --- "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/Contents.json" +++ "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/Contents.json" @@ -2,12 +2,12 @@ "images" : [ { "idiom" : "universal", - "filename" : "homeCollection7.png", + "filename" : "homeCollection6.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "homeCollection7@2x.png", + "filename" : "homeCollection6@2x.png", "scale" : "2x" }, { diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6.png" new file mode 100644 index 0000000000000000000000000000000000000000..76a064bad9eaa037cdabee2937077b916ef25da2 Binary files /dev/null and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6@2x.png" new file mode 100644 index 0000000000000000000000000000000000000000..abd72308ff2f3c114aa3357297eafc85c40dd52d Binary files /dev/null and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection6@2x.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7.png" deleted file mode 100644 index c9520bb9c4ff8b96d7c5223af914ca970fafe5dd..0000000000000000000000000000000000000000 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7.png" and /dev/null differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7@2x.png" deleted file mode 100644 index e45689ae1a2484cc4a2b2e91cd39c27fc87cb387..0000000000000000000000000000000000000000 Binary files "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection6.imageset/homeCollection7@2x.png" and /dev/null differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/Contents.json" new file mode 100644 index 0000000000000000000000000000000000000000..7fafa6e1981b29ecb9887a52453563b6d212b247 --- /dev/null +++ "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/Contents.json" @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "homeCollection7.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "homeCollection7@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7.png" new file mode 100644 index 0000000000000000000000000000000000000000..374efc28555a9fb3d8e2538cb0a7fd3b849bc89b Binary files /dev/null and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7.png" differ diff --git "a/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7@2x.png" "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7@2x.png" new file mode 100644 index 0000000000000000000000000000000000000000..af81b118bc1734c6d80275a2396623f76dbb4c9e Binary files /dev/null and "b/ALand/Assets.xcassets/\345\272\227\351\223\272_iPhone_assets/homeCollection7.imageset/homeCollection7@2x.png" differ diff --git a/ALand/BaseClass/BaseViewController.m b/ALand/BaseClass/BaseViewController.m index 1672dc0b18d6be347d87497161c5aeb3cf5b0abc..1cfa48355ca9b56ed9cd329fc04ca92b6fb5e882 100644 --- a/ALand/BaseClass/BaseViewController.m +++ b/ALand/BaseClass/BaseViewController.m @@ -31,7 +31,7 @@ [self addChildVC:homeVC title:@"店铺" imageName:@"home_tabbar" selectImgName:@"home_selected_tabbar"]; -// [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"store_selected_tabbar"]; + [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"store_selected_tabbar"]; [self addChildVCNoNavigationbar:masageVC title:@"消æ¯" imageName:@"message_tabbar" selectImgName:@"message_selected_tabbar"]; [self addChildVC:mineVC title:@"我的" imageName:@"mine_tabbar" selectImgName:@"mine_selected_tabbar"]; diff --git a/ALand/CodeClass/Home/View/HomeCollectionViewCell.h b/ALand/CodeClass/Home/View/HomeCollectionViewCell.h index 242c2778bde57933d9bcac224aae136c551917de..aec7668c12147c5b7518bff0b364c58e1ae74de3 100644 --- a/ALand/CodeClass/Home/View/HomeCollectionViewCell.h +++ b/ALand/CodeClass/Home/View/HomeCollectionViewCell.h @@ -10,5 +10,6 @@ @interface HomeCollectionViewCell : UICollectionViewCell @property (weak, nonatomic) IBOutlet UIImageView *imgView; +@property (weak, nonatomic) IBOutlet UILabel *labelTitle; @end diff --git a/ALand/CodeClass/Home/View/HomeCollectionViewCell.xib b/ALand/CodeClass/Home/View/HomeCollectionViewCell.xib index 4f785848ce5f6d28e545980b16d7aa1f2ad67b27..96dd8381e695ff9b1991a05cf9fb692e3033cef3 100644 --- a/ALand/CodeClass/Home/View/HomeCollectionViewCell.xib +++ b/ALand/CodeClass/Home/View/HomeCollectionViewCell.xib @@ -13,27 +13,36 @@ <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="133" height="175"/> <subviews> - <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="homeCollection0" translatesAutoresizingMaskIntoConstraints="NO" id="D99-gm-QhP"> - <rect key="frame" x="0.0" y="10" width="133" height="155"/> + <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="homeCollection7" translatesAutoresizingMaskIntoConstraints="NO" id="D99-gm-QhP"> + <rect key="frame" x="0.0" y="10" width="133" height="130"/> </imageView> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人ä¸å¿ƒ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ayL-bO-xEB"> + <rect key="frame" x="35" y="150" width="64" height="20"/> + <fontDescription key="fontDescription" type="system" pointSize="16"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <nil key="highlightedColor"/> + </label> </subviews> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </view> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <constraints> + <constraint firstAttribute="bottom" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="35" id="9ka-xi-sYF"/> + <constraint firstItem="ayL-bO-xEB" firstAttribute="top" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="10" id="N7W-2f-wH7"/> + <constraint firstItem="ayL-bO-xEB" firstAttribute="centerX" secondItem="D99-gm-QhP" secondAttribute="centerX" id="ZIK-5u-Isf"/> <constraint firstItem="D99-gm-QhP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="aZq-nH-q2d"/> <constraint firstItem="D99-gm-QhP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="jXj-Lf-0f1"/> - <constraint firstAttribute="bottom" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="10" id="qTX-cx-Pfg"/> <constraint firstAttribute="trailing" secondItem="D99-gm-QhP" secondAttribute="trailing" id="zAQ-0v-9If"/> </constraints> <size key="customSize" width="133" height="175"/> <connections> <outlet property="imgView" destination="D99-gm-QhP" id="33R-h5-L3T"/> + <outlet property="labelTitle" destination="ayL-bO-xEB" id="Mds-jQ-v0l"/> </connections> <point key="canvasLocation" x="289.5" y="426.5"/> </collectionViewCell> </objects> <resources> - <image name="homeCollection0" width="80" height="116"/> + <image name="homeCollection7" width="75" height="75"/> </resources> </document> diff --git a/ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m b/ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m index 1f31476c22881279353578f429e2dbffb0f1f5f6..9dc8b92357b740e7efb3d47184641d016f4eed73 100644 --- a/ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m +++ b/ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m @@ -160,6 +160,7 @@ // 页é¢åŠ è½½å®Œæˆä¹‹åŽè°ƒç”¨ - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation { + self.bottomView.userInteractionEnabled = YES; [MBProgressHUD hideHUDForView:self.view]; } // 页é¢åŠ è½½å¤±è´¥æ—¶è°ƒç”¨ diff --git a/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m b/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m index 2142b3717a923b120573a4b2e12fc39dd73bdaf1..947687296e495dd7b6291ff1f1c9b4f46cb83fc6 100644 --- a/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m +++ b/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m @@ -31,6 +31,8 @@ @property (nonatomic, strong) UICollectionView *collectionView; @property (nonatomic, strong) MoneyView *viewMoney; @property (nonatomic, strong) NSMutableArray *arrImages; +@property (nonatomic, strong) NSArray *arrTitles; + @property (nonatomic, strong) JavenDetailReseller *reseller; @property (nonatomic, strong) JavencommissionAccountModel *accountModel; @end @@ -42,12 +44,12 @@ self.automaticallyAdjustsScrollViewInsets = NO; _arrImages = [NSMutableArray array]; - for (int i = 0; i < 7; i++) { + for (int i = 0; i < 8; i++) { NSString *imageName = [NSString stringWithFormat:@"homeCollection%d",i]; [_arrImages addObject:imageName]; } - + self.arrTitles = @[@"商å“管ç†",@"订å•管ç†",@"客户管ç†",@"我的团队",@"店铺设置",@"邀请åˆä¼™äºº",@"代客下å•",@"个人ä¸å¿ƒ"]; //æ·»åŠ collectionview UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; @@ -171,6 +173,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { HomeCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kHomeCollectionViewID forIndexPath:indexPath]; cell.imgView.image = [UIImage imageNamed:self.arrImages[indexPath.row]]; + cell.labelTitle.text = self.arrTitles[indexPath.row]; return cell; } @@ -244,7 +247,8 @@ break; case 7://榜 { - + + [self.tabBarController setSelectedIndex:self.tabBarController.viewControllers.count - 1]; } break; diff --git a/ALand/CodeClass/Login/LoginViewController.m b/ALand/CodeClass/Login/LoginViewController.m index 4ecddf5a659efb609f0cddae5ca284314ee5a8ad..72b814d44cd9b88262f7f98e2736405bb72b1331 100644 --- a/ALand/CodeClass/Login/LoginViewController.m +++ b/ALand/CodeClass/Login/LoginViewController.m @@ -46,9 +46,9 @@ - (void)defaultLoginAction { -// BaseViewController *baseVC = [[BaseViewController alloc] init]; -// baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; -// [self presentViewController:baseVC animated:YES completion:nil]; + BaseViewController *baseVC = [[BaseViewController alloc] init]; + baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + [self presentViewController:baseVC animated:YES completion:nil]; if ([[NSUserDefaults standardUserDefaults] objectForKey:@"passWord"]) {