Merge branch 'feature/8月-奥莱定制' into test

src/views/card/addStoreDialog.vue

@@ -92,6 +92,9 @@ export default {
     margin-bottom: 20px;
   }
 }
+.vue-recycle-scroller__item-wrapper {
+  margin-bottom: 20px !important;
+}
 </style>
 <style lang="scss" scoped>
 .el-dialog__footer {

src/views/card/give-list.vue

@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" width="140" align="left" prop="cardType" label="卡券类型">
         <template slot-scope="scope">
-          <p>{{ scope.row.cardType === 0 ? '抵金券' : scope.row.cardType === 1 ? '折扣券' : '兑换券' }}</p>
+          <p>{{ scope.row.cardType === 0 ? '抵金券' : scope.row.cardType === 1 ? '折扣券' : scope.row.cardType == 2 ? '兑换券' : scope.row.cardType == 3 ? '商场抵金券' : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardName" label="卡券名称">