111

shiku_im/ClassesNew/MainClass/YPTabBarController.m

@@ -74,7 +74,7 @@
         
         UIView *line_View =[[UIView alloc]initWithFrame:CGRectMake(0, screenSize.height - 50 - 0-(JX_SCREEN_HEIGHT>=812?90:65), JX_SCREEN_WIDTH,1)];
         line_View.backgroundColor=kRGBColor(246, 246, 246);
-        [self.view addSubview:line_View];
+        //[self.view addSubview:line_View];
         self.line_View=line_View;
         [self.line_View setHidden:NO];
         self.contentViewFrame = CGRectMake(0,  0, screenSize.width,

shiku_im/ClassesNew/classes/fuliVc/JXApplyViewController.m

@@ -186,6 +186,7 @@
         {
             self.lingQuBtn.userInteractionEnabled=YES;
             [self.lingQuBtn setImage:[UIImage imageNamed:@"红色按钮"] forState:UIControlStateNormal];
+      
         }else{
             
             self.lingQuBtn.userInteractionEnabled=NO;

shiku_im/ClassesNew/classes/fuliVc/JXMeiRiShowView.m

@@ -37,8 +37,8 @@
          [whiteShowView mas_makeConstraints:^(MASConstraintMaker *make) {
              make.centerX.mas_equalTo(backView.mas_centerX);
              make.centerY.mas_equalTo(backView.mas_centerY);
-             //make.left.mas_equalTo(20);
-             //make.right.mas_equalTo(-20);
+             make.width.mas_equalTo(JX_SCREEN_WIDTH-100);
+             make.height.mas_equalTo(JX_SCREEN_WIDTH<414?160:150);
          }];
          
          

shiku_im/ClassesNew/classes/fuliVc/JXQuestionCell.m

@@ -15,6 +15,8 @@
 
 @property (weak, nonatomic) IBOutlet UIImageView *duiIMG;
 @property (weak, nonatomic) IBOutlet UIImageView *duiduiIMG2;
+
+
 @property (weak, nonatomic) IBOutlet UILabel *titleL;
 
 @end
@@ -49,21 +51,25 @@
       self.titleL.text = [NSString stringWithFormat:@"%@",optionModel.title];
     
     if (index==indexRow) {
-        self.duiXIMG2.hidden=NO;
+        self.duiduiIMG2.hidden=NO;
         if (index==indexPath) {
 
-            self.duiduiIMG2.hidden=NO;
+            self.duiXIMG.hidden=NO;
         }else{
 
         }
         
         
     }else{
+         
+        
+        
         if (indexPath==indexRow) {
             self.duiIMG.hidden=NO;
             self.duiXIMG.hidden=NO;
         }else{
             
+            //self.duiIMG.hidden=NO;
             self.duiIMG.hidden=YES;
             self.duiXIMG.hidden=YES;
         }

shiku_im/ClassesNew/classes/fuliVc/JXQuestionCell.xib

@@ -52,7 +52,6 @@
             <connections>
                 <outlet property="duiIMG" destination="F6t-fh-87t" id="9OP-hE-cCD"/>
                 <outlet property="duiXIMG" destination="Qsa-8q-pck" id="ig8-8X-dWv"/>
-                <outlet property="duiXIMG2" destination="atf-Ff-0d2" id="Mj4-1o-sX3"/>
                 <outlet property="duiduiIMG2" destination="kTr-ha-iDT" id="zUe-tJ-Ijo"/>
                 <outlet property="titleL" destination="CQd-Cw-xF6" id="bX8-qW-cXw"/>
             </connections>

shiku_im/ClassesNew/classes/fuliVc/JXQuestionnnnVc.m

@@ -81,14 +81,13 @@
     
     [g_server getAllQuestions:salt andToView:self];
     
-    self.questionTitle.text = [NSString stringWithFormat:@"%zd",1];
+    self.questionTitle.text = [NSString stringWithFormat:@"%d",1];
   
 }
 #pragma mark --- 提交
 -(void)postButtonClicked:(UIButton *)sender
 {
-    //_saveSelectIndexArr;
-   
+      
     if (_dataArr333.count==10) {
         
         [SVProgressHUD setMaximumDismissTimeInterval:2];
@@ -183,7 +182,6 @@
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-     NSArray * options = [_currentQuestion objectForKey:@"options"];
      
     if (_firstArr.count==0) {
  
@@ -232,12 +230,9 @@
             _indexRightRow=idx;
              _Id_str=obj.sort;
             model=obj;
-          
           }if ( [obj.right  isEqualToString:@"1"] && indexPath.row==idx) {
             
             [_dataArr222 addObject:model];
-           
-              
           }
     }];
     __block QustionJX *modelS=nil;
@@ -247,37 +242,25 @@
             modelS=obj;
         }
     }];
-    
-    
-    
     if (_isclick==YES) {
         
          return;
     }
     
     _currentSort ++;
-     
     _isclick=YES;
-    
     _isCheck=1;
     
     NSDictionary *dict=@{@"option":modelS,@"title":modelS.title,@"selectIndex":[NSString stringWithFormat:@"%zd",indexPath.row] ,@"rightRow":[NSString stringWithFormat:@"%zd",_indexRightRow],@"checkNo":[NSString stringWithFormat:@"%d",_isCheck],@"currentSort":[NSString stringWithFormat:@"%lu",(unsigned long)_currentSort],@"Id_str":[NSString stringWithFormat:@"%zd",indexPath.row+1]};
     [_saveSelectIndexArr addObject:dict];
-    
-    
+     
     if (_saveSelectIndexArr.count==10) {
-        
         //提交答卷
         [_nextButton setImage:[UIImage imageNamed:@"提交答卷"] forState:UIControlStateNormal];
     }
-    
-    //self.questionTitle.text = modelS.title ;
-    
     [_dataArr333 addObject:dict];
     
-    if (_indexRightRow==indexPath.row) {
-      
-    }
+     
     [_questionTable reloadData];
 
 }

shiku_im/ClassesNew/classes/fuliVc/JXWellBeingVc.m

@@ -139,8 +139,8 @@
 }
 -(void)initTalbelView
 {
-    NSArray *titles=@[@{@"icon":@"shen请daili",@"title":@"申请代理"},@{@"icon":@"wzguilai",@"title":@"王者归来"},@{@"icon":@"mei日renwu",@"title":@"每日任务"},@{@"icon":@"hysc",@"title":@"会员首存"},
-                      @{@"icon":@"jljgj",@"title":@"吉利金管家"},@{@"icon":@"qwhby",@"title":@"千万红包"}];
+    NSArray *titles=@[@{@"icon":@"mei日renwu",@"title":@"每日任务"},@{@"icon":@"wzguilai",@"title":@"王者归来"}, @{@"icon":@"jljgj",@"title":@"吉利金管家"},@{@"icon":@"hysc",@"title":@"会员首存"},@{@"icon":@"shen请daili",@"title":@"申请代理"},
+          @{@"icon":@"qwhby",@"title":@"千万红包"}];
     
     _dataArr=[NSMutableArray array];
     [_dataArr addObjectsFromArray:titles];
@@ -162,7 +162,7 @@
 }
 
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return 145;
+    return 160;
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     

shiku_im/ClassesNew/classes/myVc/Vc/JXAboutJiXinVc.m

@@ -69,7 +69,7 @@
     
     
     CGFloat btnW=(JX_SCREEN_WIDTH-114)/3;
-    NSArray *images=@[@"yinguo",@"passes",@"diyi"];
+    NSArray *images=@[@"yinguo",@"diyi",@"passes"];
     UIButton *btn=nil;
     for (int i=0; i<images.count; i++) {
          btn=[[UIButton alloc]init];

shiku_im/ClassesNew/classes/myVc/Vc/JXMybossVc.m

@@ -146,7 +146,11 @@
     
     
     UILabel  *vesionL=[[UILabel alloc]init];
-    vesionL.text=@" 即信版本号：2.0.3";
+    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
+    NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
+    
+    vesionL.text=[NSString stringWithFormat:@"即信版本号：%@", app_Version];
+   
     vesionL.textAlignment=NSTextAlignmentCenter;
     vesionL.font=[UIFont systemFontOfSize:15 weight:UIFontWeightRegular];
     [self.view addSubview:vesionL];