标签修改/bug修改

src/main/resources/templates/shopping/cart.html

@@ -107,7 +107,7 @@
                                     <!--超级会员价格标签-->
                                     <div class="svip-tag">
                                         <div class="svip-icon">SVIP</div>
-                                        <div class="svip-price">
+                                        <div class="svip-price" v-if="cart.svipProductFlag == 1 && GLOBAL_VIP_FLAG === 1">
                                             <span v-html="cart.svipPriceTag"></span>
                                         </div>
                                     </div>

src/main/resources/templates/user-center/member/member.html

@@ -88,7 +88,18 @@
                                 <span class="type" v-html="item.typeText"></span>
                                 <div class="amount"><i>￥</i>{{ item.couponAmount }}</div>
                                 <div class="condition">满{{ item.touchPrice }}可用</div>
-                                <div class="condition" v-html="item.productType === 1 ? '全商城商品通用' : '指定商品可用'"></div>
+                                <template>
+                                    <div class="condition" v-if="item.couponType == 0">
+                                      {{ item.productType && item.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 1">
+                                      {{ item.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 3">
+                                        <abbr :title="'仅限购买店铺【' + item.shopName + '】的商品'">仅限购买店铺【...】的商品</abbr>
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 4 || item.couponType == 2">全商城商品通用</div>
+                                </template>
                                 <div class="receive-btn" v-if="!item.getFlag" @click="receiveCoupon(item.couponId)">立即领取</div>
                                 <div class="receive-btn" v-else-if="item.useStatus === 1"  @click="toUseCoupon(item)">去使用</div>
                                 <div class="receive-btn" v-else="item.useStatus === 2">已使用</div>