浏览代码

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

jikaipeng 5 年之前
父节点
当前提交
3d32fed3ed

+ 5 - 5
KuDianProject.xcodeproj/project.pbxproj

@@ -1597,7 +1597,7 @@
1597 1597
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1598 1598
 				CODE_SIGN_IDENTITY = "iPhone Developer";
1599 1599
 				CODE_SIGN_STYLE = Manual;
1600
-				DEVELOPMENT_TEAM = "";
1600
+				DEVELOPMENT_TEAM = WV23VEMQV8;
1601 1601
 				ENABLE_BITCODE = NO;
1602 1602
 				FRAMEWORK_SEARCH_PATHS = (
1603 1603
 					"$(inherited)",
@@ -1679,7 +1679,7 @@
1679 1679
 				);
1680 1680
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1681 1681
 				PRODUCT_NAME = "$(TARGET_NAME)";
1682
-				PROVISIONING_PROFILE_SPECIFIER = "";
1682
+				PROVISIONING_PROFILE_SPECIFIER = dev;
1683 1683
 				TARGETED_DEVICE_FAMILY = 1;
1684 1684
 			};
1685 1685
 			name = Debug;
@@ -1691,9 +1691,9 @@
1691 1691
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1692 1692
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1693 1693
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1694
-				CODE_SIGN_IDENTITY = "iPhone Developer";
1694
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
1695 1695
 				CODE_SIGN_STYLE = Manual;
1696
-				DEVELOPMENT_TEAM = "";
1696
+				DEVELOPMENT_TEAM = WV23VEMQV8;
1697 1697
 				ENABLE_BITCODE = NO;
1698 1698
 				FRAMEWORK_SEARCH_PATHS = (
1699 1699
 					"$(inherited)",
@@ -1775,7 +1775,7 @@
1775 1775
 				);
1776 1776
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1777 1777
 				PRODUCT_NAME = "$(TARGET_NAME)";
1778
-				PROVISIONING_PROFILE_SPECIFIER = "";
1778
+				PROVISIONING_PROFILE_SPECIFIER = dis;
1779 1779
 				TARGETED_DEVICE_FAMILY = 1;
1780 1780
 			};
1781 1781
 			name = Release;

+ 1 - 1
KuDianProject/APPKDURL.h

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

+ 1 - 1
KuDianProject/TOP/Controller/KDPTopViewController.m

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

+ 1 - 1
KuDianProject/TOP/Drawer/View/KDPServiceView.m

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

+ 10 - 2
KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -68,11 +68,12 @@
68 68
         
69 69
         
70 70
         UIView *lineV=[[UIView alloc]init];
71
+        lineV.tag=1000;
71 72
         lineV.backgroundColor=[UIColor colorWithHexString:LineColor];
72 73
         [self addSubview:lineV];
73 74
         [lineV mas_makeConstraints:^(MASConstraintMaker *make) {
74
-            make.left.mas_equalTo(10);
75
-            make.right.mas_equalTo(-10);
75
+            make.left.mas_equalTo(0);
76
+            make.right.mas_equalTo(0);
76 77
             make.top.mas_equalTo(self.mas_bottom).offset(-5);
77 78
             make.height.mas_equalTo(5);
78 79
         }];
@@ -123,6 +124,13 @@
123 124
     }else{
124 125
         self.couponImgV.hidden=YES;
125 126
     }
127
+     UIView *lineV=[self viewWithTag:1000];
128
+    if (model.goods_point.length>0) {
129
+       
130
+        lineV.hidden=YES;
131
+    }else{
132
+        lineV.hidden=NO;
133
+    }
126 134
     
127 135
 }
128 136
 

+ 2 - 2
KuDianProject/TOP/View/Detail/KDPShopView.m

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

+ 1 - 1
KuDianProject/TOP/View/KDPRecommendGoodCell.m

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