Commit 3b8a41c9 authored by 曹云霄's avatar 曹云霄

no message

parent d1a07089
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
- (void)getStoreArray - (void)getStoreArray
{ {
[IBTLoadingView showProgressLabel:@"获取门店中"]; [IBTLoadingView showProgressLabel:@"获取门店中"];
[HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",HTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) { [HttpRequestManager requestNetworkwithURL:[NSString stringWithFormat:@"%@/mdata/store/getsByUser2/%@",VIHTTP_REST_API_BASE_URL,[ICRUserUtil sharedInstance].f_user_uuid] withRequestType:ONE withParameter:nil withSuccess:^(id returnValue) {
[IBTLoadingView hideHUDWithText:nil]; [IBTLoadingView hideHUDWithText:nil];
if ([returnValue[@"success"] isEqualToNumber:@1]) { if ([returnValue[@"success"] isEqualToNumber:@1]) {
[ICRUserUtil sharedInstance].storeArray = returnValue[@"data"]; [ICRUserUtil sharedInstance].storeArray = returnValue[@"data"];
......
...@@ -365,10 +365,12 @@ ...@@ -365,10 +365,12 @@
} }
for (NSInteger i = 0; i < self.viewModel.arrCellData.count; i++) { for (NSInteger i = 0; i < self.viewModel.arrCellData.count; i++) {
PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i]; PatrolExamCellViewModel *vm = self.viewModel.arrCellData[i];
if (photoType(vm.question.photoType) != PHOTO_TYPE_NO) {
if ([questionArray containsObject:vm.question.uuid]) { if ([questionArray containsObject:vm.question.uuid]) {
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0]; NSIndexPath *indexPath = [NSIndexPath indexPathForRow:i inSection:0];
[self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES]; [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:(UITableViewScrollPositionMiddle) animated:YES];
break; return;
}
} }
} }
if (questionArray.count) { if (questionArray.count) {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
action:@selector(actionDelete:)]; action:@selector(actionDelete:)];
[self addGestureRecognizer:self.longPress]; [self addGestureRecognizer:self.longPress];
self.img.image = TCImage(@"addimage"); self.img.image = TCImage(@"addimage");
self.imgPicture.contentMode = UIViewContentModeScaleAspectFill;
} }
- (void)configCellWithArr:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath viewModel:(PicViewModel *)viewModel { - (void)configCellWithArr:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath viewModel:(PicViewModel *)viewModel {
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
[manager.requestSerializer setValue:user.f_enterprise_uuid forHTTPHeaderField:@"enterprise"]; [manager.requestSerializer setValue:user.f_enterprise_uuid forHTTPHeaderField:@"enterprise"];
} }
[manager.requestSerializer setValue:user.f_authenticode forHTTPHeaderField:@"authorization"]; [manager.requestSerializer setValue:user.f_authenticode forHTTPHeaderField:@"authorization"];
NSLog(@"%@",requestString);
if (requestType) { if (requestType) {
[manager GET:requestString parameters:parameter success:^(NSURLSessionDataTask *task, id responseObject) { [manager GET:requestString parameters:parameter success:^(NSURLSessionDataTask *task, id responseObject) {
success(responseObject); success(responseObject);
......
...@@ -204,20 +204,20 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){ ...@@ -204,20 +204,20 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
//#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580" //#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580"
//正式环境 //正式环境
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest" //#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080" //#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
//测试环境 //测试环境
//#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest" #define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
//#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180" #define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180"
//测试VI检查、VI抽查、VI检查结果模块使用 //测试VI检查、VI抽查、VI检查结果模块使用
//#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:8280/total-server/rest" #define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:8280/total-server/rest"
//#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:8280" #define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:8280"
//正式VI检查、VI抽查、VI检查结果模块使用 //正式VI检查、VI抽查、VI检查结果模块使用
#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:7280/total-server/rest" //#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:7280/total-server/rest"
#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:7280" //#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:7280"
////开发环境 ////开发环境
//#define HTTP_LOCAL_BASE_URL @"http://192.168.1.176:8083" //#define HTTP_LOCAL_BASE_URL @"http://192.168.1.176:8083"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment