样式逻辑修改

pages.json

@@ -42,7 +42,8 @@
 			"path": "pages/discover/discover",
 			"style": {
 				"navigationBarTitleText": "发现",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

pages/discover/discover.vue

@@ -60,6 +60,20 @@
 		},
 		onLoad() {
 			this.getArticle()
+		},
+		onReachBottom(){
+			if(this.isPage){
+				this.page = this.page + 1;
+				this.getArticle();
+			}
+		},
+		onPullDownRefresh(){
+			this.page = 1;
+			this.isPage = true;
+			this.loadingClass = true;
+			this.loadingText = '正在加载中';
+			this.getArticle();
+			uni.stopPullDownRefresh();
 		}
 	}
 </script>

pages/order/order_details.vue

@@ -100,17 +100,17 @@
 						<lf-price :price="orderDetails.price" />
 					</view>
 					
-					<button class="btn bg-green" v-if="orderDetails.status == 2 || orderDetails.status == 3">
+					<!-- <button class="btn bg-green" v-if="orderDetails.status == 2 || orderDetails.status == 3">
 						<text class="lf-font-32 text-white">立即使用</text>
-					</button>
+					</button> -->
 					
 					<button class="btn bg-green" v-if="orderDetails.status == 0" @click="payAtonce()">
 						<text class="lf-font-32 text-white">立即付款</text>
 					</button>
 					
-					<button class="btn bg-blue" v-if="orderDetails.status == 16">
+					<!-- <button class="btn bg-blue" v-if="orderDetails.status == 16">
 						<text class="lf-font-32 text-white">已使用</text>
-					</button>
+					</button> -->
 					
 					<button class="btn lf-bg-gray" v-if="orderDetails.status == 6">
 						<text class="lf-font-32 text-white">等待审核</text>

pages/recommList/index.vue

@@ -6,7 +6,7 @@
 		<lf-nocontent v-else></lf-nocontent>
 		<swiper :style="{height: 'calc('+ windowHeight +'px - 60rpx)', width: '750rpx'}" :current="current" @change="swiperChange">
 			<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
-				<scroll-view class="com" :scroll-y="true" :refresher-enabled="false" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
+				<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 					<view class="lf-m-t-20"></view>
 					<lf-waterfall :list="tabItem.list" ref="uWaterfall"></lf-waterfall>
 					<view class="loading-more lf-m-b-10">
@@ -117,6 +117,7 @@
 			// scroll-view 下拉刷新
 			onRefresherrefresh(){
 				this.$u.throttle(() => {
+					this.$refs.uWaterfall[this.current].clear();
 					this.tab_list[this.current].isRefresher = true;
 					this.getCategory({type: 'scrollRefresh'});
 				}, 200);

pages/user/user.vue

@@ -69,7 +69,7 @@
 			</view>
 		</view>
 		<!-- 商家工具 -->
-		<view class="shop-list" v-if="userInfo.verifier == 1">
+		<view class="shop-list" v-if="userInfo.is_verify == 1">
 			<view class="lf-row-between">
 				<view class="lf-font-36 lf-font-bold">商家工具</view>
 			</view>
@@ -155,7 +155,7 @@
 						console.log("resuly", result)
 						if(result.errMsg == 'scanCode:ok'){
 							let content = result.result; // 核销码
-							this.$http(this.API.API_CONFIRM_CODE, {id: content}).then(res => {
+							this.$http(this.API.API_CONFIRM_CODE, {verify_code: content}).then(res => {
 								this.$msg('核销成功!');
 							});
 						}