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
63b6fe48
Commit
63b6fe48
authored
Jun 02, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
绑数据
parent
a15f104f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
205 additions
and
81 deletions
+205
-81
App.vue
src/App.vue
+1
-1
OrderCompleted.vue
src/components/IntegralMall/OrderCompleted.vue
+4
-2
OrderdetailsCompleted.vue
src/components/IntegralMall/OrderdetailsCompleted.vue
+45
-10
confirOrder.vue
src/components/IntegralMall/confirOrder.vue
+139
-60
productDetail.vue
src/components/IntegralMall/productDetail.vue
+3
-3
commodity.vue
...components/newPersonalCenter/integral/model/commodity.vue
+1
-1
integralHomeV2.vue
...nents/newPersonalCenter/integral/model/integralHomeV2.vue
+12
-4
No files found.
src/App.vue
View file @
63b6fe48
...
...
@@ -59,7 +59,7 @@ export default {
<
style
>
@import
'./assets/global/font.css'
;
@import
'//at.alicdn.com/t/font_863923_
wzxnabnk91k
.css'
;
@import
'//at.alicdn.com/t/font_863923_
59ny99vyyvp
.css'
;
@import
'./assets/global/global.css'
;
body
,
html
{
padding
:
0px
;
...
...
src/components/IntegralMall/OrderCompleted.vue
View file @
63b6fe48
...
...
@@ -135,7 +135,7 @@
<img
src=
"../../assets/img/ticket/icons8-tick-box-96.png"
alt=
""
/>
<div
class=
"OC_riContent"
>
<div
class=
"OC_paySuccsss"
>
支付成功!
</div>
<div
class=
"OC_dianhua"
>
如有任何疑问可致电028-56540254,点击
<span
class=
"Order_more"
>
查看订单>>
</span></div>
<div
class=
"OC_dianhua"
>
如有任何疑问可致电028-56540254,点击
<span
class=
"Order_more"
@
click=
"goUrl('OrderdetailsCompleted')"
>
查看订单>>
</span></div>
</div>
</div>
<div
class=
"OC_btmList"
>
...
...
@@ -176,7 +176,9 @@ export default {
}
},
methods
:
{
goUrl
:
function
(
path
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
this
.
$route
.
query
.
id
}});
}
}
}
</
script
>
src/components/IntegralMall/OrderdetailsCompleted.vue
View file @
63b6fe48
...
...
@@ -160,7 +160,7 @@
支付积分:¥9900
</div>
<div>
剩余积分:¥
190010
剩余积分:¥
{{
score
}}
</div>
</div>
<div
class=
"Order_Top_right"
>
...
...
@@ -195,7 +195,7 @@
<table
class=
"myPointTable"
>
<tr>
<td
colspan=
"3"
>
<span
class=
"pointOrderTime"
>
2019-04-28 08:25:23
</span>
<span
class=
"pointOrderTime"
>
{{
orderTime
|
YMDHMS
}}
</span>
<span
class=
"pointOrderTitle"
>
订单号:
</span><span
class=
"pointOrderNum"
>
451648
</span>
</td>
</tr>
...
...
@@ -203,10 +203,10 @@
<td
width=
"325px"
>
<div
class=
"po_info"
>
<div
class=
"po_left"
>
<img
:src=
"imageUrl"
alt=
""
/>
</div>
<div
class=
"po_right"
>
天空大容量抽绳化妆包+防水防潮+便携耐用 暗兜设计
{{
orderTitle
}}
</div>
</div>
</td>
...
...
@@ -238,6 +238,16 @@ export default {
data
(){
return
{
num
:
1
,
id
:
0
,
//时间
orderTime
:
''
,
//订单号
orderNum
:
''
,
//图片
imageUrl
:
''
,
//标题
orderTitle
:
''
,
score
:
''
,
data
:[
{
time
:
"2019-08-08"
,
...
...
@@ -264,14 +274,39 @@ export default {
if
(
num
==
2
){
this
.
num
=
1
;
}
else
{
this
.
num
=
this
.
data
.
length
;
console
.
log
(
"this.num"
,
this
.
num
)
this
.
num
=
this
.
data
.
length
;
}
}
},
getInfo
(){
let
msg
=
{
goodId
:
this
.
id
}
this
.
apiJavaPost
(
'/api/goodsMarket/getGoodsDetail'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataList
=
res
.
data
.
data
;
this
.
orderTime
=
dataList
.
updateTime
;
this
.
imageUrl
=
dataList
.
images
.
images
.
split
(
','
)[
0
];
this
.
orderTitle
=
dataList
.
name
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
});
},
//获取积分
getScore
(){
this
.
apiJavaPost
(
'/api/orderForm/getTotalIntegrals'
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
score
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
});
},
},
mounted
(){
this
.
getInfo
();
this
.
getScore
();
},
created
(){
this
.
id
=
this
.
$route
.
query
.
id
;
}
}
</
script
>
src/components/IntegralMall/confirOrder.vue
View file @
63b6fe48
This diff is collapsed.
Click to expand it.
src/components/IntegralMall/productDetail.vue
View file @
63b6fe48
...
...
@@ -217,7 +217,7 @@
<p><i
class=
"iconfont icon-tixing"
></i>
这里是相关的一些比较重要一点的提示说明,比如平台的一些简单规则等等。。。
</p>
</div>
<div
class=
"_btn_dui"
>
<span
@
click=
"PlacingOrder(
1
)"
>
立即兑换
</span>
<span
@
click=
"PlacingOrder()"
>
立即兑换
</span>
</div>
</el-col>
</el-row>
...
...
@@ -304,8 +304,8 @@ export default {
null
);
},
PlacingOrder
:
function
(
id
)
{
this
.
$router
.
push
({
name
:
'confirOrder'
,
query
:
{
id
:
id
,
num
:
this
.
numbers
}})
PlacingOrder
:
function
()
{
this
.
$router
.
push
({
name
:
'confirOrder'
,
query
:
{
id
:
this
.
id
,
num
:
this
.
numbers
}})
}
},
mounted
(){
this
.
getDetail
()
...
...
src/components/newPersonalCenter/integral/model/commodity.vue
View file @
63b6fe48
...
...
@@ -77,7 +77,7 @@
<
template
>
<el-row
class=
"commodity"
>
<el-col
:span=
"10"
class=
"com_BigDiv"
>
<div
class=
"info"
v-if=
"index==0"
v-for=
"(item,index) in message"
>
<div
@
click=
"goDetail(item.Id)"
class=
"info"
v-if=
"index==0"
v-for=
"(item,index) in message"
>
<div>
<img
class=
"com_bigImg"
:src=
"getImgUrl(message[0].Images)"
alt
>
</div>
...
...
src/components/newPersonalCenter/integral/model/integralHomeV2.vue
View file @
63b6fe48
...
...
@@ -108,6 +108,10 @@
color
:
rgba
(
255
,
1
,
1
,
1
);
margin-top
:
12px
;
}
.font_bla
:hover
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
</
style
>
<
template
>
...
...
@@ -122,7 +126,7 @@
<img
v-else
src=
"../../../../assets/img/head_normal1.png"
alt=
""
>
</div>
<p
class=
"_tit"
>
我的积分
</p>
<p
class=
"_number"
>
1288
</p>
<p
class=
"_number"
>
{{
score
}}
</p>
</el-col>
<el-col
:span=
"20"
class=
"head_ban"
>
<img
src=
"../../../../assets/img/ps/jifenban.png"
alt=
""
>
...
...
@@ -155,7 +159,7 @@
<el-col
:span=
"6"
>
<div>
<div>
<p
class=
"font_bla"
>
积分商城任你选
</p>
<p
class=
"font_bla"
@
click=
"goUrl('IntegralMall')"
>
积分商城任你选
</p>
<p>
大牌随心兑
</p>
</div>
<div>
...
...
@@ -232,6 +236,7 @@ export default {
StorageInfo
:
{},
list
:
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
],
dataList
:[],
score
:
0
,
}
},
created
(){
...
...
@@ -277,9 +282,12 @@ export default {
//获取积分
getScore
(){
this
.
apiJavaPost
(
'/api/orderForm/getTotalIntegrals'
,{},
res
=>
{
console
.
log
(
res
,
'ressss'
);
if
(
res
.
data
.
resultCode
==
1
){
this
.
score
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
});
}
},
mounted
(){
this
.
getScore
();
...
...
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