Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
华国豪
Athena
Commits
62120fce
Commit
62120fce
authored
Jun 10, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改积分
parent
6d7055fc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
23 deletions
+65
-23
detailsLeftHot.vue
src/components/IntegralMall/block/detailsLeftHot.vue
+12
-3
productDetail.vue
src/components/IntegralMall/productDetail.vue
+6
-3
commodity.vue
...components/newPersonalCenter/integral/model/commodity.vue
+11
-10
integralHomeV2.vue
...nents/newPersonalCenter/integral/model/integralHomeV2.vue
+36
-7
No files found.
src/components/IntegralMall/block/detailsLeftHot.vue
View file @
62120fce
...
...
@@ -36,6 +36,9 @@
.list_item
p
._num
{
color
:
#999999
;
}
.detailsLeftHot
li
{
cursor
:
pointer
;
}
</
style
>
<
template
>
<div
class=
"detailsLeftHot"
>
...
...
@@ -58,7 +61,7 @@
</el-col>
</el-row>
<ul
v-if=
"showList==1"
>
<li
class=
"list_item"
v-for=
"item in dataList"
>
<li
class=
"list_item"
v-for=
"item in dataList"
@
click=
"goDetail(item.id)"
>
<div>
<img
:src=
"getImgUrl(item.images)"
alt=
""
>
</div>
...
...
@@ -67,7 +70,7 @@
</li>
</ul>
<ul
v-else
>
<li
class=
"list_item"
v-for=
"item in dataList"
>
<li
class=
"list_item"
v-for=
"item in dataList"
@
click=
"goDetail2(item.Id)"
>
<div>
<img
:src=
"getImgUrl(item.Images)"
alt=
""
>
</div>
...
...
@@ -96,7 +99,6 @@ export default {
}
this
.
apiJavaPost
(
"/api/goodsMarket/getGoodsList"
,
msg
,
res
=>
{
console
.
log
(
res
,
'resssss'
);
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
}
else
{
...
...
@@ -125,6 +127,13 @@ export default {
}
},
null
)
},
//跳转详情页面
goDetail
:
function
(
id
)
{
this
.
$emit
(
'getChildInfo'
,
id
)
},
goDetail2
(
id
){
this
.
$router
.
push
({
path
:
'productDetail'
,
query
:
{
id
:
id
}})
}
},
mounted
(){
if
(
this
.
showList
==
1
){
this
.
getList
();
...
...
src/components/IntegralMall/productDetail.vue
View file @
62120fce
...
...
@@ -202,7 +202,7 @@
<p
class=
"_price"
>
售价
<span
class=
"jifen"
>
¥
<span>
{{detail.price}}
</span>
{{detail.priceUnit === 1 ? '现金' : '积分'}}
</span></p>
<div
class=
"_numbers"
>
<span
class=
"_numbers_name"
>
数量
</span>
<el-input-number
v-model=
"numbers"
:min=
"1"
:max=
"detail.quota === 0 ?
''
: detail.quota"
size=
"mini"
></el-input-number>
<el-input-number
v-model=
"numbers"
:min=
"1"
:max=
"detail.quota === 0 ?
0
: detail.quota"
size=
"mini"
></el-input-number>
</div>
<div
class=
"pd_quota"
>
限购数量:{{detail.quota}}
...
...
@@ -224,7 +224,7 @@
</el-row>
<el-row
class=
"pd_bottom_detail"
:gutter=
"20"
>
<el-col
:span=
"5"
>
<detailsLeftHot
v-if=
"detail.type"
:Type=
"detail.type"
:showList=
"1"
/>
<detailsLeftHot
v-if=
"detail.type"
:Type=
"detail.type"
:showList=
"1"
v-on:getChildInfo=
'getChildInfo'
/>
</el-col>
<el-col
:span=
"19"
class=
"pd_bottom_detail_right"
>
<el-row>
...
...
@@ -295,7 +295,6 @@ export default {
detail
.
deImgArr
=
deImgArr
this
.
detail
=
detail
;
this
.
isActivityType
=
detail
.
isActivityType
;
console
.
log
(
detail
,
'detailsss'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
@@ -309,6 +308,10 @@ export default {
}
else
{
this
.
$router
.
push
({
name
:
'confirOrder'
,
query
:
{
id
:
this
.
id
,
num
:
this
.
numbers
}})
}
},
getChildInfo
(
val
){
this
.
id
=
val
;
this
.
getDetail
();
}
},
mounted
(){
this
.
getDetail
()
...
...
src/components/newPersonalCenter/integral/model/commodity.vue
View file @
62120fce
...
...
@@ -24,7 +24,6 @@
color
:
#333333
;
width
:
229px
;
height
:
241px
;
cursor
:
pointer
;
}
.commodity
.small
:last-child
{
width
:
230px
;
...
...
@@ -38,9 +37,6 @@
}
.commodity
.small
._detais
{
color
:
#999999
;
}
.commodity
.medium
{
}
.commodity
.medium
{
padding
:
29px
;
...
...
@@ -62,7 +58,6 @@
.medium
{
width
:
344px
;
height
:
240px
;
cursor
:
pointer
;
}
.com_BigDiv
{
min-height
:
480px
;
border-right
:
1px
solid
#ECECEC
;
...
...
@@ -73,11 +68,14 @@
.r_item_btmBox
{
min-height
:
135px
;
}
.comCanClick
{
cursor
:
pointer
;
}
</
style
>
<
template
>
<el-row
class=
"commodity"
>
<el-col
:span=
"10"
class=
"com_BigDiv"
>
<div
@
click=
"goDetail(item.Id)"
class=
"info"
v-if=
"index==0"
v-for=
"(item,index) in message"
:key=
"index"
>
<div
@
click=
"goDetail(item.Id)"
class=
"info"
:class=
"
{'comCanClick':item.Id}"
v-if="index==0" v-for="(item,index) in message" :key="index">
<div>
<img
class=
"com_bigImg"
:src=
"getImgUrl(message[0].Images)"
alt
>
</div>
...
...
@@ -88,7 +86,7 @@
<el-col
:span=
"14"
>
<el-row>
<el-col
:span=
"8"
class=
"small"
v-if=
"index>0&&index
<4
"
v-for=
"(item,index) in message"
:key=
"index"
>
<div
@
click=
"goDetail(item.Id)"
>
<div
@
click=
"goDetail(item.Id)"
:class=
"
{'comCanClick':item.Id}"
>
<div
class=
"r_item_img_box"
>
<img
:src=
"getImgUrl(item.Images)"
alt
>
</div>
...
...
@@ -99,7 +97,7 @@
</el-row>
<el-row>
<el-col
:span=
"12"
class=
"medium f"
v-if=
"index>3"
v-for=
"(item,index) in message"
:key=
"index"
>
<div
@
click=
"goDetail(item.Id)"
>
<div
@
click=
"goDetail(item.Id)"
:class=
"
{'comCanClick':item.Id}"
>
<div
class=
"r_item_btmBox"
>
<img
:src=
"getImgUrl(item.Images)"
alt
>
</div>
...
...
@@ -126,11 +124,14 @@ export default {
},
//跳转详情页面
goDetail
:
function
(
id
)
{
this
.
$router
.
push
({
path
:
'productDetail'
,
query
:
{
id
:
id
}})
console
.
log
(
id
);
if
(
id
){
this
.
$router
.
push
({
path
:
'productDetail'
,
query
:
{
id
:
id
}})
}
},
},
mounted
(){
console
.
log
(
this
.
message
,
'messagess'
);
}
};
</
script
>
src/components/newPersonalCenter/integral/model/integralHomeV2.vue
View file @
62120fce
...
...
@@ -91,12 +91,14 @@
border
:
1px
solid
rgba
(
236
,
236
,
236
,
1
);
border-left
:
none
;
border-top
:
none
;
cursor
:
pointer
;
}
.integralHomeV2
.class
.item
:nth-child
(
1
),
.integralHomeV2
.class
.item
:nth-child
(
6
)
{
border-left
:
1px
solid
rgba
(
236
,
236
,
236
,
1
);
}
.integralHomeV2
.class
.item
img
{
max-height
:
150px
;
max-width
:
100%
;
}
.integralHomeV2
.class
.item
._name
{
font-size
:
12px
;
...
...
@@ -211,12 +213,12 @@
</el-row>
<el-row>
<div
class=
"clearfix"
>
<div
class=
"info item"
v-for=
"item in list"
>
<div
class=
"info item"
v-for=
"item in list"
@
click=
"goDetail(item.id)"
>
<div>
<img
src=
"../../../../assets/img/img-01.png
"
alt
>
<img
:src=
"item.images.split(',')[0]
"
alt
>
</div>
<p
class=
"_name"
>
出行必备物品
</p>
<p
class=
"_detais"
>
699积分抢兑
</p>
<p
class=
"_name"
>
{{
item
.
name
}}
</p>
<p
class=
"_detais"
>
{{
item
.
price
}}
</p>
</div>
</div>
</el-row>
...
...
@@ -234,7 +236,7 @@ export default {
data
(){
return
{
StorageInfo
:
{},
list
:
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
],
list
:
[],
dataList
:[],
score
:
0
,
}
...
...
@@ -254,11 +256,12 @@ export default {
this
.
apiJavaPost
(
'/api/goodsMarket/getActivityClassifyGoods'
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataList
=
res
.
data
.
data
;
console
.
log
(
this
.
dataList
,
'sssssss'
);
var
num
=
0
;
this
.
dataList
.
forEach
(
x
=>
{
if
(
x
.
list
.
length
<
6
){
num
=
6
-
x
.
list
.
length
;
}
else
{
num
=
0
;
}
var
obj
=
{
Description
:
''
,
...
...
@@ -288,10 +291,36 @@ export default {
this
.
Error
(
res
.
data
.
message
);
}
});
}
},
// 获取列表
getScoreList
:
function
()
{
var
msg
=
{
ranks
:
''
,
type
:
''
,
pageSize
:
10
,
pageIndex
:
1
,
}
this
.
apiJavaPost
(
"/api/goodsMarket/getGoodsList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
list
=
res
.
data
.
data
.
pageData
;
console
.
log
(
this
.
list
,
'list'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
//跳转详情页面
goDetail
:
function
(
id
)
{
this
.
$router
.
push
({
path
:
'productDetail'
,
query
:
{
id
:
id
}})
},
},
mounted
(){
this
.
getScore
();
this
.
getActivesList
();
this
.
getScoreList
();
}
}
</
script
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment