新增综合收银台

pages/user/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="content">
 		<!-- 临时 style="padding-top: 22%;" -->
-		<view class="userTop" :class="{active : !userLogin}">
+		<view class="userTop" >
+			<!-- :class="{active : !userLogin}" -->
 			<img class="userTop-back" src="https://douhuo-storage.oss-cn-beijing.aliyuncs.com/images/2023/06/06/04e656417170e100efdd3443b0b8a6c8.png">
 			<view class="userTop-cont">
 				<view class="userTop-height" v-if="userLogin">
@@ -86,7 +87,6 @@
 				</view>
 			</view>
 		</view>
-		
 		<!-- 临时 style="display: none;" -->
 		<view class="board" v-if="userLogin">
 			<view class="board-title">
@@ -179,7 +179,7 @@
 	export default {
 		data() {
 			return {
-	            userLogin    : '',     //登录状态
+	            userLogin    : false,     //登录状态
 				userData	 : {},     //用户数据
 				synthesisAll : '',     // 综法数量
 				listArr	     : [],     // 文章列表
@@ -188,10 +188,9 @@
 			};
 		},
 		
-		onShow() {
+		onShow() {
 		    if(this.$store.getters.getToken) {
 		        this.userLogin = true
-				
 				// 获取用户信息
 				this.userInfo();
 				
@@ -260,12 +259,10 @@
 	.userTop {
 		position: relative;
 		width: 100%;
-		height: 620rpx;
 		&.active {
 			padding-top: 22%;
 		}
-		.userTop-back,
-		.userTop-cont {
+		.userTop-back{
 			position: absolute;
 			left: 0;
 			top: 0;
@@ -298,7 +295,9 @@
 					float: left;
 					margin-left: 30rpx;
 					padding-top: $padding - 20;
-					box-sizing: border-box;
+					box-sizing: border-box;
+					position: relative;
+					z-index: 1;
 					.userTop-login {
 						line-height: 90rpx;
 						font-weight: 600;
@@ -332,14 +331,15 @@
 				}
 			}
 			.userTop-see {
-				margin: $margin -15rpx;
+				margin: 0 -10rpx;
+				padding-top: 20rpx;
 				flex-wrap: wrap;
 				justify-content: flex-start;
 				.userTop-label {
 					display: inline-block;
 					background-color: #ffffff;
 					border-radius: $radius-lg;
-					margin: 10rpx;
+					margin: 10rpx 10rpx 0;
 					width: calc(50% - 20rpx);
 					padding: $padding - 10 $padding - 10 $padding - 5;
 					box-sizing: border-box;