Toggle navigation
Toggle navigation
This project
Loading...
Sign in
mobile
/
YH_RNComponent
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
孙凯
8 years ago
Commit
efcd11efbacf1598b7a7f1481af22de22c8d25ce
1 parent
4c75bcb6
master
...
6.7.0_0.49
6.7.1_0.49
6.7.4_0.49
6.7.5_0.49
6.8.7_message
6.9.5_msg
6.9.9_invite
V0125_Date
V1115_Date
V1130_Date
V1217_Date
V1230_Date
V6.10.1
V6.10.2
V6.7.9_dev
V6.8.6
V6.8.7
V6.8.7_upgrades
V6.8.9
V6.9.1
V6.9.2
V6.9.3
V6.9.5
V6.9.6
V6.9.6_Alliance
V6.9.7
V6.9.8
V6.9.8_shoudan
V6.9.9
V9.30_Date
exception
feature/rn_update61
gerry/v6.9.14_panicBuying
gerry/v6.9.16_bugfixed
v6.10.0
v6.9.10
v6.9.11
v6.9.12
v6.9.13
v6.9.14
v6.9.16
v6.9.17
v6.9.19
v6.9.20
v6.9.21
v6.9.22
v6.9.24
6.9.8
6.9.7
6.9.6
6.9.4
6.9.2
6.9.1
6.8.9
6.8.8
6.8.4
6.8.3
6.8.2
6.7.9
6.7.8
6.7.7
6.6.4
v6.7.5
v6.7.1
v6.2.0
v6.1.0
v5.6.2
v5.6.0
V6.8.6
V6.8.5
V6.8.1
add 大数据曝光 review by hongmo
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
15 deletions
js/brandStore/components/brandStore/BrandStore.js
js/brandStore/containers/BrandStoreContainer.js
js/brandStore/reducers/brandStore/brandStoreActions.js
js/redPersonBrand/components/redBrand/RedBrand.js
js/redPersonBrand/containers/RedPersonBrandContainer.js
js/redPersonBrand/reducers/redBrand/redBrandActions.js
js/brandStore/components/brandStore/BrandStore.js
View file @
efcd11e
...
...
@@ -182,6 +182,7 @@ export default class BrandStore extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
'coupon'
,
P_PARAM
:
this
.
props
.
shopId
?
this
.
props
.
shopId
:
'0'
,
exposureEnd
:
1
,
};
return
(
...
...
@@ -199,6 +200,7 @@ export default class BrandStore extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
'brandBrowse'
,
P_PARAM
:
this
.
props
.
shopId
?
this
.
props
.
shopId
:
'0'
,
exposureEnd
:
1
,
};
return
(
...
...
@@ -216,6 +218,7 @@ export default class BrandStore extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
'largeSlideImg_APP'
,
P_PARAM
:
this
.
props
.
shopId
?
this
.
props
.
shopId
:
'0'
,
exposureEnd
:
1
,
};
return
(
...
...
@@ -233,6 +236,7 @@ export default class BrandStore extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
'oneRowTwoColImages_APP'
,
P_PARAM
:
this
.
props
.
shopId
?
this
.
props
.
shopId
:
'0'
,
exposureEnd
:
1
,
};
return
(
...
...
@@ -250,6 +254,7 @@ export default class BrandStore extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
'recommend_APP'
,
P_PARAM
:
this
.
props
.
shopId
?
this
.
props
.
shopId
:
'0'
,
exposureEnd
:
1
,
};
return
(
...
...
js/brandStore/containers/BrandStoreContainer.js
View file @
efcd11e
...
...
@@ -384,6 +384,7 @@ class BrandStoreContainer extends Component {
let
{
info
,
shopId
,
receiveCouponResult
,
resource
,
coupon
,
...
...
@@ -406,6 +407,7 @@ class BrandStoreContainer extends Component {
return
(
<
BrandStore
shopId
=
{
shopId
}
isFetching
=
{
isFetching
}
info
=
{
info
}
receiveCouponResult
=
{
receiveCouponResult
}
...
...
js/brandStore/reducers/brandStore/brandStoreActions.js
View file @
efcd11e
...
...
@@ -434,6 +434,7 @@ export function getHotProduct() {
return
(
dispatch
,
getState
)
=>
{
let
{
app
,
brandStore
}
=
getState
();
let
{
productSkn
}
=
brandStore
.
resource
.
hotProducts_APP
;
let
{
shopId
,
productListForPerson
,
resource
}
=
brandStore
;
if
(
!
productSkn
)
{
return
;
}
...
...
@@ -449,7 +450,7 @@ export function getHotProduct() {
let
payload
=
json
.
product_list
;
let
order
=
''
;
try
{
payload
=
exposePruductListData
(
payload
,
order
,
app
.
channel
,
0
);
payload
=
exposePruductListData
(
payload
,
order
,
app
.
channel
,
0
,
shopId
);
}
catch
(
e
)
{
}
finally
{
...
...
@@ -578,7 +579,7 @@ export function getProductList(reload=false) {
dispatch
(
productListRequest
());
return
new
BrandStoreService
(
app
.
host
).
productList
(
shopId
,
channel
,
order
,
page
,
pageSize
,
allFilterFactors
,
brandId
)
.
then
(
json
=>
{
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
0
);
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
0
,
shopId
);
payload
.
endReached
=
payload
.
currentPage
==
payload
.
pageCount
||
payload
.
list
.
length
<
pageSize
;
// 数据曝光 新格式
...
...
@@ -654,10 +655,10 @@ function randomString(len) {
return
pwd
;
}
function
parseProductList
(
json
,
order
,
channel
,
index
)
{
function
parseProductList
(
json
,
order
,
channel
,
index
,
shopId
)
{
let
list
=
json
&&
json
.
product_list
?
json
.
product_list
:
[];
try
{
list
=
exposePruductListData
(
list
,
order
,
channel
,
index
);
list
=
exposePruductListData
(
list
,
order
,
channel
,
index
,
shopId
);
}
catch
(
e
)
{
}
finally
{
...
...
@@ -857,7 +858,7 @@ function parseProductList(json,order,channel,index) {
}
function
exposePruductListData
(
list
,
order
,
channel
,
index
)
{
function
exposePruductListData
(
list
,
order
,
channel
,
index
,
shopId
)
{
if
(
!
list
)
{
...
...
@@ -918,6 +919,7 @@ function exposePruductListData(list,order,channel,index) {
C_ID
:
channel
,
L2_TAB_ID
:
index
,
L2_TAB_NAM
:
l2_TAB_NAM
,
P_PARAM
:
shopId
?
shopId
:
'0'
,
exposureEnd
:
1
,
};
item
.
yh_exposureData
=
params
;
...
...
@@ -1022,7 +1024,7 @@ export function getProductListForPersopn(reload=false) {
return
new
BrandStoreService
(
app
.
host
).
productListForPerson
(
shopId
,
channel
,
order
,
page
,
pageSize
,
brandId
)
.
then
(
json
=>
{
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
2
);
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
2
,
shopId
);
payload
.
endReached
=
payload
.
currentPage
==
payload
.
pageCount
;
if
(
payload
.
currentPage
>
1
)
{
...
...
@@ -1094,7 +1096,7 @@ export function getProductListForNew(reload=false) {
return
new
BrandStoreService
(
app
.
host
).
productListForNew
(
shopId
,
channel
,
order
,
page
,
pageSize
,
brandId
)
.
then
(
json
=>
{
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
1
);
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
1
,
shopId
);
payload
.
endReached
=
payload
.
currentPage
==
payload
.
pageCount
;
if
(
payload
.
currentPage
>
1
)
{
...
...
js/redPersonBrand/components/redBrand/RedBrand.js
View file @
efcd11e
...
...
@@ -132,6 +132,7 @@ export default class RedBrand extends Component {
TAB_NAM
:
'首页'
,
TAB_ID
:
0
,
F_NAME
:
rowData
.
get
(
'module_type'
),
P_PARAM
:
this
.
props
.
shopId
,
exposureEnd
:
1
,
};
if
(
rowData
.
get
(
'module_type'
)
==
'coupon'
)
{
...
...
@@ -213,6 +214,7 @@ export default class RedBrand extends Component {
render
()
{
let
{
shopId
,
productList
,
launchProfile
,
productListForNew
,
...
...
js/redPersonBrand/containers/RedPersonBrandContainer.js
View file @
efcd11e
...
...
@@ -307,6 +307,7 @@ class RedPersonBrandContainer extends Component {
return
(
<
RedBrand
shopId
=
{
shopId
}
similarIndex
=
{
similarIndex
}
productList
=
{
productList
}
productListForNew
=
{
productListForNew
}
...
...
js/redPersonBrand/reducers/redBrand/redBrandActions.js
View file @
efcd11e
...
...
@@ -258,7 +258,7 @@ export function getProductList(reload=false) {
dispatch
(
productListRequest
());
return
new
RedBrandService
(
app
.
host
).
productList
(
shopId
,
channel
,
order
,
page
,
pageSize
,
allFilterFactors
)
.
then
(
json
=>
{
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
0
);
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
0
,
shopId
);
payload
.
endReached
=
payload
.
currentPage
==
payload
.
pageCount
||
payload
.
list
.
length
<
pageSize
;
if
(
payload
.
currentPage
>
1
)
{
let
oldList
=
productList
.
list
.
toJS
();
...
...
@@ -293,7 +293,7 @@ export function getProductListForNew(reload=false) {
dispatch
(
productListForNewRequest
());
return
new
RedBrandService
(
app
.
host
).
productList
(
shopId
,
channel
,
order
,
page
,
pageSize
)
.
then
(
json
=>
{
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
1
);
let
payload
=
parseProductList
(
json
,
order
,
app
.
channel
,
1
,
shopId
);
payload
.
endReached
=
payload
.
currentPage
==
payload
.
pageCount
||
payload
.
list
.
length
<
pageSize
;
if
(
payload
.
currentPage
>
1
)
{
let
oldList
=
productList
.
list
.
toJS
();
...
...
@@ -308,9 +308,7 @@ export function getProductListForNew(reload=false) {
};
}
function
exposePruductListData
(
list
,
order
,
channel
,
index
)
{
function
exposePruductListData
(
list
,
order
,
channel
,
index
,
shopId
)
{
if
(
!
list
)
{
return
list
;
}
...
...
@@ -356,18 +354,18 @@ function exposePruductListData(list,order,channel,index) {
TAB_ID
:
tab_num
,
L2_TAB_ID
:
index
,
L2_TAB_NAM
:
l2_TAB_NAM
,
P_PARAM
:
shopId
?
shopId
:
'0'
,
exposureEnd
:
1
,
};
item
.
yh_exposureData
=
params
;
}
return
list
;
}
function
parseProductList
(
json
,
order
,
channel
,
index
)
{
function
parseProductList
(
json
,
order
,
channel
,
index
,
shopId
)
{
let
list
=
json
&&
json
.
product_list
?
json
.
product_list
:
[];
try
{
list
=
exposePruductListData
(
list
,
order
,
channel
,
index
);
list
=
exposePruductListData
(
list
,
order
,
channel
,
index
,
shopId
);
}
catch
(
e
)
{
}
finally
{
...
...
@@ -793,6 +791,7 @@ export function appRecommendProduct(dataSource) {
L2_TAB_ID
:
0
,
L2_TAB_NAM
:
'首页'
,
F_NAME
:
'AppRecommendProduct'
,
P_PARAM
:
shopId
?
shopId
:
'0'
,
exposureEnd
:
1
,
};
items
.
yh_exposureData
=
params
;
...
...
@@ -824,6 +823,7 @@ export function appRecommendProduct(dataSource) {
L2_TAB_ID
:
0
,
L2_TAB_NAM
:
'首页'
,
F_NAME
:
'AppRecommendProduct'
,
P_PARAM
:
shopId
?
shopId
:
'0'
,
exposureEnd
:
1
,
};
items
.
yh_exposureData
=
params
;
...
...
Please
register
or
login
to post a comment