Merge branch 'feature/8月-奥莱抵金券'

src/components/wechatmembers/cardvoucher.vue

@@ -120,7 +120,7 @@
                   min-width="80px"
                 >
                 <template slot-scope="{row}">
-                  {{row.cardType == 0 ? '抵金券' : row.cardType == 1 ? '折扣券' : row.cardType == 2 ? '兑换券' : '--'}}
+                  {{row.cardType == 0 ? '抵金券' : row.cardType == 1 ? '折扣券' : row.cardType == 2 ? '兑换券' : row.cardType == 3 ? '商场抵金券' : '--'}}
                 </template>
                 </el-table-column>
                 <el-table-column
@@ -141,7 +141,7 @@
                   min-width="80px"
                 >
                 <template slot-scope="{row}">
-                  {{row.cardType == 0 ? `${row.cardDenomination}元` : row.cardType == 1 ? `${row.cardDenomination}折` : '--'}}
+                  {{row.cardType == 0 || row.cardType == 3 ? `${row.cardDenomination}元` : row.cardType == 1 ? `${row.cardDenomination}折` : '--'}}
                 </template>
                 </el-table-column>
                 <el-table-column
@@ -217,7 +217,7 @@
                     <div class="operate">
                       <el-button
                         type="text"
-                        v-if="scope.row.status === 4 && getCodeAuth('memberCardDestory')"
+                        v-if="scope.row.status === 4 && scope.row.cardType != 3 && getCodeAuth('memberCardDestory')"
                         :limit-code='getCode("memberCardDestory")'
                         @click="handleCheckDestory(scope.row)"
                       >核销</el-button>