Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
voucher-h5
Project
Overview
Details
Activity
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
潘琦
voucher-h5
Commits
d24031d8
Commit
d24031d8
authored
Aug 22, 2019
by
潘琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
相关微信用户端根据后台逻辑变更相对于更改逻辑;
parent
ce5561fd
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
16 deletions
+21
-16
dev.env.js
config/dev.env.js
+2
-2
App.vue
src/App.vue
+1
-1
cardItem.vue
src/components/cardItem.vue
+1
-1
index.vue
src/views/home/index.vue
+4
-3
index.vue
src/views/user/index.vue
+4
-3
index.vue
src/views/voucherDetail/index.vue
+5
-3
index.vue
src/views/vouchers/index.vue
+4
-3
No files found.
config/dev.env.js
View file @
d24031d8
...
...
@@ -2,8 +2,8 @@
const
merge
=
require
(
'webpack-merge'
)
const
prodEnv
=
require
(
'./prod.env'
)
const
baseUrl
=
'"http://voucher.check.icaremgt.com"'
//打包
后
请求前缀(开发)
// const baseUrl = '"http://voucher.icaremgt.com"' //打包
后
请求前缀(正式)
const
baseUrl
=
'"http://voucher.check.icaremgt.com"'
//打包
前
请求前缀(开发)
// const baseUrl = '"http://voucher.icaremgt.com"' //打包
前
请求前缀(正式)
module
.
exports
=
merge
(
prodEnv
,
{
NODE_ENV
:
'"development"'
,
API_ROOT
:
baseUrl
...
...
src/App.vue
View file @
d24031d8
...
...
@@ -532,7 +532,7 @@ ul li {
background-color
:
#f7f7f7
;
}
.popup-model
.body
{
padding
:
1em
1em
2
em
1em
;
padding
:
1em
1em
5
em
1em
;
position
:
relative
;
overflow
:
auto
;
height
:
100%
;
...
...
src/components/cardItem.vue
View file @
d24031d8
...
...
@@ -3,7 +3,7 @@
<img
src=
"../assets/images/card-item-bg.png"
class=
"bg"
/>
<div
class=
"card-item-content"
>
<div
class=
"card-item-table"
>
<div
class=
"card-item-cell price"
v-if=
"data.voucherType ===
2
"
>
<div
class=
"card-item-cell price"
v-if=
"data.voucherType ===
'2'
"
>
<div
class=
"label"
>
免费
</div>
<div
class=
"des"
>
价值
{{
data
.
cost
}}
元
</div>
</div>
...
...
src/views/home/index.vue
View file @
d24031d8
...
...
@@ -6,7 +6,7 @@
<span
class=
"link"
@
click=
"goToVouchers"
>
查看全部
<i
class=
"glyphicon glyphicon-menu-right"
></i></span>
</div>
<ul>
<li
v-for=
"(item, index) in voucherData"
:key=
"index"
@
click=
"goToDetail(item.voucherId, item.makeId)"
>
<li
v-for=
"(item, index) in voucherData"
:key=
"index"
@
click=
"goToDetail(item.voucherId, item.makeId
, item.voucherType
)"
>
<CardItem
:data=
"item"
></CardItem>
</li>
</ul>
...
...
@@ -109,12 +109,13 @@ export default {
})
})
},
goToDetail
(
voucherId
,
makeId
)
{
goToDetail
(
voucherId
,
makeId
,
voucherType
)
{
this
.
$router
.
push
({
path
:
'/voucherDetail'
,
query
:
{
voucherId
:
voucherId
,
makeId
:
makeId
makeId
:
makeId
,
voucherType
:
voucherType
}
})
},
...
...
src/views/user/index.vue
View file @
d24031d8
...
...
@@ -34,7 +34,7 @@
</span>
<span
class=
"line-vertical"
></span>
</div>
<div
class=
"item"
@
click=
"goToDetail(item.voucherId, item.makeId)"
>
<div
class=
"item"
@
click=
"goToDetail(item.voucherId, item.makeId
, item.voucherType
)"
>
<CardItem
:data=
"item"
></CardItem>
<span
class=
"status"
>
<img
src=
'../../assets/images/icon-failed.png'
v-if=
"item.state==4"
class=
"full-width"
/>
...
...
@@ -146,12 +146,13 @@ export default {
})
})
},
goToDetail
(
voucherId
,
makeId
)
{
goToDetail
(
voucherId
,
makeId
,
voucherType
)
{
this
.
$router
.
push
({
path
:
'/voucherDetail'
,
query
:
{
voucherId
:
voucherId
,
makeId
:
makeId
makeId
:
makeId
,
voucherType
:
voucherType
}
})
}
...
...
src/views/voucherDetail/index.vue
View file @
d24031d8
...
...
@@ -17,7 +17,8 @@
</div>
-->
</div>
<div
class=
"body"
>
<div
class=
"big-title"
>
{{
voucherData
.
cost
}}
<span
class=
"unit"
>
元
</span></div>
<div
class=
"big-title"
v-if=
"voucherType === '2'"
>
免费
<span
class=
"unit"
>
价值
{{
voucherData
.
cost
}}
元
</span></div>
<div
class=
"big-title"
v-else
>
{{
voucherData
.
cost
}}
<span
class=
"unit"
>
元
</span></div>
<div
class=
"text-center"
>
{{
voucherData
.
voucherName
}}
</div>
<div
class=
"table"
>
<div
class=
"tr"
>
...
...
@@ -81,11 +82,11 @@
<!-- 小贴士 -->
<div
class=
"popup-model"
v-if=
"tipsPopupVisible"
>
<div
class=
"body"
>
<p
class=
"label-title"
>
产检时间
</p>
<
!--
<
p
class=
"label-title"
>
产检时间
</p>
<p>
{{
tipsData
.
tipsTime
}}
</p>
<p
class=
"label-title"
>
产检项目
</p>
<p>
{{
tipsData
.
tipsTitle
}}
</p>
<p
class=
"label-title"
>
产检贴士
</p>
<p
class=
"label-title"
>
产检贴士
</p>
-->
<p
v-html=
"tipsData.tipsDetailed"
></p>
<div
class=
"footer"
>
<div
style=
"padding: 10px;"
><button
class=
"btn-default btn-block"
@
click=
"tipsPopupVisible=false"
>
确认
</button></div>
...
...
@@ -109,6 +110,7 @@ export default {
return
{
vocuherId
:
this
.
$route
.
query
.
voucherId
,
makeId
:
this
.
$route
.
query
.
makeId
,
voucherType
:
this
.
$route
.
query
.
voucherType
,
voucherData
:
null
,
voucherBtnData
:
null
,
contentData
:
[],
// 内容流数据
...
...
src/views/vouchers/index.vue
View file @
d24031d8
...
...
@@ -5,7 +5,7 @@
<span
class=
"label"
>
我的健康券
</span>
</div>
<ul>
<li
v-for=
"(item, index) in voucherData"
:key=
"index"
@
click=
"goToDetail(item.voucherId, item.makeId)"
>
<li
v-for=
"(item, index) in voucherData"
:key=
"index"
@
click=
"goToDetail(item.voucherId, item.makeId
, item.voucherType
)"
>
<CardItem
:data=
"item"
></CardItem>
</li>
</ul>
...
...
@@ -72,12 +72,13 @@ export default {
}
this
.
getUserCardByIdFn
()
},
goToDetail
(
voucherId
,
makeId
)
{
goToDetail
(
voucherId
,
makeId
,
voucherType
)
{
this
.
$router
.
push
({
path
:
'/voucherDetail'
,
query
:
{
voucherId
:
voucherId
,
makeId
:
makeId
makeId
:
makeId
,
voucherType
:
voucherType
}
})
}
...
...
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