阶段性提交

src/router/index.js

@@ -37,12 +37,6 @@ export const constantRoutes = [{
 	},
 
 	{
-		path: '/404',
-		component: () => import('@/views/404'),
-		hidden: true
-	},
-
-	{
 		path: '/',
 		component: Layout,
 		redirect: '/data',
@@ -99,7 +93,13 @@ export const constantRoutes = [{
 			}
 		}]
 	},
-
+	
+	{
+		path: '/404',
+		component: () => import('@/views/404'),
+		hidden: true
+	},
+	
 	// 404页面 必须放在最后!!
 	{
 		path: '*',

src/views/404.vue

@@ -1,228 +1,253 @@
 <template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
-        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
-        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">哎呀！</div>
-        <div class="bullshit__info">版权所有
-          <a style="color:#20a0ff" href="#" target="_blank">新闻</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">请检查您输入的网址是否正确，或点击下面的按钮返回主页。</div>
-        <a href="" class="bullshit__return-home">返回主页</a>
-      </div>
-    </div>
-  </div>
+	<div class="wscn-http404-container">
+		<div class="wscn-http404">
+			<div class="pic-404">
+				<img class="pic-404__parent" src="@/assets/404_images/404.png" alt="404">
+				<img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
+				<img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
+				<img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+			</div>
+			<div class="bullshit">
+				<div class="bullshit__oops">哎呀！</div>
+				<div class="bullshit__info">版权所有
+					<!-- <a style="color:#20a0ff" href="/">请点击...</a> -->
+				</div>
+				<div class="bullshit__headline">{{ message }}</div>
+				<div class="bullshit__info">请检查您输入的网址是否正确，或点击下面的按钮返回主页。</div>
+				<a href="" class="bullshit__return-home">返回主页</a>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-
-export default {
-  name: 'Page404',
-  computed: {
-    message() {
-      return '网站管理员说你不能进入这个页面...'
-    }
-  }
-}
+	export default {
+		name: 'Page404',
+		computed: {
+			message() {
+				return '网站管理员说你不能进入这个页面...'
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.wscn-http404-container{
-  transform: translate(-50%,-50%);
-  position: absolute;
-  top: 40%;
-  left: 50%;
-}
-.wscn-http404 {
-  position: relative;
-  width: 1200px;
-  padding: 0 50px;
-  overflow: hidden;
-  .pic-404 {
-    position: relative;
-    float: left;
-    width: 600px;
-    overflow: hidden;
-    &__parent {
-      width: 100%;
-    }
-    &__child {
-      position: absolute;
-      &.left {
-        width: 80px;
-        top: 17px;
-        left: 220px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      &.mid {
-        width: 46px;
-        top: 10px;
-        left: 420px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1.2s;
-      }
-      &.right {
-        width: 62px;
-        top: 100px;
-        left: 500px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-fill-mode: forwards;
-        animation-delay: 1s;
-      }
-      @keyframes cloudLeft {
-        0% {
-          top: 17px;
-          left: 220px;
-          opacity: 0;
-        }
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudMid {
-        0% {
-          top: 10px;
-          left: 420px;
-          opacity: 0;
-        }
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-      @keyframes cloudRight {
-        0% {
-          top: 100px;
-          left: 500px;
-          opacity: 0;
-        }
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
-        }
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
-        }
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
-        }
-      }
-    }
-  }
-  .bullshit {
-    position: relative;
-    float: left;
-    width: 300px;
-    padding: 30px 0;
-    overflow: hidden;
-    &__oops {
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      margin-bottom: 20px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-    &__headline {
-      font-size: 20px;
-      line-height: 24px;
-      color: #222;
-      font-weight: bold;
-      opacity: 0;
-      margin-bottom: 10px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
-    &__info {
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      margin-bottom: 30px;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
-    &__return-home {
-      display: block;
-      float: left;
-      width: 110px;
-      height: 36px;
-      background: #1482f0;
-      border-radius: 100px;
-      text-align: center;
-      color: #ffffff;
-      opacity: 0;
-      font-size: 14px;
-      line-height: 36px;
-      cursor: pointer;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
-    @keyframes slideUp {
-      0% {
-        transform: translateY(60px);
-        opacity: 0;
-      }
-      100% {
-        transform: translateY(0);
-        opacity: 1;
-      }
-    }
-  }
-}
-</style>
+	.wscn-http404-container {
+		transform: translate(-50%, -50%);
+		position: absolute;
+		top: 40%;
+		left: 50%;
+	}
+
+	.wscn-http404 {
+		position: relative;
+		width: 1200px;
+		padding: 0 50px;
+		overflow: hidden;
+
+		.pic-404 {
+			position: relative;
+			float: left;
+			width: 600px;
+			overflow: hidden;
+
+			&__parent {
+				width: 100%;
+			}
+
+			&__child {
+				position: absolute;
+
+				&.left {
+					width: 80px;
+					top: 17px;
+					left: 220px;
+					opacity: 0;
+					animation-name: cloudLeft;
+					animation-duration: 2s;
+					animation-timing-function: linear;
+					animation-fill-mode: forwards;
+					animation-delay: 1s;
+				}
+
+				&.mid {
+					width: 46px;
+					top: 10px;
+					left: 420px;
+					opacity: 0;
+					animation-name: cloudMid;
+					animation-duration: 2s;
+					animation-timing-function: linear;
+					animation-fill-mode: forwards;
+					animation-delay: 1.2s;
+				}
+
+				&.right {
+					width: 62px;
+					top: 100px;
+					left: 500px;
+					opacity: 0;
+					animation-name: cloudRight;
+					animation-duration: 2s;
+					animation-timing-function: linear;
+					animation-fill-mode: forwards;
+					animation-delay: 1s;
+				}
+
+				@keyframes cloudLeft {
+					0% {
+						top: 17px;
+						left: 220px;
+						opacity: 0;
+					}
+
+					20% {
+						top: 33px;
+						left: 188px;
+						opacity: 1;
+					}
+
+					80% {
+						top: 81px;
+						left: 92px;
+						opacity: 1;
+					}
+
+					100% {
+						top: 97px;
+						left: 60px;
+						opacity: 0;
+					}
+				}
+
+				@keyframes cloudMid {
+					0% {
+						top: 10px;
+						left: 420px;
+						opacity: 0;
+					}
+
+					20% {
+						top: 40px;
+						left: 360px;
+						opacity: 1;
+					}
+
+					70% {
+						top: 130px;
+						left: 180px;
+						opacity: 1;
+					}
+
+					100% {
+						top: 160px;
+						left: 120px;
+						opacity: 0;
+					}
+				}
+
+				@keyframes cloudRight {
+					0% {
+						top: 100px;
+						left: 500px;
+						opacity: 0;
+					}
+
+					20% {
+						top: 120px;
+						left: 460px;
+						opacity: 1;
+					}
+
+					80% {
+						top: 180px;
+						left: 340px;
+						opacity: 1;
+					}
+
+					100% {
+						top: 200px;
+						left: 300px;
+						opacity: 0;
+					}
+				}
+			}
+		}
+
+		.bullshit {
+			position: relative;
+			float: left;
+			width: 380px;
+			padding: 30px 0;
+			overflow: hidden;
+
+			&__oops {
+				font-size: 32px;
+				font-weight: bold;
+				line-height: 40px;
+				color: #1482f0;
+				opacity: 0;
+				margin-bottom: 20px;
+				animation-name: slideUp;
+				animation-duration: 0.5s;
+				animation-fill-mode: forwards;
+			}
+
+			&__headline {
+				font-size: 20px;
+				line-height: 24px;
+				color: #222;
+				font-weight: bold;
+				opacity: 0;
+				margin-bottom: 10px;
+				animation-name: slideUp;
+				animation-duration: 0.5s;
+				animation-delay: 0.1s;
+				animation-fill-mode: forwards;
+			}
+
+			&__info {
+				font-size: 13px;
+				line-height: 21px;
+				color: grey;
+				opacity: 0;
+				margin-bottom: 30px;
+				animation-name: slideUp;
+				animation-duration: 0.5s;
+				animation-delay: 0.2s;
+				animation-fill-mode: forwards;
+			}
+
+			&__return-home {
+				display: block;
+				float: left;
+				width: 110px;
+				height: 36px;
+				background: #1482f0;
+				border-radius: 100px;
+				text-align: center;
+				color: #ffffff;
+				opacity: 0;
+				font-size: 14px;
+				line-height: 36px;
+				cursor: pointer;
+				animation-name: slideUp;
+				animation-duration: 0.5s;
+				animation-delay: 0.3s;
+				animation-fill-mode: forwards;
+			}
+
+			@keyframes slideUp {
+				0% {
+					transform: translateY(60px);
+					opacity: 0;
+				}
+
+				100% {
+					transform: translateY(0);
+					opacity: 1;
+				}
+			}
+		}
+	}
+</style>

src/views/accountMgr/index.vue

@@ -24,7 +24,7 @@
 							:header-cell-style="header_cell_style">
 							<el-table-column label="序号" align="center" width="100">
 								<template slot-scope="scope">
-									<span>{{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}</span>
+									<span>{{ scope.row.xuhao }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="手机号" align="center">
@@ -474,11 +474,8 @@
 						if (temp_data.length > 0) {
 							this.pagination.total = res.data.total;
 							this.tableData = [];
-							for (var i = 0; i < temp_data.length; i++) {
-								this.tableData.push(temp_data[i]);
-							}
 							// 按创建时间排序
-							this.tableData.sort((a, b) => {
+							temp_data.sort((a, b) => {
 								if (a.createDate > b.createDate) {
 									return -1; // 返回负数表示 a 在 b 前面
 								} else if (a.createDate < b.createDate) {
@@ -487,6 +484,10 @@
 									return 0; // 时间相同，按名称字段升序排序
 								}
 							});
+							for (var i = 0; i < temp_data.length; i++) {
+								temp_data[i].xuhao = (this.pagination.currentPage - 1) * this.pagination.pageSize + i + 1
+								this.tableData.push(temp_data[i]);
+							}
 						} else {
 							this.tableData = [];
 							this.$message.warning('没有符合条件的数据！');

src/views/data/index.vue

@@ -365,7 +365,7 @@
 								rark: res.data[i].rank,
 								bookNum: res.data[i].bookNum,
 								hotelName: res.data[i].hotelName,
-								salesAmount: res.data[i].salesAmount
+								salesAmount: res.data[i].salesAmount.toFixed(2)
 							})
 						}
 					} else {

src/views/login/index.vue

@@ -284,8 +284,4 @@
 			padding: 0 0 0 20px;
 		}
 	}
-</style>
-
-<style lang="scss" scoped>
-
 </style>

src/views/residentialhostelMgr/index.vue

@@ -57,7 +57,7 @@
 							</el-table-column>
 							<el-table-column label="序号" align="center" width="100">
 								<template slot-scope="scope">
-									<span>{{ (pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1 }}</span>
+									<span>{{ scope.row.xuhao }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="状态" align="center" width="80">
@@ -1698,6 +1698,7 @@
 						this.pagination.total = res.data.total
 						this.tableData = []
 						for (var i = 0; i < tempData.length; i++) {
+							tempData[i].xuhao = (this.pagination.currentPage - 1) * this.pagination.pageSize + i + 1
 							this.tableData.push(tempData[i])
 						}
 					} else {