Commit 083e7338 authored by 艾娇平's avatar 艾娇平

Merge branch 'zx/refererLinkFix' into 'master'

referer_link 卡片曝光参数重复问题fix

See merge request !79
parents 5f256125 c94fe10d
...@@ -4,7 +4,7 @@ PODS: ...@@ -4,7 +4,7 @@ PODS:
- FMDB/standard (2.7.5) - FMDB/standard (2.7.5)
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMPhobos (3.0.1): - GMPhobos (3.0.10):
- FMDB - FMDB
- GMCache - GMCache
- MJExtension - MJExtension
...@@ -32,11 +32,11 @@ EXTERNAL SOURCES: ...@@ -32,11 +32,11 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMPhobos: 5218b3f57cc68aab78e6fc309c58a2290d625698 GMPhobos: 8d0a50ec8727717a9a6e5343e1fd169a25fc92cc
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad
COCOAPODS: 1.9.3 COCOAPODS: 1.10.1
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
itemModel.business_id = pageCtrl.businessId?:@""; itemModel.business_id = pageCtrl.businessId?:@"";
itemModel.referrer = pageCtrl.referer?:@""; itemModel.referrer = pageCtrl.referer?:@"";
itemModel.referrerId = pageCtrl.referrerId?:@""; itemModel.referrerId = pageCtrl.referrerId?:@"";
itemModel.referrerLink = pageCtrl.referrerLink; itemModel.referrer_link = pageCtrl.referrerLink;
itemModel.up_slide_times = pageCtrl.up_slide_times; itemModel.up_slide_times = pageCtrl.up_slide_times;
itemModel.down_slide_times = pageCtrl.down_slide_times; itemModel.down_slide_times = pageCtrl.down_slide_times;
itemModel.up_loading_times = pageCtrl.up_loading_times; itemModel.up_loading_times = pageCtrl.up_loading_times;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
/** 当前referrer */ /** 当前referrer */
@property (nonatomic, copy) NSString *referrerId; @property (nonatomic, copy) NSString *referrerId;
/** 获取上一个页面链路的page_name link by 7.20.0 如果有此页面有page_name则添加 , 没有添加"" */ /** 获取上一个页面链路的page_name link by 7.20.0 如果有此页面有page_name则添加 , 没有添加"" */
@property (nonatomic, strong) NSArray *referrerLink; @property (nonatomic, strong) NSArray *referrer_link;
/** 当前filter_f */ /** 当前filter_f */
@property (nonatomic, copy) NSString *filter_f; @property (nonatomic, copy) NSString *filter_f;
/** 曝光卡片数据 */ /** 曝光卡片数据 */
......
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