线上

KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,5 +13,63 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
+            timestampString = "584958791.075596"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "106"
+            endingLineNumber = "106"
+            landmarkName = "-JumpGoodDetail:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
+            timestampString = "584958791.076447"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "246"
+            endingLineNumber = "246"
+            landmarkName = "-webView:didFinishNavigation:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
+            timestampString = "584958791.07686"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "260"
+            endingLineNumber = "260"
+            landmarkName = "-webView:didStartProvisionalNavigation:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KuDianProject/APPKDURL.h

@@ -9,11 +9,11 @@
 #ifndef APPKDURL_h
 #define APPKDURL_h
 
-//#define KDURL @"http://47.93.151.217:9523/" // 线上
-#define KDURL @"http://59.110.214.36:9090/" // 测试
+//#define KDURL @"http://47.93.151.217:9523/" //
+//#define KDURL @"http://59.110.214.36:9090/" // 测试
 #define KWai @"kwai://"
 
-//#define KDURL @"https://mapi.kuxuan-inc.com/"
+#define KDURL @"https://mapi.kuxuan-inc.com/"
 
 #define LoginURL [NSString stringWithFormat:@"%@api/users/loginCode",KDURL]//登录
 

KuDianProject/Earning/Controller/KDPEarnViewController.m

@@ -25,6 +25,7 @@
     self.view.backgroundColor=[UIColor colorWithHexString:LineColor];
     self.navBar.hidden=YES;
     [self.view addSubview:self.headView];
+    [self.headView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(forecastVC)]];
     [self.headView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.right.left.mas_equalTo(0);
         make.height.mas_equalTo(196+KDStatusHeight);
@@ -105,18 +106,21 @@
         _headView.userInteractionEnabled=YES;
         __weak KDPEarnViewController *weakself=self;
         _headView.forecastBlock = ^{
-            KDPForecastVC *foreV=[[KDPForecastVC alloc]init];
-            [weakself.navigationController pushViewController:foreV animated:YES];
+            [weakself forecastVC];
             
         };
         _headView.drawcBlock = ^{
-            [self drawerClickButton];
+            [weakself drawerClickButton];
         };
         
     }
     return _headView;
 }
-
+-(void)forecastVC
+{
+    KDPForecastVC *foreV=[[KDPForecastVC alloc]init];
+    [self.navigationController pushViewController:foreV animated:YES];
+}
 
 -(UITableView *)tableView
 {

KuDianProject/Earning/View/KDPEarnTableHeadView.m

@@ -102,7 +102,7 @@
     
     self.balanceButton =[[UIButton alloc]initWithFrame:CGRectMake(0, 0, backv.width/2, backv.height)];
     [self.balanceButton setImage:[UIImage imageNamed:@"account_balance_icon"] forState:UIControlStateNormal];
-    [self.balanceButton setTitle:@"账号余额" forState:UIControlStateNormal];
+    [self.balanceButton setTitle:@"账户余额" forState:UIControlStateNormal];
     [self.balanceButton setTitleColor:[UIColor colorWithHexString:@"#333333"] forState:UIControlStateNormal];
     self.balanceButton.adjustsImageWhenHighlighted=NO;
     [self.balanceButton addTarget:self action:@selector(balanclickBtn) forControlEvents:UIControlEventTouchUpInside];

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -65,6 +65,7 @@
     tipLabel.font = FONT_SYS(12);
     tipLabel.textColor = [UIColor colorWithHex:0xFF7075];
     tipLabel.layer.cornerRadius = 11;
+    tipLabel.textAlignment=NSTextAlignmentCenter;
     tipLabel.layer.masksToBounds = YES;
     tipLabel.text = @"目前只统计直播期间该商品订单数哦";
     tipLabel.centerX = self.view.centerX;

KuDianProject/Public/KDPNetworkRequestHTTP.m

@@ -61,8 +61,11 @@
                 //让用户退出
                 [MBProgressHUD showMessage:@"您已在其他设备登录，是否重新登录"];
                 [self appOpenLogin];
-            }else{
-                
+            }else if([responseDict[@"errno"] isEqualToString:@"20001"]){
+                NSLog(@"商品已下架");
+                 [MBProgressHUD showMessage:responseDict[@"err"]];
+                UIViewController *currentVC = [[self alloc] getCurrentVC];
+                [currentVC.navigationController popViewControllerAnimated:YES];
             }
             
             

KuDianProject/Search/Controller/KDPSearchResultViewController.m

@@ -135,7 +135,11 @@
             self.page = 1;
             [self requestGoodData];
         }];
-        
+        if (@available(iOS 11.0, *)) {
+            _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _collectionView.mj_footer = [MJRefreshBackNormalFooter  footerWithRefreshingBlock:^{
             self.page ++;
             [self requestGoodData];

KuDianProject/Search/Controller/KDPSearchViewController.m

@@ -248,6 +248,11 @@
         _tableview.showsVerticalScrollIndicator = NO;
         _tableview.showsHorizontalScrollIndicator = NO;
         _tableview.rowHeight = 50;
+        if (@available(iOS 11.0, *)) {
+            _tableview.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         [_tableview registerClass:[UITableViewCell class] forCellReuseIdentifier:@"searchList"];
     }
     return _tableview;

KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m

@@ -108,7 +108,11 @@
             self.page = 1;
             [self requestGoodData];
         }];
-        
+        if (@available(iOS 11.0, *)) {
+            _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = NO;
+        }
         _collectionView.mj_footer = [MJRefreshBackNormalFooter  footerWithRefreshingBlock:^{
             self.page ++;
             [self requestGoodData];

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -163,29 +163,39 @@
     
     UIButton *buybutton =[[UIButton alloc]initWithFrame:CGRectMake(collectButton.right, 3, (SCREEN_WIDTH-96)/2, 39)];
     
-    buybutton.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:(SCREEN_WIDTH-96)/2];
+    
     [buybutton setTitle:@"购买样品" forState:UIControlStateNormal];
     [bottomView addSubview:buybutton];
     buybutton.titleLabel.font=[UIFont systemFontOfSize:14];
-    [buybutton addTarget:self action:@selector(clickBuyButton) forControlEvents:UIControlEventTouchUpInside];
-    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:buybutton.bounds byRoundingCorners:UIRectCornerTopLeft| UIRectCornerBottomLeft cornerRadii:CGSizeMake(19.5, 19.5)];
-    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
-    maskLayer.frame = buybutton.bounds;
-    maskLayer.path = maskPath.CGPath;
-    buybutton.layer.mask = maskLayer;
+     buybutton.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:(SCREEN_WIDTH-96)/2];
+    
     
     UIButton *getKwaiButton =[[UIButton alloc]initWithFrame:CGRectMake(buybutton.right, 3, (SCREEN_WIDTH-96)/2, 39)];
     getKwaiButton.backgroundColor=[UIColor colorWithHexString:ThemeColor];
     [getKwaiButton setTitle:@"推广到快手" forState:UIControlStateNormal];
     getKwaiButton.titleLabel.font=[UIFont systemFontOfSize:14];
     [getKwaiButton addTarget:self action:@selector(kwaiClickButton) forControlEvents:UIControlEventTouchUpInside];
-    [bottomView addSubview:getKwaiButton];
+    
     UIBezierPath *maskPaths= [UIBezierPath bezierPathWithRoundedRect:getKwaiButton.bounds byRoundingCorners:UIRectCornerTopRight| UIRectCornerBottomRight cornerRadii:CGSizeMake(19.5, 19.5)];
     CAShapeLayer *maskLayers = [[CAShapeLayer alloc] init];
     maskLayers.frame = buybutton.bounds;
     maskLayers.path = maskPaths.CGPath;
     getKwaiButton.layer.mask = maskLayers;
     
+     if (![KDPublicMethod JumpOpenURL:KWai]) {//没有安装快手，过审用
+         buybutton.frame=CGRectMake(collectButton.right, 3, SCREEN_WIDTH-96, 39);
+         buybutton.backgroundColor=[UIColor colorWithHexString:ThemeColor];
+         buybutton.layer.cornerRadius=19.5;
+         buybutton.layer.masksToBounds=YES;
+     }else{
+         [bottomView addSubview:getKwaiButton];
+         [buybutton addTarget:self action:@selector(clickBuyButton) forControlEvents:UIControlEventTouchUpInside];
+         UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:buybutton.bounds byRoundingCorners:UIRectCornerTopLeft| UIRectCornerBottomLeft cornerRadii:CGSizeMake(19.5, 19.5)];
+         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+         maskLayer.frame = buybutton.bounds;
+         maskLayer.path = maskPath.CGPath;
+         buybutton.layer.mask = maskLayer;
+     }
 }
 
 -(void)returnClickBtn
@@ -207,7 +217,7 @@
 {
     [super viewWillDisappear:animated];
 //    self.navBar.hidden=NO;
-    
+    [LoadingView dismiss];
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
     self.tabBarController.tabBar.hidden=NO;
 }
@@ -367,7 +377,11 @@
 #pragma mark----收藏
 -(void)detailCollectClickButton
 {
+    if (self.detailModel.goods_id.length<=0) {
+        return;
+    }
     [LoadingView show];
+    
     NSString *collect=self.detailModel.is_collect;
     if (collect.integerValue == 0) {//收藏
         collect=@"1";

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -42,7 +42,7 @@
 @implementation KDPTopViewController
 -(void)initialieValues
 {
-    self.pageNum=@"1";
+    self.pageNum =@"1";
     self.selection_id=@"0";
     self.selection_id_count=@"0";
     self.selection_id_page=@"0";
@@ -50,6 +50,7 @@
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
     [self initialieValues];
     [self initUI];
     
@@ -391,7 +392,9 @@
     if ([KDPAccountTool isLogin]) {
         [self getUserTodayIncom];
         [self isOpenService];
-        [self initialieValues];
+        if (self.pageNum.integerValue ==1) {
+            [self initialieValues];
+        }
         [self getRecommendGood];
         [self getBanner];
         [self messageUnreadNumData];

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

@@ -22,10 +22,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setUpPageVc];
-        UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
-        [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
-        [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
-        self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn]; self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
+    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 44, 44)];
+    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
+    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
+    self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
+    
+ self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
 }
 - (void)setUpPageVc{
     self.navBar.hidden=YES;

KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m

@@ -40,6 +40,7 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
     [self configNavigationBar];
     [self addUserhandler];
     [self loadRequest];
+    
 }
 
 - (void)addNotification {
@@ -185,6 +186,7 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
                                                               cachePolicy:NSURLRequestReloadIgnoringCacheData
                                                           timeoutInterval:15.0];
     [self.webInterView loadRequest:theRequest];
+    
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -263,6 +265,7 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
         self.progressView.progress = 0.6;
         
     }];
+    self.navBar.navTitleLabel.text=self.webInterView.title;
 }
 
 -(void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -29,7 +29,7 @@
 //        self.shopImgV.image=[UIImage imageNamed:@"taobao_icon"];
 //        [self addSubview:self.shopImgV];
         
-        self.detailTitleL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, SCREEN_WIDTH-20, 45)];
+        self.detailTitleL=[[UILabel alloc]initWithFrame:CGRectMake(10, self.imgView.bottom+14, SCREEN_WIDTH-20, 42)];
         self.detailTitleL.numberOfLines=0;
         self.detailTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:@"        -------" linSpacing:4];
         self.detailTitleL.textColor=[UIColor blackColor];
@@ -58,16 +58,23 @@
             make.height.mas_equalTo(45);
             make.top.mas_equalTo(5);
         }];
-        
         self.profitsLabel=[[UILabel alloc]initWithFrame:CGRectMake(backV.width-88, 11, 78, 28)];
+        [self addSubview:self.profitsLabel];
+        
+        CGFloat heishgt=self.detailTitleL.bottom+5;
+        [self.profitsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(heishgt);
+            make.right.mas_equalTo(-10);
+            make.height.mas_equalTo(28);
+        }];
         self.profitsLabel.text=@"利润  --%";
         self.profitsLabel.textColor=[UIColor whiteColor];
         self.profitsLabel.font=[UIFont systemFontOfSize:16];
-        self.profitsLabel.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:78];
+        self.profitsLabel.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:150];
         self.profitsLabel.layer.cornerRadius=6;
         self.profitsLabel.layer.masksToBounds=YES;
         self.profitsLabel.textAlignment=NSTextAlignmentCenter;
-        [backV addSubview:self.profitsLabel];
+       
         //原件
         NSString *textStr =@"￥---";
         
@@ -76,18 +83,18 @@
         NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
         self.originalLabel.attributedText=attribtStr;
         
-        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-150, self.detailTitleL.bottom+5, 140, 14)];
-        self.volumeL.textAlignment=NSTextAlignmentRight;
+        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(self.detailTitleL.left, self.detailTitleL.bottom+10, 60, 16)];
+        self.volumeL.textAlignment=NSTextAlignmentLeft;
         self.volumeL.text=@"月销:--";
         self.volumeL.textColor=[UIColor colorWithHexString:@"#a9a9a9"];
         self.volumeL.font=[UIFont systemFontOfSize:10];
         [self addSubview:self.volumeL];
         
         
-        [self addSubview:self.couponImgV];
+        [backV addSubview:self.couponImgV];
         
         [self.couponImgV addSubview:self.couponPriceL];
-        self.couponImgV.frame=CGRectMake(self.detailTitleL.left, self.volumeL.top-1, 60, 16);
+        self.couponImgV.frame=CGRectMake(backV.width-70, 17, 60, 16);
         self.couponPriceL.frame=CGRectMake(20, 0, 40, 16);
         
         
@@ -116,10 +123,10 @@
     
     self.volumeL.text=[NSString stringWithFormat:@"月销 %@",model.volume];
     
-    NSString *timetitle= [NSString stringWithFormat:@"利润 %@",model.commission_rate];
+    NSString *timetitle= [NSString stringWithFormat:@"  利润 %@   ",model.commission_rate];
     
     NSMutableAttributedString *timestr = [[NSMutableAttributedString alloc] initWithString:timetitle];
-    [timestr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0,3)]; //设置字体
+    [timestr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0,4)]; //设置字体
     self.profitsLabel.attributedText=timestr;
     
     self.priceL.text=[NSString stringWithFormat:@"￥%@",model.discount_price];

KuDianProject/TOP/View/KDPRecommendGoodCell.m

@@ -30,7 +30,7 @@
         [backV addSubview:self.recomShopiconImg];
         [backV addSubview:self.recomVolumeL];
         [backV addSubview:self.recomPriceL];
-        [backV addSubview:self.recomOriginL];
+//        [backV addSubview:self.recomOriginL];
         [backV addSubview:self.recomprofitL];
         
         [self.recomImgV mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -55,7 +55,7 @@
         [self.recomShopL mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(self.recomShopiconImg.mas_right).offset(6);
             make.top.mas_equalTo(self.recomTitleL.mas_bottom).offset(7);
-            
+            make.right.mas_equalTo(self.recomVolumeL.mas_left);
             make.height.mas_equalTo(17);
             
         }];
@@ -74,22 +74,21 @@
             make.height.mas_equalTo(25);
         }];
         
-        [self.recomOriginL mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(self.recomPriceL.mas_right).offset(8);
-            make.height.mas_equalTo(25);
-             make.top.mas_equalTo(self.recomPriceL.mas_top);
-            
-        }];
+//        [self.recomOriginL mas_makeConstraints:^(MASConstraintMaker *make) {
+//            make.left.mas_equalTo(self.recomPriceL.mas_right).offset(8);
+//            make.height.mas_equalTo(25);
+//             make.top.mas_equalTo(self.recomPriceL.mas_top);
+//
+//        }];
         
         [self.recomprofitL mas_makeConstraints:^(MASConstraintMaker *make) {
             make.right.mas_equalTo(-10);
             make.height.mas_equalTo(26);
-            make.width.mas_equalTo(78);
-            make.top.mas_equalTo(self.recomVolumeL.mas_bottom).offset(21);
+             make.top.mas_equalTo(self.recomVolumeL.mas_bottom).offset(21);
         }];
         
         [self.couponImgV mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.mas_equalTo(self.recomPriceL.mas_bottom).offset(6);
+            make.top.mas_equalTo(self.recomShopiconImg.mas_bottom).offset(42);
             make.height.mas_equalTo(16);
             make.width.mas_equalTo(60);
             make.left.mas_equalTo(self.recomPriceL.mas_left);
@@ -244,7 +243,10 @@
 {
     _model = model;
     //设置字体字号和字体类别
-    self.recomprofitL.text=[NSString stringWithFormat:@"利润%@",model.commission_rate];
+    NSString *timetitle= [NSString stringWithFormat:@" 利润 %@   ",model.commission_rate];
+    NSMutableAttributedString *timestr = [[NSMutableAttributedString alloc] initWithString:timetitle];
+    [timestr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0,3)]; //设置字体
+    self.recomprofitL.attributedText=timestr;
     [self.recomImgV sd_setImageWithURL:[NSURL URLWithString:model.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.recomShopL.text=model.shop_title;
      self.recomTitleL.attributedText=[KDPublicMethod sethanggaoWithStr:model.title linSpacing:5];
@@ -261,14 +263,24 @@
     NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
     // 赋值
     self.recomOriginL.attributedText = attribtStr;
-     self.recomPriceL.text=[NSString stringWithFormat:@"￥%@",model.discount_price];
-    self.recomVolumeL.text=[NSString stringWithFormat:@"月销%@",model.volume];
     
+    NSString *pricetitle= [NSString stringWithFormat:@"￥%@",model.discount_price];
+    NSMutableAttributedString *prictS = [[NSMutableAttributedString alloc] initWithString:pricetitle];
+    [prictS addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0,1)]; //设置字体
+    self.recomPriceL.attributedText=prictS;
+    self.recomVolumeL.text=[NSString stringWithFormat:@"月销%@",model.volume];
+   
     if (model.coupon_price.floatValue>0) {
         self.couponImgV.hidden=NO;
         self.couponPriceL.text=model.coupon_price;
+        [self.recomPriceL mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(self.recomShopiconImg.mas_bottom).offset(11);
+        }];
     }else{
         self.couponImgV.hidden=YES;
+        [self.recomPriceL mas_updateConstraints:^(MASConstraintMaker *make) {
+           make.top.mas_equalTo(self.recomShopiconImg.mas_bottom).offset(25);
+        }];
     }
     
 }