Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

KuDianProject.xcodeproj/project.pbxproj

@@ -1597,7 +1597,7 @@
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1679,7 +1679,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1691,9 +1691,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1775,7 +1775,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dis;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

KuDianProject/APPKDURL.h

@@ -30,7 +30,7 @@
 
 
 #define topIncomeUrl [NSString stringWithFormat:@"%@api/home/getHomeTopOrderInfo",KDURL]
-#define bannerURL [NSString stringWithFormat:@"%@api/adv/advByType",KDURL]
+#define bannerURL [NSString stringWithFormat:@"%@api/banners",KDURL]
 
 #define topGoodRecommURL [NSString stringWithFormat:@"%@api/home/getHomeGoodsListV1",KDURL]
 #define historyURL [NSString stringWithFormat:@"%@api/brower/record",KDURL]

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -85,7 +85,7 @@
 -(void)getBanner
 {
     [LoadingView show];
-    [KDPNetworkRequestHTTP getURL:bannerURL params:@{@"adv_type":@"1"} success:^(id  _Nonnull json) {
+    [KDPNetworkRequestHTTP getURL:bannerURL params:nil success:^(id  _Nonnull json) {
         [LoadingView dismiss];
         self.bannerArray=[NSArray yy_modelArrayWithClass:[KDPBannerModel class] json:json[@"data"]];
         [self.dataCollectionView reloadData];

KuDianProject/TOP/Drawer/View/KDPServiceView.m

@@ -43,7 +43,7 @@
         
         
         [backV addSubview:contentL];
-        NSString *contentstr=@"① 绑定快手小店Pid \n② 将商品推广到快手\n③ 查看订单和收益";
+        NSString *contentstr=@"① 绑定快手小店Pid\n② 将商品推广到快手\n③ 查看订单和收益";
         NSMutableAttributedString * attributedString1 = [[NSMutableAttributedString alloc] initWithString:contentstr];
         NSMutableParagraphStyle * paragraphStyle1 = [[NSMutableParagraphStyle alloc] init];
         [paragraphStyle1 setLineSpacing:8];

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -68,11 +68,12 @@
         
         
         UIView *lineV=[[UIView alloc]init];
+        lineV.tag=1000;
         lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
         [self addSubview:lineV];
         [lineV mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(10);
-            make.right.mas_equalTo(-10);
+            make.left.mas_equalTo(0);
+            make.right.mas_equalTo(0);
             make.top.mas_equalTo(self.mas_bottom).offset(-5);
             make.height.mas_equalTo(5);
         }];
@@ -123,6 +124,13 @@
     }else{
         self.couponImgV.hidden=YES;
     }
+     UIView *lineV=[self viewWithTag:1000];
+    if (model.goods_point.length>0) {
+       
+        lineV.hidden=YES;
+    }else{
+        lineV.hidden=NO;
+    }
     
 }
 

KuDianProject/TOP/View/Detail/KDPShopView.m

@@ -33,8 +33,8 @@
         lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
         [self addSubview:lineV];
         [lineV mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(10);
-            make.right.mas_equalTo(-10);
+            make.left.mas_equalTo(0);
+            make.right.mas_equalTo(0);
             make.top.mas_equalTo(self.mas_bottom).offset(-5);
             make.height.mas_equalTo(5);
         }];

KuDianProject/TOP/View/KDPRecommendGoodCell.m

@@ -43,7 +43,7 @@
             make.left.mas_equalTo(self.recomImgV.mas_right).offset(10);
             make.top.mas_equalTo(self.recomImgV.mas_top);
             make.height.mas_equalTo(21);
-            make.right.mas_equalTo(0);
+            make.right.mas_equalTo(-10);
         }];
         [self.recomShopiconImg mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(self.recomTitleL.mas_left);