Merge branch 'feat/v20241110-同城联盟卡' into dev

src/views/business/alliance/index.vue

@@ -3,18 +3,20 @@
     <!-- 查询和其他操作 -->
     <div class="filter-container">
       <el-input v-model="listQuery.search" clearable size="mini" class="filter-item" style="width: 200px" placeholder="联盟卡名称/商家名称" />
-      <el-select v-model="listQuery.state" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请选择审核状态">
+      <el-select closeable v-model="listQuery.state" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请选择审核状态">
         <el-option label="审核中" :value="1" />
         <el-option label="已通过" :value="2" />
         <el-option label="未通过" :value="3" />
       </el-select>
       <el-button size="mini" class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="handleSearch">查找</el-button>
+      <el-button size="mini" class="filter-item" type="info" icon="el-icon-search" style="margin-left: 10px" @click="handleReset">重置</el-button>
       <br />
     </div>
 
     <!-- 查询结果 -->
     <div v-tableHeight>
       <el-table v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list" v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }">
+        <el-table-column  label="#" type="index" width="80" align="center" />
         <el-table-column prop="shopId" label="商家Id" width="120" align="center" />
         <el-table-column prop="shopName" label="商家名称" width="150" align="center" />
         <el-table-column prop="name" label="联盟卡名称" width="150" align="center" />
@@ -27,8 +29,8 @@
         </el-table-column>
         <el-table-column prop="isIssuance" label="是否发行" width="120" align="center">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.isIssuance === '1' ? 'success' : 'info'" size="small">
-              {{ scope.row.isIssuance === '1' ? '已发行' : '未发行' }}
+            <el-tag :type="scope.row.isIssuance == '1' ? 'success' : 'info'" size="small">
+              {{ scope.row.isIssuance == '1' ? '发行' : '停售' }}
             </el-tag>
           </template>
         </el-table-column>
@@ -56,12 +58,12 @@
         <el-table-column prop="expirationTime" label="到期时间" width="180" align="center" />
         <el-table-column prop="headOfCommission" label="团长佣金" width="120" align="center">
           <template slot-scope="scope">
-            <span style="color: #f40">￥{{ scope.row.headOfCommission }}</span>
+            <span style="color: #f40">￥{{ scope.row.headOfCommission || '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="partnerCommission" label="合伙人佣金" width="120" align="center">
           <template slot-scope="scope">
-            <span style="color: #f40">￥{{ scope.row.partnerCommission }}</span>
+            <span style="color: #f40">￥{{ scope.row.partnerCommission || '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="statement" label="权益信息" width="150" align="center" />
@@ -143,7 +145,7 @@ export default {
       this.getList()
     },
     getStateTagType(state) {
-      switch (state) {
+      switch (state + '') {
         case '1':
           return 'warning'
         case '2':
@@ -153,6 +155,12 @@ export default {
         default:
           return ''
       }
+    },
+
+    handleReset(){
+      this.listQuery.search = ''
+      this.listQuery.state = ''
+      this.handleSearch()
     }
   }
 }