2312970463@qq.com %!s(int64=4) %!d(string=hai) anos
pai
achega
72f4eef503
Modificáronse 5 ficheiros con 124 adicións e 16 borrados
  1. 1 1
      public/index.html
  2. 2 1
      src/App.vue
  3. 14 0
      src/assets/css/base.css
  4. 44 6
      src/views/Home.vue
  5. 63 8
      src/views/LoveList.vue

+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>jzpc</title>
+    <title>荆州市红十字会</title>
   </head>
   </head>
   <body>
   <body>
     <noscript>
     <noscript>

+ 2 - 1
src/App.vue

@@ -52,5 +52,6 @@ export default {
 		
 		
 		height: 300px;
 		height: 300px;
 	}
 	}
-}
+}
+
 </style>
 </style>

+ 14 - 0
src/assets/css/base.css

@@ -33,4 +33,18 @@ html {
 }
 }
 .new-detail * {
 .new-detail * {
 	max-width: 100%;
 	max-width: 100%;
+}
+.new-detail table {
+	min-width: 100%;
+}
+.new-detail td {
+	display:table-cell;
+	vertical-align:middle;
+}
+.new-detail table,th,td {
+	border: 1px solid #000;
+	text-align: center;
+}
+.flex {
+	display: flex;
 }
 }

+ 44 - 6
src/views/Home.vue

@@ -66,12 +66,18 @@
 				</div>
 				</div>
 				<div class="list">
 				<div class="list">
 					<item-title title="爱心榜" :topath="'/loveList'"></item-title>
 					<item-title title="爱心榜" :topath="'/loveList'"></item-title>
-					<el-table :data="jxList" style="width: 100%">
-						<el-table-column prop="time" label="捐献时间"></el-table-column>
-						<el-table-column prop="donate_er" label="捐献者"></el-table-column>
-						<el-table-column prop="money" label="捐献金额"></el-table-column>
-						<el-table-column prop="intention" label="捐献意向"></el-table-column>
-					</el-table>
+					<div class="list-title flex">
+						<div>捐献时间</div>
+						<div>捐献者</div>
+						<div>捐献金额</div>
+						<div>捐献意向</div>
+					</div>
+					<div class="list-item flex" v-for="(item, index) in jxList" :key="index">
+						<div class="clamp">{{item.time}}</div>
+						<div class="clamp">{{item.donate_er}}</div>
+						<div class="clamp">{{item.money}}</div>
+						<div class="clamp">{{item.intention}}</div>
+					</div>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
@@ -461,6 +467,38 @@ export default {
 			height: 262px;
 			height: 262px;
 			background: #ffffff;
 			background: #ffffff;
 			box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
 			box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+			.list-item {
+				display: flex;
+				border-bottom: 1px solid #F2F2F2;
+				&:last-of-type {
+					border-bottom:none;
+				}
+				div {
+					width: 25%;
+					height: 55px;
+					line-height: 55px;
+					text-align: center;
+					font-size: 17px;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+			.list-title {
+				display: flex;
+				padding-top: 6px;
+				div {
+					width: 25%;;
+					font-size: 17px;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #BF3333;
+					text-align: center;
+					line-height: 57px;
+					height: 57px;
+					border-bottom: 1px solid #F2F2F2;
+				}
+			}
 			.is-leaf {
 			.is-leaf {
 				font-size: 17px;
 				font-size: 17px;
 				font-family: PingFang SC;
 				font-family: PingFang SC;

+ 63 - 8
src/views/LoveList.vue

@@ -1,13 +1,23 @@
 <template>
 <template>
 	<div class="love-list">
 	<div class="love-list">
-		<el-table :data="tableData" border style="width: 100%">
-			<el-table-column prop="time" label="捐献时间" width="154" align="center"></el-table-column>
-			<el-table-column prop="donate_er" label="捐献者" width="409" align="center"></el-table-column>
-			<el-table-column prop="money" label="捐献金额" width="140" align="center"></el-table-column>
-			<el-table-column prop="intention" label="捐献意向" width="356" align="center"></el-table-column>
-			<el-table-column prop="mark" label="备注" align="center"></el-table-column>
-		</el-table>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="14"></el-pagination>
+		<div class="list-title flex">
+			<div style="width: 154px">捐献时间</div>
+			<div  style="width: 409px">捐献者</div>
+			<div  style="width: 140px">捐献金额</div>
+			<div  style="width: 356px">捐献意向</div>
+			<div  style="width: 133px">备注</div>
+		</div>
+		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
+			<div class="clamp"  style="width: 154px">{{item.time}}</div>
+			<div class="clamp"  style="width: 409px">{{item.donate_er}}</div>
+			<div class="clamp" style="width: 140px">{{item.money}}</div>
+			<div class="clamp" style="width: 356px">{{item.intention}}</div>
+			<div class="clamp" style="width: 133px">{{item.mask}}</div>
+		</div>
+		<div class="table-empty" v-if="tableData.length == 0">
+			暂无更多捐赠数据
+		</div>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="limit"></el-pagination>
 	</div>
 	</div>
 </template>
 </template>
 
 
@@ -82,4 +92,49 @@ export default {
 	right: 0;
 	right: 0;
 	padding-right: 0;
 	padding-right: 0;
 }
 }
+.list-title {
+	// display: flex;
+	text-align: center;
+	border: 2px solid #F2F2F2;
+	line-height: 36px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #D82020;
+	// border-top: none;
+	div {
+		border-right: 2px solid #F2F2F2;
+		&:last-of-type {
+			border-right: none;
+		}
+	}
+	
+}
+.list-item {
+	text-align: center;
+	border: 2px solid #F2F2F2;
+	font-size: 16px;
+	line-height: 36px;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #101010;
+	border-top: none;
+	div {
+		border-right: 2px solid #F2F2F2;
+		&:last-of-type {
+			border-right: none;
+			
+		}
+	}
+}
+.table-empty {
+	// width: 100%;
+	text-align: center;
+	border: 2px solid #F2F2F2;
+	font-size: 16px;
+	line-height: 36px;
+	font-family: PingFang SC;
+	font-weight: bold;
+	border-top: none;
+}
 </style>
 </style>