“健康券”类型券模块样式调整；

config/dev.env.js

@@ -3,7 +3,7 @@ const merge = require('webpack-merge')
 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"' //打包后请求前缀（正式）
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   API_ROOT: baseUrl

config/prod.env.js

@@ -3,7 +3,7 @@ const merge = require('webpack-merge')
 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"' //打包后请求前缀（正式）
 module.exports = merge(prodEnv, {
   NODE_ENV: '"production"',
   API_ROOT: baseUrl

src/components/cardItem.vue

@@ -3,9 +3,13 @@
     <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">
+        <div class="card-item-cell price" v-if="data.voucherType === 2">
+          <div class="label">免费</div>
+          <div class="des">价值{{data.cost}}元</div>
+        </div>
+        <div class="card-item-cell price" v-else>
           <div class="label">{{data.cost}}<span class="unit">元</span></div>
-          <div>{{data.voucherType === '1' ? '提醒券' : data.voucherType === '2' ? '健康券' : data.voucherType === '3' ? '代金券' : ''}}</div>
+          <div class="des">{{data.voucherType === '1' ? '提醒券' : data.voucherType === '2' ? '健康券' : data.voucherType === '3' ? '代金券' : ''}}</div>
         </div>
         <div class="card-item-cell info">
           <div class="title">{{data.voucherName}}</div>
@@ -69,7 +73,7 @@ export default {
   text-align:center;
 }
 .card-item > .card-item-content > .card-item-table > .price .label {
-  font-size: 2.5em;
+  font-size: 2.3em;
   font-weight: bold;
   color:#43d1be;
   padding: 0;
@@ -78,6 +82,10 @@ export default {
   font-size:40%;
   font-weight:normal;
 }
+.card-item > .card-item-content > .card-item-table > .price > .des {
+  font-size: 1em;
+  margin-top: 8px;
+}
 .card-item > .card-item-content > .card-item-table > .info {
   width:70%;
   color:#35444f;

src/components/couponItem.vue

@@ -3,7 +3,12 @@
     <img src="../assets/images/coupon-item-bg.png" class="bg"/>
     <div class="coupon-content">
       <div class="coupon-table">
-        <div class="cell info">
+        <div class="cell info" v-if="data.voucherType === 2">
+          <div class="price">免费<span class="unit">价值{{data.cost}}元</span></div>
+          <div class="title">{{data.name}}</div>
+          <small class="des">{{data.labelId === 1 || data.labelId === 3 ? '孕产妇检券':data.labelId === 2 ? '儿童健康体检券': ''}}</small>
+        </div>
+        <div class="cell info" v-else>
           <div class="title">{{data.name}}</div>
           <div class="price">{{data.cost}}<span class="unit">元</span></div>
           <small class="des">{{data.labelId === 1 || data.labelId === 3 ? '孕产妇检券':data.labelId === 2 ? '儿童健康体检券': ''}}</small>
@@ -46,7 +51,7 @@ export default {
   .coupon-item > .coupon-content {
     position:absolute;
     left:1em;
-    top:1em;
+    top:0;
     bottom:0;
     right:1em;
   }
@@ -73,7 +78,7 @@ export default {
     overflow:hidden;
   }
   .coupon-item > .coupon-content > .coupon-table > .info .price {
-    font-size: 2em;
+    font-size: 1.8em;
     color:#E9462B;
     margin:0.1em 0;
     font-weight:bold;
@@ -81,6 +86,7 @@ export default {
   .coupon-item > .coupon-content > .coupon-table > .info .price > .unit {
     font-size: 50%;
     font-weight:normal;
+    margin-left: 10px;
   }
   .coupon-item > .coupon-content > .coupon-table > .info .des{
     font-size: 0.8em;

src/views/user/index.vue

@@ -34,7 +34,7 @@
               </span>
               <span class="line-vertical"></span>
             </div>
-            <div class="item">
+            <div class="item" @click="goToDetail(item.voucherId, item.makeId)">
               <CardItem :data="item"></CardItem>
               <span class="status">
                 <img src='../../assets/images/icon-failed.png' v-if="item.state==4" class="full-width"/>
@@ -145,6 +145,15 @@ export default {
           duration: 3000
         })
       })
+    },
+    goToDetail (voucherId, makeId) {
+      this.$router.push({
+        path: '/voucherDetail',
+        query: {
+          voucherId: voucherId,
+          makeId: makeId
+        }
+      })
     }
   }
 }