首页

src/pages.json

@@ -7,7 +7,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"disableScroll": true
 			}
 		},
 		{

src/pages/index/index.vue

 <template>
 	<view class="content">
-		<scroll-view scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom" @scroll="handleScroll"
-			refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh" scroll-anchoring
-			@refresherrestore="onRestore" @refresherpulling="triggered = true">
-			<u-swiper :height="250" :list="list" :indicator-pos="indicatorPos" :mode="mode" :interval="3000"
+		<scroll-view class="scroll-view" scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom"
+			@scroll="handleScroll" refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh"
+			scroll-anchoring @refresherrestore="onRestore" @refresherpulling="triggered = true" :show-scrollbar="false"
+			enable-back-to-top>
+			<!-- <view class="title-view">充电桩自营平台</view> -->
+			<u-navbar :is-back="false" background="{background: transparent}" :border-bottom="false" :is-fixed="false">
+				<text class="title-view">充电桩自营平台</text>
+			</u-navbar>
+			<u-swiper :height="240" :list="list" :indicator-pos="indicatorPos" :mode="mode" :interval="3000"
 				@click="clickSwiper">
 			</u-swiper>
 			<view class="msg-view">
-				<text class="msg-title">最新消息</text>
-				<u-cell-group>
-					<u-cell-item class="msg-content" v-for="(item, index) in messageList" :key="index"
-						:title="item.message">
-						<image class="msg-icon" slot="icon"></image>
-					</u-cell-item>
-				</u-cell-group>
+				<view class="msg-title">最新消息</view>
+				<view class="msg-list-view">
+					<view class="msg-content" v-for="(item, index) in messageList" :key="index">
+						<view class="msg-content-view">
+							<view class="left-view">
+								<image class="msg-icon"></image>
+								<text>{{item.body}}</text>
+							</view>
+							<image class="right-icon"></image>
+						</view>
+						<view class="line-view" v-if="messageList.length > index + 1"></view>
+					</view>
+				</view>
 			</view>
 			<view class="order-view">
 				<!-- 订单推荐吸顶 -->
@@ -23,25 +34,29 @@
 					</view>
 				</u-sticky>
 				<!-- 入驻成功之后显示推荐订单列表 -->
-				<view v-if="status == 7 && orderList.length > 0">
+				<view class="order-list-view">
+					<view v-if="status == 7 && orderList.length > 0" class="order-item-view">
 						<view v-for="(item, index) in orderList" :key="index">
 							<OrderCell :orderData="item"> </OrderCell>
 						</view>
 						<u-loadmore :status="currentLoadStatus" bgColor="#f2f2f2"></u-loadmore>
 					</view>
 					<!-- 入驻成功之后无推荐订单 -->
-				<view v-else-if="status == 7 && orderList.length <= 0">
+					<view v-else-if="status == 7 && orderList.length <= 0" class="no-order-view">
 						暂无订单
 					</view>
 					<!-- 入驻前-->
-				<view v-else-if="loaded">
-					<text class="title">当前订单{{ count }}笔\n入驻通过后，平台将向您推荐订单</text>
+					<view v-else-if="loaded" class="tip-view">
+						<view class="tip-title">当前订单（笔）</view>
+						<view class="tip-count">{{ count }}</view>
+						<view class="tip-other">入驻通过后平台将向您推荐订单</view>
 						<u-button class="settle-button" type="primary" shape="circle" @click="immediatelyIn"
 							:custom-style="buttonStyle">
 							立即入驻
 						</u-button>
 					</view>
 				</view>
+			</view>
 		</scroll-view>
 	</view>
 </template>
@@ -110,7 +125,8 @@
 		computed: {
 			buttonStyle() {
 				return {
-					width: "300rpx",
+					'width': '400rpx',
+					'height': '104rpx',
 				};
 			},
 			msgStyle() {
@@ -206,20 +222,68 @@
 
 <style lang="scss" scoped>
 	.content {
-		height: 100%;
-		padding: 30rpx;
+		height: 100vh;
+		background-color: #F4F5F7;
+		padding: 0rpx 30rpx 0 30rpx;
+
+		.scroll-view {
+			::-webkit-scrollbar {/*隐藏滚轮*/
+				display: none;
+			}
+		}
+
+		.title-view {
+			color: #333333;
+			font-weight: bold;
+			font-size: 40rpx;
+		}
 
 		.msg-view {
 			.msg-title {
 				color: #333333;
 				font-size: 32rpx;
 				font-weight: bold;
+				padding: 50rpx 0rpx 30rpx 0rpx;
+			}
+
+			.msg-list-view {
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+				padding: 6rpx 30rpx;
 			}
 
 			.msg-content {
 				color: #333333;
 				font-size: 26rpx;
-				.mas-icon {}
+
+				.msg-content-view {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					margin-bottom: 20rpx;
+
+					.left-view {
+						display: flex;
+						align-items: center;
+
+						.msg-icon {
+							width: 80rpx;
+							height: 36rpx;
+						}
+					}
+
+					.right-icon {
+						width: 14rpx;
+						height: 24px;
+					}
+
+				}
+
+				.line-view {
+					height: 2rpx;
+					background-color: #F4F5F7;
+				}
 			}
 
 		}
@@ -241,15 +305,54 @@
 		color: #8f8f94;
 	}
 
+	.order-view {
+		text-align: center;
+
 		.sticky {
-		height: 120 rpx;
-		background-color: #2979ff;
+			background-color: #F4F5F7;
 			color: #fff;
 			padding: 24 rpx;
 			text-align: left;
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+			padding: 46rpx 0 28rpx 0;
 		}
 
-	.order-view {
-		text-align: center;
+		.order-list-view {
+			background-color: #FFFFFF;
+			border-radius: 12rpx;
+			min-height: 460rpx;
+			padding: 30rpx;
+			margin-bottom: 30rpx;
+
+			.order-item-view {}
+
+			.no-order-view {}
+
+			.tip-view {
+
+				.tip-title {
+					font-size: 32rpx;
+					font-weight: bold;
+					color: #333333;
+					margin-top: 30rpx;
+				}
+
+				.tip-count {
+					color: #2272FF;
+					font-size: 70rpx;
+					font-weight: bold;
+					margin-top: 50rpx;
+					margin-bottom: 20rpx;
+				}
+
+				.tip-other {
+					font-size: 28rpx;
+					color: #333333;
+					margin-bottom: 50rpx;
+				}
+			}
+		}
 	}
 </style>

src/pages/settle/prompt.vue

@@ -127,7 +127,6 @@
 				}
 				let settledInfo = await app.getBaseInfo(this, callBack)
 				this.settledInfo = settledInfo
-				this.settledInfo.record.status = 8
 				this.status = settledInfo.record.status
 				uni.hideLoading()
 				this.initInfo(settledInfo.record)