Commit d24031d8 by 潘琦

相关微信用户端根据后台逻辑变更相对于更改逻辑;

parent ce5561fd
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
const merge = require('webpack-merge') const merge = require('webpack-merge')
const prodEnv = require('./prod.env') const prodEnv = require('./prod.env')
const baseUrl = '"http://voucher.check.icaremgt.com"' //打包请求前缀(开发) const baseUrl = '"http://voucher.check.icaremgt.com"' //打包请求前缀(开发)
// const baseUrl = '"http://voucher.icaremgt.com"' //打包请求前缀(正式) // const baseUrl = '"http://voucher.icaremgt.com"' //打包请求前缀(正式)
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
API_ROOT: baseUrl API_ROOT: baseUrl
......
...@@ -532,7 +532,7 @@ ul li { ...@@ -532,7 +532,7 @@ ul li {
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.popup-model .body { .popup-model .body {
padding: 1em 1em 2em 1em; padding: 1em 1em 5em 1em;
position: relative; position: relative;
overflow: auto; overflow: auto;
height: 100%; height: 100%;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<img src="../assets/images/card-item-bg.png" class="bg"/> <img src="../assets/images/card-item-bg.png" class="bg"/>
<div class="card-item-content"> <div class="card-item-content">
<div class="card-item-table"> <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="label">免费</div>
<div class="des">价值{{data.cost}}</div> <div class="des">价值{{data.cost}}</div>
</div> </div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span class="link" @click="goToVouchers">查看全部 <i class="glyphicon glyphicon-menu-right"></i></span> <span class="link" @click="goToVouchers">查看全部 <i class="glyphicon glyphicon-menu-right"></i></span>
</div> </div>
<ul> <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> <CardItem :data="item"></CardItem>
</li> </li>
</ul> </ul>
...@@ -109,12 +109,13 @@ export default { ...@@ -109,12 +109,13 @@ export default {
}) })
}) })
}, },
goToDetail (voucherId, makeId) { goToDetail (voucherId, makeId, voucherType) {
this.$router.push({ this.$router.push({
path: '/voucherDetail', path: '/voucherDetail',
query: { query: {
voucherId: voucherId, voucherId: voucherId,
makeId: makeId makeId: makeId,
voucherType: voucherType
} }
}) })
}, },
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</span> </span>
<span class="line-vertical"></span> <span class="line-vertical"></span>
</div> </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> <CardItem :data="item"></CardItem>
<span class="status"> <span class="status">
<img src='../../assets/images/icon-failed.png' v-if="item.state==4" class="full-width"/> <img src='../../assets/images/icon-failed.png' v-if="item.state==4" class="full-width"/>
...@@ -146,12 +146,13 @@ export default { ...@@ -146,12 +146,13 @@ export default {
}) })
}) })
}, },
goToDetail (voucherId, makeId) { goToDetail (voucherId, makeId, voucherType) {
this.$router.push({ this.$router.push({
path: '/voucherDetail', path: '/voucherDetail',
query: { query: {
voucherId: voucherId, voucherId: voucherId,
makeId: makeId makeId: makeId,
voucherType: voucherType
} }
}) })
} }
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
</div> --> </div> -->
</div> </div>
<div class="body"> <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="text-center">{{voucherData.voucherName}}</div>
<div class="table"> <div class="table">
<div class="tr"> <div class="tr">
...@@ -81,11 +82,11 @@ ...@@ -81,11 +82,11 @@
<!-- 小贴士 --> <!-- 小贴士 -->
<div class="popup-model" v-if="tipsPopupVisible"> <div class="popup-model" v-if="tipsPopupVisible">
<div class="body"> <div class="body">
<p class="label-title">产检时间</p> <!-- <p class="label-title">产检时间</p>
<p>{{tipsData.tipsTime}}</p> <p>{{tipsData.tipsTime}}</p>
<p class="label-title">产检项目</p> <p class="label-title">产检项目</p>
<p>{{tipsData.tipsTitle}}</p> <p>{{tipsData.tipsTitle}}</p>
<p class="label-title">产检贴士</p> <p class="label-title">产检贴士</p> -->
<p v-html="tipsData.tipsDetailed"></p> <p v-html="tipsData.tipsDetailed"></p>
<div class="footer"> <div class="footer">
<div style="padding: 10px;"><button class="btn-default btn-block" @click="tipsPopupVisible=false">确认</button></div> <div style="padding: 10px;"><button class="btn-default btn-block" @click="tipsPopupVisible=false">确认</button></div>
...@@ -109,6 +110,7 @@ export default { ...@@ -109,6 +110,7 @@ export default {
return { return {
vocuherId: this.$route.query.voucherId, vocuherId: this.$route.query.voucherId,
makeId: this.$route.query.makeId, makeId: this.$route.query.makeId,
voucherType: this.$route.query.voucherType,
voucherData: null, voucherData: null,
voucherBtnData: null, voucherBtnData: null,
contentData: [], // 内容流数据 contentData: [], // 内容流数据
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<span class="label">我的健康券</span> <span class="label">我的健康券</span>
</div> </div>
<ul> <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> <CardItem :data="item"></CardItem>
</li> </li>
</ul> </ul>
...@@ -72,12 +72,13 @@ export default { ...@@ -72,12 +72,13 @@ export default {
} }
this.getUserCardByIdFn() this.getUserCardByIdFn()
}, },
goToDetail (voucherId, makeId) { goToDetail (voucherId, makeId, voucherType) {
this.$router.push({ this.$router.push({
path: '/voucherDetail', path: '/voucherDetail',
query: { query: {
voucherId: voucherId, voucherId: voucherId,
makeId: makeId makeId: makeId,
voucherType: voucherType
} }
}) })
} }
......
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