bug修复

src/components/parts/appliedPartsCell.vue

@@ -122,7 +122,7 @@
 					'10': '待发货',
 					'15': '待签收',
 					'20': '已签收',
-					'-2': '审核未通过',
+					'-2': '已驳回',
 					'-1': '已取消',
 					'100': '已完成',
 					'91': '已签收' // 已核销
@@ -130,7 +130,7 @@
 			},
 			titleColor() {
 				switch (String(this.info.status)) {
-					case '-2': // 审核未通过
+					case '-2': // 已驳回
 						return '#FA5A49'
 					case '-1': // 已取消
 						return '#333333'

src/pages/index/index.vue

@@ -3,7 +3,7 @@
 		<view class="content-view">
 	<scroll-view style="height: 100%;" scroll-y @scrolltolower="reachBottom" :scroll-top="scrollTop" @scroll="scroll"
 		scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
-				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh" 
+				refresher-background="#F4F5F7" @refresherrefresh="onRefresh" 
 				@refresherrestore="onRestore" enable-back-to-top>
 		<image class="banner-image" :src="bannerImage" @click="handleClickBanner"></image>
 
@@ -95,8 +95,7 @@
 					pageSize: 100,
 				},
 				waitInit: false, // 当token为空时，等待自动登录结束
-				triggered: false,
-				_freshing: false,
+				triggered: true,
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
@@ -211,10 +210,12 @@
 				// 加载订单列表
 				self.search.token = self.vuex_token;
 				self.$u.api.listByRecommendOrder(self.search).then((res) => {
-					uni.stopPullDownRefresh() // 结束下拉刷新
 					self.loadedOrder = true
+					if (self._freshing) {
 						self.triggered = false;
 						self._freshing = false;
+					}
+					
 					if (res.code == 200 && res.data) {
 						if (self.search.pageNumber == 1) {
 							self.orderList = []
@@ -245,8 +246,8 @@
 				}
 			},
 			onRefresh() {
-				if (this._freshing) return;
-				this._freshing = true;
+				if (this._freshing) return
+				this._freshing = true
 				this.initSettleInfo()
 			},
 			onRestore() {

src/pages/index/order.vue

@@ -21,7 +21,7 @@
 		<view class="tab-view">
 			<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
 				refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" :scroll-top="scrollTop"
-				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
+				refresher-background="#F4F5F7" @refresherrefresh="onRefresh"
 				@refresherrestore="onRestore" @scroll="scroll" enable-back-to-top>
 				<view class="loading-view" v-if="!loaded">
 					<u-loading mode="flower"></u-loading>
@@ -84,8 +84,7 @@
 				loadStatus: 'loading',
 				dataValue: [],
 				loaded: false,
-				triggered: false,
-				_freshing: false,
+				triggered: true,
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
@@ -181,8 +180,12 @@
 				self.$u.api.listOrder(param).then((res) => {
 					if (res.code == 200) {
 						if (res.data.type != self.orderType) return
+							
+						if (self._freshing) {
 							self.triggered = false;
 							self._freshing = false;
+						}
+						
 						if (self.pageNumber == 1) {
 							self.orderList = []
 						}

src/pages/mine/warehouse/express.vue

@@ -67,7 +67,7 @@
 					'10': '待发货',
 					'15': '代签收',
 					'20': '已签收',
-					'-1': '审核未通过',
+					'-1': '已驳回',
 					'1': '已取消'
 				}
 			},
@@ -88,7 +88,7 @@
 			},
 			titleColor() {
 				switch (String(this.info.status)) {
-					case '-1': // 审核未通过
+					case '-1': // 已驳回
 						return '#FA5A49'
 					case '1': // 已取消
 						return '#666666'

src/pages/mine/warehouse/index.vue

@@ -17,7 +17,7 @@
 		<view class="tab-view">
 			<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
 				refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll"
-				:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
+				:scroll-top="scrollTop" refresher-background="#F4F5F7"
 				@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
 				<view class="loading-view" v-if="!loaded">
 					<u-loading mode="flower"></u-loading>
@@ -62,8 +62,7 @@
 				currentIndex: 0,
 				loadStatus: 'loading',
 				loaded: false,
-				triggered: false,
-				_freshing: false,
+				triggered: true,
 				selectedAll: false,
 				buttonType: 'expand' // 申请按钮宽 collapse': '80rpx', 'expand': '220rpx''
 			};
@@ -163,8 +162,11 @@
 				}
 				this.$u.api.applyList(param).then((res) => {
 					if (res.code == 200) {
+						if (this._freshing) {
 							this.triggered = false;
 							this._freshing = false;
+						}
+						
 						if (this.pageNumber == 1) {
 							this.partsList = []
 						}
@@ -245,8 +247,10 @@
 				this.getUnstockedList(this.currentTab.status)
 			},
 			reachBottom(e) {
+				console.log('------reachBottom------')
 				if (this.loadStatus != 'loadmore') return
 				this.loadStatus == 'loading'
+				console.log('------getUnstockedList------')
 				this.getUnstockedList(this.currentTab.status)
 			},
 			scroll() {

src/pages/mine/warehouse/partsDetail.vue

@@ -114,7 +114,7 @@
 					'10': '待发货',
 					'15': '待签收',
 					'20': '已签收',
-					'-2': '审核未通过',
+					'-2': '已驳回',
 					'-1': '已取消',
 					'100': '已完成',
 					'91': '已签收' // 已核销
@@ -149,6 +149,7 @@
 					'createTime': this.info.createTime ? this.$u.timeFormat(this.info.createTime, 'yyyy.mm.dd hh:MM:ss') : '',
 					'deliveryTime': this.info.express.deliveryTime ? this.$u.timeFormat(this.info.express.deliveryTime, 'yyyy.mm.dd hh:MM:ss') : '',
 					'applyRemark': this.info.applyRemark || '',
+					'rejectReason': this.info.rejectReason || ''
 				}
 			},
 			detailKey() { // 详情
@@ -156,7 +157,8 @@
 					'orderNumber': '申请单号：',
 					'createTime': '申请时间：',
 					'deliveryTime': '发货时间：',
-					'applyRemark': '备      注：'
+					'applyRemark': '备      注：',
+					'rejectReason': '驳回原因：'
 				}
 			},
 			operateTypes() {

src/pages/parts/addParts.vue

@@ -212,7 +212,7 @@ export default {
             })
             this.lists = this.lists.concat(lists)
             this.pageNumber++
-            this.loadStatus = "loadmore"
+            this.loadStatus = lists.length < this.pageNumber ? "nomore" : "loadmore"
           } else {
             this.loadStatus = "nomore"
           }