Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

pages.json

@@ -118,8 +118,8 @@
             {
                 "navigationBarTitleText": "会员卡",
                 "navigationBarBackgroundColor": "#171723",
-				"navigationBarTextStyle": "white"
-				
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
             }
             
 
@@ -201,7 +201,7 @@
 			"path": "pages/user/addCar/cailist",
 			"style": {
 				"navigationBarTitleText": "我的车库",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		}
 		

pages/index/vipCard.vue

@@ -312,7 +312,17 @@
 					url: url
 				})
 			}
-		}
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.myOrderCoupon()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		
 	}
 </script>
 

pages/user/addCar/cailist.vue

@@ -107,14 +107,25 @@
 			},
 			
 			
-		}
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.getqueryMyBMemberCar()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		
 	}
 </script>
 
 <style scoped>
 	.box {
 		min-height: 100vh;
-		background: #F4F5F7;
+		background: #F4F5F7;
+		padding-bottom: 120rpx;
 	}
 
 	.nodataImg {

pages/user/user.vue

@@ -164,14 +164,15 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
-			<view class="rowBox" @click="gonavigateTo('')">
+
+			<!-- 先隐藏 -->
+			<!-- <view class="rowBox" @click="gonavigateTo('')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me8.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">清除缓存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view>
+			</view> -->
 
 		</view>