From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/myWait/index.vue | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 8e49ee7..70d1006 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="userList">
- <div class="headerTitle">杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�</div>-->
<header>
<div class="headerContent">
<div class="search">
@@ -16,8 +16,11 @@
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
<el-table
+ border
+ stripe
ref="multipleTable"
:header-cell-style="{
+ background: '#F5F5F5',
'font-weight': '650',
'line-height': '45px',
}"
@@ -203,7 +206,11 @@
methods: {
getTableData() {
myWait
- .getMybackLog({ num: this.context, current: this.currentPage, pageSize: this.pageSize })
+ .getMybackLog({
+ num: this.context,
+ current: this.currentPage,
+ pageSize: this.pageSize,
+ })
.then(({ records, total }) => {
this.tableData = records;
this.tableData = this.tableData.filter((item) => !!item);
@@ -345,18 +352,18 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
- color: #4b9bb7;
-
+ padding: 10px 20px;
+ // color: #4b9bb7;
+ border: 1px solid #ccc;
.headerTitle {
line-height: 40px;
}
header {
- background-color: white;
+ //background-color: white;
.headerContent {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -376,7 +383,7 @@
&::v-deep .el-input__inner {
background-color: #fff;
- border: 1px solid #17324c;
+ //border: 1px solid #17324c;
}
}
}
@@ -390,7 +397,7 @@
.el-button {
padding: 12px 25px;
- border-radius: 20px;
+ //border-radius: 20px;
}
}
@@ -404,7 +411,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
@@ -425,7 +432,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #dcdfe6;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -496,11 +503,11 @@
.operation {
display: flex;
-
+ color: var(--operation-color);
.line {
padding: 0 5px;
}
-
+ color: var(--operation-color);
span:hover {
cursor: pointer;
}
@@ -571,4 +578,4 @@
padding: 0;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0