Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages.json

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

src/pages/index/index.vue

 <template>
 	<view class="content">
-		<scroll-view class="scroll-view" scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom"
+	<!-- 	<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">
-				<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>
+			enable-back-to-top> -->
+			<view style="width: 700rpx; height: 800rpx;">
+				<!-- <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">
+					<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>
-							<image class="right-icon"></image>
+							<view class="line-view" v-if="messageList.length > index + 1"></view>
 						</view>
-						<view class="line-view" v-if="messageList.length > index + 1"></view>
 					</view>
 				</view>
-			</view>
-			<view class="order-view">
 				<!-- 订单推荐吸顶 -->
 				<u-sticky>
-					<view class="sticky">
-						<text>订单推荐</text>
-					</view>
+				<view class="sticky">
+					<text>订单推荐</text>
+				</view>
 				</u-sticky>
-				<!-- 入驻成功之后显示推荐订单列表 -->
-				<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 class="order-view">
+
+					<!-- 入驻成功之后显示推荐订单列表 -->
+					<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" class="no-order-view">
+							暂无订单
+						</view>
+						<!-- 入驻前-->
+						<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>
-						<u-loadmore :status="currentLoadStatus" bgColor="#f2f2f2"></u-loadmore>
-					</view>
-					<!-- 入驻成功之后无推荐订单 -->
-					<view v-else-if="status == 7 && orderList.length <= 0" class="no-order-view">
-						暂无订单
-					</view>
-					<!-- 入驻前-->
-					<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>
+		<!-- </scroll-view> -->
 	</view>
 </template>
 
@@ -127,6 +131,8 @@
 				return {
 					'width': '400rpx',
 					'height': '104rpx',
+					'font-size': '32rpx',
+					'font-weight': 'bold'
 				};
 			},
 			msgStyle() {
@@ -226,10 +232,11 @@
 		background-color: #F4F5F7;
 		padding: 0rpx 30rpx 0 30rpx;
 
-		.scroll-view {
-			::-webkit-scrollbar {/*隐藏滚轮*/
-				display: none;
-			}
+		.scroll-view {
+			::-webkit-scrollbar {
+				/*隐藏滚轮*/
+				display: none;
+			}
 		}
 
 		.title-view {
@@ -305,19 +312,29 @@
 		color: #8f8f94;
 	}
 
+	// .sticky-view {
+	// 	position: sticky;
+	// 	position: -webkit-sticky;
+	// 	top: 0rpx;
+	// 	width: 100%;
+	// 	height: 200rpx;
+	// 	background-color: black;
+	// }
+
+	.sticky {
+		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;
 
-		.sticky {
-			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-list-view {
 			background-color: #FFFFFF;
@@ -350,7 +367,7 @@
 				.tip-other {
 					font-size: 28rpx;
 					color: #333333;
-					margin-bottom: 50rpx;
+					margin-bottom: 56rpx;
 				}
 			}
 		}