fix: 增加积分和钱兑换显示

7785cb08 · 无尘 · d1973d58 · 7785cb08 · 7785cb08 · 7785cb08
Commit 7785cb08 authored Jul 19, 2019 by 无尘
7 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-22470e30.9fc010f7.css rel=prefetch><link href=css/chunk-4a4fbe1a.05a38bb0.css rel=prefetch><link href=css/chunk-5179e400.c48503d9.css rel=prefetch><link href=css/chunk-8ba63460.244ad228.css rel=prefetch><link href=css/chunk-8e82d01e.3cba777f.css rel=prefetch><link href=css/chunk-a1dc0af2.18cdfd01.css rel=prefetch><link href=js/chunk-22470e30.b60df800.js rel=prefetch><link href=js/chunk-4a4fbe1a.a502276c.js rel=prefetch><link href=js/chunk-5179e400.94a7a630.js rel=prefetch><link href=js/chunk-8ba63460.59cbeda3.js rel=prefetch><link href=js/chunk-8e82d01e.f0ccac3f.js rel=prefetch><link href=js/chunk-a1dc0af2.75550498.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.bc2de622.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.bc2de622.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-22470e30.9fc010f7.css rel=prefetch><link href=css/chunk-4a4fbe1a.05a38bb0.css rel=prefetch><link href=css/chunk-5179e400.c48503d9.css rel=prefetch><link href=css/chunk-8ba63460.244ad228.css rel=prefetch><link href=css/chunk-8e82d01e.3cba777f.css rel=prefetch><link href=css/chunk-a1dc0af2.18cdfd01.css rel=prefetch><link href=js/chunk-22470e30.b60df800.js rel=prefetch><link href=js/chunk-4a4fbe1a.a502276c.js rel=prefetch><link href=js/chunk-5179e400.94a7a630.js rel=prefetch><link href=js/chunk-8ba63460.59cbeda3.js rel=prefetch><link href=js/chunk-8e82d01e.f0ccac3f.js rel=prefetch><link href=js/chunk-a1dc0af2.fa537d17.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.750a2f2f.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.750a2f2f.js></script></body></html>
\ No newline at end of file
--- a/dist/js/app.bc2de622.js
+++ b/dist/js/app.bc2de622.js
--- a/dist/js/app.bc2de622.js.map
+++ b/dist/js/app.bc2de622.js.map
--- a/dist/js/chunk-a1dc0af2.75550498.js.map
+++ b/dist/js/chunk-a1dc0af2.75550498.js.map
--- a/dist/js/chunk-a1dc0af2.75550498.js
+++ b/dist/js/chunk-a1dc0af2.75550498.js
--- a/dist/js/chunk-a1dc0af2.fa537d17.js.map
+++ b/dist/js/chunk-a1dc0af2.fa537d17.js.map
--- a/src/views/pointMall/index.vue
+++ b/src/views/pointMall/index.vue
@@ -89,7 +89,9 @@
                      </div>
                    </div>
                    <div class="point-card-cell_footer border-box">
-                      {{item.defaultConsumptionIntegral}}积分兑换
+                      <span v-if="item.paymentMethod == '10'">{{item.defaultConsumptionIntegral}}积分兑换</span>
+                      <span v-if="item.paymentMethod == '20'">{{item.defaultConsumptionIntegral}}积分+{{item.defaultConsumptionMoney}}元兑换</span>
+                      <span v-if="item.paymentMethod == '30'">{{item.defaultConsumptionMoney}}元兑换</span>
                    </div>
                  </div>
                  <div class="card-no-condition" v-if="item.threshold == '' || item.threshold == '0'">无门槛</div>
@@ -129,7 +131,11 @@
                        <p class="font-12 color-757575">剩余{{item.stock}}件</p>
                        <div class="m-t-6 m-b-6"><img class="goods-pic" :src="item.thumbnail" alt=""/></div>
                        <p class="font-10 color-b3b3b3 good-title-hidden">{{item.goodsTitle}}</p>
-                        <p class="font-11 color-c9b799"><span class="point-border">积分{{item.defaultConsumptionIntegra}}</span></p>
+                        <p class="font-11 color-c9b799">
+                          <span v-if="item.paymentMethod == '10'" class="point-border">积分{{item.defaultConsumptionIntegra}}</span>
+                          <span v-if="item.paymentMethod == '20'" class="point-border">积分{{item.defaultConsumptionIntegral}}+￥{{item.defaultConsumptionMoney}}</span>
+                          <span v-if="item.paymentMethod == '30'" class="point-border">￥{{item.defaultConsumptionMoney}}</span>
+                        </p>
                        <p class="font-11 color-757575"><span>吊牌价</span><span class="line-through">￥{{item.marketPrice}}</span></p>
                      </div>
                    </li>