熊竹 7 роки тому
батько
коміт
cbfe3a4e97

+ 5 - 7
model/Classes/Application/ModelHeader.h

@@ -11,14 +11,14 @@
 /* ------前置平台接口请求地址, 拼接 PublicUrl---------- */
 
 ///公共url
-#define PublicUrl @"http://app.chmo.net/thmodel"
+//#define PublicUrl @"http://app.chmo.net/thmodel"
+//#define imageURl @"http://app.chmo.net/thmodel/"
+//#define apnsCernameStr @"model"
+
+#define PublicUrl @"http://192.168.123.234:8080"
 #define imageURl @"http://app.chmo.net/thmodel/"
 #define apnsCernameStr @"model"
 
-// #define PublicUrl @"http://118.190.49.85:8080/thmodel"
-// #define imageURl @"http://118.190.49.85:8080/thmodel/"
-// #define apnsCernameStr @"modelDev"
-
 //#define PublicUrl @"http://192.168.50.132:8081"
 //#define imageURl @"http://192.168.50.132:8081/"
 //#define apnsCernameStr @"modelDev"
@@ -65,8 +65,6 @@
 #define Url_doEnroll(x) [NSString stringWithFormat:@"%@/activity?action=doEnroll",x]
 /// 13 获取我收到的红包列表
 #define Url_getreceiveredlist(x) [NSString stringWithFormat:@"%@/pay?action=getreceiveredlist",x]
-/// 14 获取最近的活动
-#define Url_dogetpartty(x) [NSString stringWithFormat:@"%@/activity?action=dogetpartty",x]
 /// 14.1 我已参加的活动
 #define Url_doqrypartty(x) [NSString stringWithFormat:@"%@/activity?action=doqrypartty",x]
 /// 14.2 我未参加的活动

+ 1 - 1
model/Classes/Controllers/ActivityVC/ActivityDetailViewController.m

@@ -43,7 +43,7 @@
     NSString *fee = [[cell.totoalPrice.text componentsSeparatedByString:@"元"]objectAtIndex:0];
     NSString *parttypk = cell.model.pk;
     NSString *pk = [ModelUser user].pk;
-    NSString *str = [NSString stringWithFormat:@"%@activity?action=doEnroll&PK=%@&ParttyPK=%@&people=%@&Tel=%@&pCount=%@&Fee=%@",imageURl,pk,parttypk,people,tel,pcount,fee];
+    NSString *str = [NSString stringWithFormat:@"%@/activity?action=doEnroll&PK=%@&ParttyPK=%@&people=%@&Tel=%@&pCount=%@&Fee=%@",PublicUrl,pk,parttypk,people,tel,pcount,fee];
 
     [[AHHttpManager sharedManager]POST:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(id responseObject) {
         NSLog(@"%@",responseObject);

+ 1 - 1
model/Classes/Controllers/ActivityVC/PlatformActivityController.m

@@ -83,7 +83,7 @@
 #pragma mark -- 获取平台活动
 - (void)getDataFromNetworking {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].pk,@"memberpk", nil];
+    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].pk,@"memberpk", @"true", @"all", nil];
 
     [YanCNetWorkManager requestPostWithURLStr:Url_dogetpartty(PublicUrl) parameters:dic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];