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>
+			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">
+				<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"
@@ -26,13 +28,14 @@
 						</view>
 					</view>
 				</view>
-			<view class="order-view">
 				<!-- 订单推荐吸顶 -->
 				<u-sticky>
 				<view class="sticky">
 					<text>订单推荐</text>
 				</view>
 				</u-sticky>
+				<view class="order-view">
+
 					<!-- 入驻成功之后显示推荐订单列表 -->
 					<view class="order-list-view">
 						<view v-if="status == 7 && orderList.length > 0" class="order-item-view">
@@ -57,7 +60,8 @@
 						</view>
 					</view>
 				</view>
-		</scroll-view>
+			</view>
+		<!-- </scroll-view> -->
 	</view>
 </template>
 
@@ -127,6 +131,8 @@
 				return {
 					'width': '400rpx',
 					'height': '104rpx',
+					'font-size': '32rpx',
+					'font-weight': 'bold'
 				};
 			},
 			msgStyle() {
@@ -227,7 +233,8 @@
 		padding: 0rpx 30rpx 0 30rpx;
 
 		.scroll-view {
-			::-webkit-scrollbar {/*隐藏滚轮*/
+			::-webkit-scrollbar {
+				/*隐藏滚轮*/
 				display: none;
 			}
 		}
@@ -305,8 +312,14 @@
 		color: #8f8f94;
 	}
 
-	.order-view {
-		text-align: center;
+	// .sticky-view {
+	// 	position: sticky;
+	// 	position: -webkit-sticky;
+	// 	top: 0rpx;
+	// 	width: 100%;
+	// 	height: 200rpx;
+	// 	background-color: black;
+	// }
 
 	.sticky {
 		background-color: #F4F5F7;
@@ -319,6 +332,10 @@
 		padding: 46rpx 0 28rpx 0;
 	}
 
+	.order-view {
+		text-align: center;
+
+
 		.order-list-view {
 			background-color: #FFFFFF;
 			border-radius: 12rpx;
@@ -350,7 +367,7 @@
 				.tip-other {
 					font-size: 28rpx;
 					color: #333333;
-					margin-bottom: 50rpx;
+					margin-bottom: 56rpx;
 				}
 			}
 		}