排序/类型筛选

src/main/vue/src/views/AirDropList.vue

@@ -15,7 +15,10 @@
             </el-button> -->
         </page-title>
         <div class="filters-container">
-            <created-at-picker v-model="createdAt" @input="getData"></created-at-picker>
+            <created-at-picker v-model="createdAt" @input="getData" style="margin-right: 10px"></created-at-picker>
+            <el-select v-model="type" clearable placeholder="请选择空投类型" @change="getData">
+                <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
             <el-input
                 placeholder="搜索..."
                 v-model="search"
@@ -92,7 +95,8 @@ export default {
                 { label: '藏品', value: 'asset' },
                 { label: '兑换券', value: 'coupon' }
             ],
-            createdAt: ''
+            createdAt: '',
+            type: ''
         };
     },
     computed: {
@@ -109,7 +113,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false, createdAt: this.createdAt } };
+            return { search: this.search, query: { del: false, createdAt: this.createdAt, type: this.type } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/CommissionRecordList.vue

@@ -50,7 +50,11 @@
             <el-table-column prop="orderId" label="订单ID"> </el-table-column>
             <el-table-column prop="totalPrice" label="订单总价"> </el-table-column>
             <el-table-column prop="shareRatio" label="分成比例"> </el-table-column>
-            <el-table-column prop="shareAmount" label="分成金额"> </el-table-column>
+            <el-table-column prop="shareAmount" label="分成金额">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
             <!-- <div class="multiple-mode-wrapper">

src/main/vue/src/views/InviteList.vue

@@ -48,7 +48,11 @@
             <el-table-column prop="phone" label="手机"> </el-table-column>
             <el-table-column prop="code" label="邀请码"> </el-table-column>
             <el-table-column prop="remark" label="备注"> </el-table-column>
-            <el-table-column prop="inviteNum" label="邀请人数"> </el-table-column>
+            <el-table-column prop="inviteNum" label="邀请人数">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="350">
                 <template slot-scope="{ row }">
                     <el-button @click="detail(row)" size="mini">邀请列表</el-button>
@@ -87,9 +91,9 @@
             </el-table>
         </el-dialog>
 
-        <el-dialog :visible.sync="showCodeDialog" title="二维码" width="400px">
-            <vue-qrcode :value="codeValue" :options="{ width: 300, margin: 2 }"></vue-qrcode>
-            <div>右键点击二维码可保存</div>
+        <el-dialog :visible.sync="showCodeDialog" title="二维码" width="400px" center>
+            <vue-qrcode :value="codeValue" :options="{ width: 300, margin: 2 }" style="margin-left:25px"></vue-qrcode>
+            <div style="margin-left:40px;font-size:16px">右键点击二维码可保存</div>
         </el-dialog>
     </div>
 </template>

src/main/vue/src/views/OrderList.vue

@@ -158,7 +158,7 @@ export default {
         },
         getParams() {
             let data = {
-                sort: 'createdAt,desc',
+                // sort: 'createdAt,desc',
                 query: {
                     del: false
                 }

src/main/vue/src/views/RecommendList.vue

@@ -12,7 +12,7 @@
             </el-button>
         </page-title>
         <div class="filters-container">
-            <el-select v-model="type" clearable @change="getData">
+            <el-select v-model="type" clearable @change="getData" placeholder="请选择类型">
                 <el-option v-for="item in typeOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
             </el-select>
             <el-input