2023-5-19

App.vue

@@ -287,5 +287,6 @@ page {
 	// 设置默认字体
 	font-family: PingFang SC, STHeitiSC-Light, Helvetica-Light, arial, sans-serif, Droid Sans Fallback;
 	min-height: 100%;
+	height: 0;
 }
 </style>

pages/home/order.vue

@@ -127,19 +127,7 @@
 		},
 
 		onLoad(options) {
-			/**
-			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-			 * 替换onLoad下代码即可
-			 */
-			this.tabCurrentIndex = +options.state;
-			// #ifndef MP
 			this.loadData();
-			// #endif
-			// #ifdef MP
-			if (options.state == 0) {
-				this.loadData();
-			}
-			// #endif
 		},
 		// #ifdef APP-PLUS || H5
 		onBackPress(e) {
@@ -328,25 +316,26 @@
 
 <style lang="scss">
 	.content {
-		min-height: 100vh;
-		background: linear-gradient(90deg, #3C82E6, #5395F5);
+		height: 100%;
+		background: linear-gradient(180deg, rgba(#3C82E6,0.3), rgba(#5395F5,0));
 		background-size: 100% 645rpx;
+		background-repeat: no-repeat;
 	}
 
 	.header {
 		padding-top: var(--status-bar-height);
 
 		.title {
-			height: 50rpx;
-			font-size: 36rpx;
-			line-height: 50rpx;
+			height: 50px;
+			font-size: 18px;
+			line-height: 50px;
 			text-align: center;
 			font-weight: bold;
 		}
 	}
 
 	.swiper-box {
-		// height: calc(100% - 40px);
+		height: calc(100% - 90px);
 	}
 
 	.list-scroll-content {
@@ -357,35 +346,28 @@
 	.navbar {
 		display: flex;
 		height: 40px;
-		padding: 0 5px;
-		background: #fff;
+		padding: 6px;
+		background:$bg-gradual;
 		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
 		z-index: 10;
-
+		margin: 0 30rpx;
+		border-radius: 99rpx;
 		.nav-item {
 			flex: 1;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			height: 100%;
+			height: 28px;
 			font-size: 15px;
-			color: $font-color-dark;
+			line-height: 28px;
+			color: #FFF;
 			position: relative;
 
 			&.current {
 				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
+				background-color: #FFF;
+				border-radius: 99rpx;
 			}
 		}
 	}

pages/order/createOrder.vue

@@ -789,7 +789,7 @@
 			height: 100%;
 			color: #fff;
 			font-size: 32rpx;
-			background: $bg-green-gradual;
+			background: $bg-gradual;
 
 			&.submitNo {
 				background-color: $font-color-disabled;
@@ -808,7 +808,7 @@
 		.right {
 			font-size: $font-sm;
 			color: #FFF;
-			background: $bg-green-gradual;
+			background: $bg-gradual;
 			padding: 6rpx;
 			border-radius: 10rpx;
 			line-height: 1;

pages/water/waterDetail.vue

@@ -453,7 +453,7 @@
 			height: 100%;
 			color: #fff;
 			font-size: 32rpx;
-			background: $bg-green-gradual;
+			background: $bg-gradual;
 
 			&.submitNo {
 				background-color: $font-color-disabled;

uni.scss

@@ -44,5 +44,5 @@ $box-shadow: 0rpx 0rpx 10rpx 10rpx #f3f3f3;
 // 圆角
 $border-radius-sm: 15rpx;
 // 渐变背景颜色
-$bg-green-gradual: linear-gradient(90deg, #3C82E6, #5395F5);
+$bg-gradual: linear-gradient(90deg, #3C82E6, #5395F5);
 $base-url:'https://api.myjie.cn';