From c06a284a826e0b76f5d73a8b73f7f3d93fa22f5f Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Fri, 23 Sep 2022 17:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v1_5_0_C/couponCollection.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/v1_5_0_C/couponCollection.html b/v1_5_0_C/couponCollection.html
index 6c03453..965a72f 100644
--- a/v1_5_0_C/couponCollection.html
+++ b/v1_5_0_C/couponCollection.html
@@ -80,12 +80,12 @@
                                 <div class="imgbox">
                                     <!-- type :1  兑换码   2:立减金,channel:1支付宝，2微信 -->
                                     <img class="le-img"
-                                        :src="item.type==1?item.entity.show_url:item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png'"
-                                        :class="item.stock&&item.stock<0||item.available!=1&&item.available!=2?'changegray':''"></img>
+                                        :src="item.type==1?item.entity.show_url:(item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png')"
+                                        :class="item.stock&&(item.stock<0||item.available!=1)&&(item.available!=2?'changegray':'')"></img>
                                 </div>
                                 <div class="item-name"
                                     v-html="item.type==1?item.entity.product_name:item.entity.batch_goods_name"
-                                    :class="item.stock&&item.stock<0||item.available!=1&&item.available!=2?'changegray':''">
+                                    :class="item.stock&&(item.stock<0||item.available!=1)&&(item.available!=2?'changegray':'')">
                                 </div>
                                 <p class="price">
                                     原价￥180.60
@@ -100,8 +100,8 @@
                     </div>
                 </div>
                 <div class="exchangeBtn"
-                    :class="gstatus!=1?describe.type&&describe.type!=2&&describe.content?'bottomBtn noexchangeBtn':'noexchangeBtn':describe.type&&describe.type!=2&&describe.content?'bottomBtn':''"
-                    :style="{'background': bgcolor,'color':ftcolor}" @click="exchangeBtn()">
+                    :class="(gstatus!=1?describe.type:false)&&describe.type!=2&&(describe.content?'bottomBtn noexchangeBtn':'noexchangeBtn':describe.type)&&describe.type!=2&&(describe.content?'bottomBtn':'')"
+                    :style="{background: bgcolor,color:ftcolor}" @click="exchangeBtn()">
                     立即兑换
                 </div>
             </div>
@@ -115,7 +115,7 @@
                     <li v-for="(item,i) in swiperDataList" :key="i" @click="exchangeBtn(item)">
                         <div class="box">
                             <div class="imgBG">
-                                <img :src="item.type==1?item.entity.show_url:item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png'"
+                                <img :src="item.type==1?item.entity.show_url:(item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png')"
                                     alt=""
                                     :class="item.stock&&item.stock<0||item.available!=1&&item.available!=2?'changegray':''">
                             </div>
@@ -159,7 +159,7 @@
                                     alt="">
                             </span>
                             <img class="img"
-                                :src="item.type==1?item.entity.show_url:item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png'"
+                                :src="item.type==1?item.entity.show_url:(item.entity.channel==1?'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/zfbreduce.png':'http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/wxreduce.png')"
                                 alt="" />
                         </div>
                         <div class="detail-text">