update:bugfix按钮顺序

src/pages/Withdrawal/Examine/index.vue

@@ -120,7 +120,7 @@
           align="center"
         ></el-table-column>
         <!-- 操作快捷键 -->
-        <el-table-column label="操作" align="center" fixed="right" width="200">
+        <el-table-column label="操作" align="center" width="120">
           <template v-slot:default="scope">
             <el-button
               type="text"
@@ -227,6 +227,12 @@
             dialogData.showData.history_share
           }}</span>
         </li>
+        <li>
+          <span class="list-left">历史下载留存 :</span
+          ><span class="list-right">{{
+            dialogData.showData.history_download_keep
+          }}</span>
+        </li>
       </ul>
       <el-form-item class="text-area" label="奖励明细:">
         <el-table

src/pages/Withdrawal/walletAccount/flowRecord.vue

@@ -76,14 +76,14 @@
       >
       <!-- <page :totalNum="totalNum" @update="update" /> -->
       <el-pagination
-          :class="totalNum/params.page_size>=7? 'page': ''"
-          @current-change="handleCurrentChange"
-          v-model:currentPage="params.page"
-          :page-size="params.page_size"
-          layout="total, prev, pager, next"
-          :total="totalNum"
-        >
-        </el-pagination>
+        :class="totalNum / params.page_size >= 7 ? 'page' : ''"
+        @current-change="handleCurrentChange"
+        v-model:currentPage="params.page"
+        :page-size="params.page_size"
+        layout="total, prev, pager, next"
+        :total="totalNum"
+      >
+      </el-pagination>
     </el-card>
   </div>
 </template>
@@ -108,16 +108,16 @@ export default {
           amount: 4,
           balance: 555,
           trade_type: "提现",
-          status: "失败"
-        }
+          status: "失败",
+        },
       ],
       tableLoading: false,
       params: {
         page: 1,
         currentPage: 1,
-        page_size: 20
+        page_size: 20,
       },
-      totalNum: null
+      totalNum: null,
     };
   },
 
@@ -148,7 +148,7 @@ export default {
         wallet_id,
         page,
         page_size,
-        type
+        type,
       };
       getRecordList(params_list)
         .then((res) => {
@@ -168,9 +168,15 @@ export default {
     },
     // 返回
     handleBack() {
-      this.$router.back();
-    },
-  },
+      this.$router.push({
+        path: "/op/withdrawal/walletaccount",
+        query: {
+          search_id: this.$route.query.search_id || undefined,
+          search_type: this.$route.query.search_type || undefined
+        }
+      });
+    }
+  }
 };
 </script>
 
@@ -183,9 +189,8 @@ export default {
   padding: 20px;
 }
 .page {
-  /deep/ .el-pager>li:last-of-type {
-  display: none;
+  /deep/ .el-pager > li:last-of-type {
+    display: none;
+  }
 }
-}
-
 </style>
\ No newline at end of file

src/pages/Withdrawal/walletAccount/index.vue

@@ -119,7 +119,7 @@
         <!-- 分页 -->
         <!-- <page :totalNum="totalNum" @update="update" ref="params" /> -->
         <el-pagination
-        :class="totalNum/params.page_size>=7? 'page': ''"
+          :class="totalNum / params.page_size >= 7 ? 'page' : ''"
           @current-change="handleCurrentChange"
           v-model:currentPage="params.page"
           :page-size="params.page_size"
@@ -167,6 +167,8 @@ export default {
   },
   created() {
     this.tableLoading = true;
+    this.searchProps.user_id = this.$route.query.search_id || "";
+    this.searchProps.type = +this.$route.query.search_type || "";
     this.getAccountList();
     // this.getPermissionsAll();
   },
@@ -224,24 +226,28 @@ export default {
         }是否继续?`,
         "提示",
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+          confirmButtonText: "取消",
+          cancelButtonText: "确定",
+          cancelButtonClass: "cancel",
+          confirmButtonClass: "confirm",
+          dangerouslyUseHTMLString: true,
+          closeOnClickModal: false,
           type: "warning",
           center: true,
         }
       )
         .then(() => {
+          this.$message({
+            type: "info",
+            message: "已取消",
+          });
+        })
+        .catch(() => {
           if (+type === 0) {
             this.handleBlackList(user_id, wallet_id);
           } else {
             this.release(user_id, wallet_id);
           }
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消",
-          });
         });
     },
 
@@ -265,7 +271,12 @@ export default {
     handelRecord(row) {
       this.$router.push({
         path: "/op/withdrawal/flowrecord",
-        query: { user_id: row.user_id, wallet_id: row.wallet_id },
+        query: {
+          user_id: row.user_id,
+          wallet_id: row.wallet_id,
+          search_id: this.searchProps.user_id || undefined,
+          search_type: this.searchProps.type || undefined,
+        },
       });
     },
     //黑名单
@@ -301,11 +312,14 @@ export default {
   margin: 0 2px;
 }
 .page {
-  /deep/ .el-pager>li:last-of-type {
-  display: none;
-}
+  /deep/ .el-pager > li:last-of-type {
+    display: none;
+  }
 }
-
+// /deep/ .el-button el-button--default el-button--small .cancel {
+//   float: right;
+//   margin-left: 10px;
+// }
 </style>