w-front-end / select_good · Commits

Commit 1b594e7a55e290d2720f75f22aea7668bfc3c0bf

Authored by 王强
2 parents fb735e47 c8af4cce

Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive… 

….com/w-front-end/select_good into version_2.0.0_optimization_mall_update
Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
src/pages/healthGoodDetails/healthGoodDetails.vue
  View file @1b594e7
@@ -146,14 +146,14 @@ @@ -146,14 +146,14 @@
146 <!-- 有健康值页脚显示 --> 146 <!-- 有健康值页脚显示 -->
147 <div v-if="goodsInfo && goodsInfo.stock != 0"> 147 <div v-if="goodsInfo && goodsInfo.stock != 0">
148 <!-- 健康值充足 --> 148 <!-- 健康值充足 -->
149 - <div v-if="goodsInfo.grade>goodsInfo.num || goodsInfo.grade == goodsInfo.num" class="footer"> 149 + <div v-if="parseInt(goodsInfo.grade)>parseInt(goodsInfo.num) || parseInt(goodsInfo.grade) == parseInt(goodsInfo.num)" class="footer">
150 <div class="btn" @click="exchange"> 150 <div class="btn" @click="exchange">
151 立即兑换 151 立即兑换
152 </div> 152 </div>
153 </div> 153 </div>
154 <!-- 健康值不足页脚显示 --> 154 <!-- 健康值不足页脚显示 -->
155 - <div v-if="goodsInfo.grade<goodsInfo.num" class="footer">  
156 - <div class="desc">还差{{goodsInfo.num-goodsInfo.grade}}健康值</div> 155 + <div v-else-if="parseInt(goodsInfo.grade)<parseInt(goodsInfo.num)" class="footer">
  156 + <div class="desc">还差{{parseInt(goodsInfo.num)-parseInt(goodsInfo.grade)}}健康值</div>
157 <div class="btn" @click="jumpClientIntegralList"> 157 <div class="btn" @click="jumpClientIntegralList">
158 获取健康值 158 获取健康值
159 </div> 159 </div>
@@ -431,7 +431,7 @@ export default { @@ -431,7 +431,7 @@ export default {
431 // 设置跳转参数 431 // 设置跳转参数
432 let params = { 432 let params = {
433 type: '34', 433 type: '34',
434 - to: this.mode == 'pro' ? "http://wjjh5.cnlive.com" : "http://wjjh5test.cnlive.com" + "/cnStepApp.html?isShowTitle=true&type=web", 434 + to: this.mode == 'prod' ? "http://wjjh5.cnlive.com" : "http://wjjh5test.cnlive.com" + "/cnStepApp.html?isShowTitle=true&type=web",
435 shop_type: '' 435 shop_type: ''
436 }; 436 };
437 // 页面跳转 437 // 页面跳转
src/pages/healthMall/healthMall.less
  View file @1b594e7
@@ -9,6 +9,11 @@ @@ -9,6 +9,11 @@
9 .column-list-box{ 9 .column-list-box{
10 margin-top:40px; 10 margin-top:40px;
11 } 11 }
  12 + .back-box{
  13 + background-color: #FFF;
  14 + position:fixed;
  15 + z-index:1;
  16 + }
12 .no_more{ 17 .no_more{
13 width:100%; 18 width:100%;
14 height: 37px; 19 height: 37px;