1.样式

pages.json

@@ -3,7 +3,8 @@
 		{
 			"path": "pages/homePage/homePage",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 
 		},

pages/homePage/allDiscountCard.vue

@@ -19,14 +19,17 @@
 							</view>
 
 							<view class="rightView">
-								<view class="cardName">{{item.ActName}}</view>
+								<view class="firstView">
+									<view class="cardName">{{item.ActName}}</view>
+									<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取</view>
+								</view>
 								<!-- 时间截取 -->
 								<view class="valid" v-if="item.EndOffsetDays == -1">
 									{{item.StartTime.slice(0,item.StartTime.length-8)}}至
 									{{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
 								<view class="valid" v-else>领取后 {{item.EndOffsetDays}} 天有效</view>
 							</view>
-							<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取</view>
+							
 
 						</view>
 
@@ -190,13 +193,14 @@
 	.content {
 		background: #F4F5F7;
 		min-height: 100vh;
-		margin-bottom: 120rpx;
+		padding-bottom: 120rpx;
 	}
 
 
 
 	.itemContent {
-		padding: 20rpx 24rpx;
+		padding: 20rpx 24rpx;
+		
 	}
 
 	.item {
@@ -224,13 +228,16 @@
 		align-items: center;
 	}
 
-	.leftView,
-	.rightView {
+	.leftView {
 		margin-right: 40rpx;
 
 	}
 	.rightView{
 		flex-grow: 1;
+	}
+	.firstView{
+		display: flex;
+		justify-content: space-between;
 	}
 	.moneyView {
 		display: flex;
@@ -253,7 +260,10 @@
 		font-weight: bold;
 		color: #333333;
 		margin-top: 10rpx;
-		margin-bottom: 15rpx;
+		margin-bottom: 15rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 
 	.valid {

pages/homePage/homePage.vue

@@ -460,7 +460,14 @@
 
 
 		},
-
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onReachBottom() {
 			this.page++;
 			this.getItemData()
@@ -618,7 +625,7 @@
 		margin: 20rpx 24rpx 0;
 		background: #FFFFFF;
 		border-radius: 10rpx;
-		padding: 24rpx 0;
+		padding-bottom: 30rpx;
 		display: flex;
 		align-content: flex-start;
 		flex-wrap: wrap;
@@ -746,8 +753,8 @@
 		display: flex;
 		justify-content: flex-start;
 		
-		padding-top: 30rpx;
-		padding-bottom: 24rpx;
+		padding-top: 20rpx;
+		
 		flex-wrap: wrap;
 	}
 
@@ -766,13 +773,12 @@
 		padding: 20rpx;
 		background-color: #F4F5F7;
 
-		padding-bottom: 20rpx;
+		margin-top: 20rpx;
 	}
 
 	.shopMes {
 		display: flex;
-		padding-bottom: 20rpx;
-
+		
 	}
 
 	.shopName {