Browse Source

样式更改

chenrui 4 years ago
parent
commit
406e64b2da

+ 1 - 1
pages/shopTourRecord/screenModule.vue

@@ -205,7 +205,7 @@
 
 <style lang="scss">
 	.uDropdown-wrap{
-		height: 100vh;
+		height: 100%;
 		// 筛选条件
 		.uDropdown{
 			background-color: #fff;

+ 23 - 39
pages/shopTourRecord/shopTourRecord.vue

@@ -1,17 +1,14 @@
 <template>
 	<view class="shopTourRecord-wrap">
-		<u-sticky offset-top="0" z-index="4" bg-color="#f8f8f8">
-			<screenModule class="screenModule" :defaultParams="searchForm" @refresh="refresh" />
-		</u-sticky>
+		<!-- 筛选条件 -->
+		<screenModule class="screenModule" :defaultParams="searchForm" @refresh="refresh" />
 		<!-- 列表数据 -->
 		<view class="list-con">
-			<scroll-view scroll-y class="scroll-con" @scrolltolower="onreachBottom">
-				<view class="record-con">
-					<u-sticky offset-top="80" z-index="3">
-						<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
-							<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
-						</view>
-					</u-sticky>
+			<view class="record-con">
+				<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
+					<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
+				</view>
+				<scroll-view scroll-y class="record-con-c" @scrolltolower="onreachBottom">
 					<view class="record-item" v-for="(item,index) in list" :key="index" @click="getDetails(item)">
 						<view class="item-head">
 							<text class="item-c-tit">{{item.storeName}}</text>
@@ -48,10 +45,10 @@
 							</u-grid-item>
 						</u-grid>
 					</view>
-				</view>
-				<u-empty :text="noDataText" img-width="120" :margin-top="400" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
-				<view style="padding: 20upx;"><u-loadmore v-if="total > pageSize || status == 'loading'" :status="status" /></view>
-			</scroll-view>
+					<u-empty :text="noDataText" img-width="120" :margin-top="400" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
+					<view style="padding: 20upx;"><u-loadmore v-if="total > pageSize || status == 'loading'" :status="status" /></view>
+				</scroll-view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -80,7 +77,6 @@
 			}
 		},
 		onLoad() {
-			// console.log(this.$store.state.vuex_userData)
 			this.range = [ this.get7day(-6), this.get7day(0) ]
 			this.searchForm.creatTime = [ this.get7day(-6), this.get7day(0) ]
 			this.pageInit(1)
@@ -208,30 +204,21 @@
 		height: calc(100vh - 44px);
 	}
 	.shopTourRecord-wrap{
-		position: relative;
 		// 列表数据
 		.list-con{
-			position: absolute;
-			left: 0;
-			top: 80upx;
-			width: 100%;
-			height: 100%;
-			.scroll-con{
-				height: 100%;
-				width: 100%;
-				overflow: auto;
-				// 列表
-				.record-con{
-					.alert-tips{
-						padding: 20upx 30upx 10upx;
-						background-color: #F8F8F8;
-						border-bottom: 1px solid #EEEEEE;
-						text{
-							display: block;
-							font-size: 24upx;
-							padding: 4upx 10upx;
-						}
+			.record-con{
+				.alert-tips{
+					padding: 20upx 30upx 10upx;
+					background-color: #F8F8F8;
+					border-bottom: 1px solid #EEEEEE;
+					text{
+						display: block;
+						font-size: 24upx;
+						padding: 4upx 10upx;
 					}
+				}
+				.record-con-c{
+					height: calc(100vh - 84px);
 					.record-item{
 						background-color: #fff;
 						margin: 20upx 30upx 20upx;
@@ -293,9 +280,6 @@
 						}
 					}
 				}
-				.loadmore{
-					padding: 30upx;
-				}
 			}
 		}
 	}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 3 - 3
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/app-plus/app-view.js


Some files were not shown because too many files changed in this diff