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
@@ -210,11 +209,13 @@
 				let self = this;
 				// 加载订单列表
 				self.search.token = self.vuex_token;
-				self.$u.api.listByRecommendOrder(self.search).then((res) => {
-					uni.stopPullDownRefresh() // 结束下拉刷新
+				self.$u.api.listByRecommendOrder(self.search).then((res) => {
 					self.loadedOrder = true
-					self.triggered = false;
-					self._freshing = false;
+					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
-						self.triggered = false;
-						self._freshing = false;
+							
+						if (self._freshing) {
+							self.triggered = false;
+							self._freshing = false;
+						}
+						
 						if (self.pageNumber == 1) {
 							self.orderList = []
 						}

src/pages/mine/warehouse/express.vue

@@ -6,7 +6,7 @@
 		<view class="content-view">
 			<view class="contacts-view">
 				<view class="contacts-left-view">
-					<image class="image-view" :src="imageUrl"></image>
+					<image class="image-view" :src="imageUrl"></image>
 					<view class="total-view">共{{total}}件</view>
 				</view>
 				<view class="right-view">
@@ -67,7 +67,7 @@
 					'10': '待发货',
 					'15': '代签收',
 					'20': '已签收',
-					'-1': '审核未通过',
+					'-1': '已驳回',
 					'1': '已取消'
 				}
 			},
@@ -77,18 +77,18 @@
 			imageUrl() {
 				let item = this.info.items[0] || {}
 				return item.images ? item.images.split(',').shift() : this.placeholderImage
-			},
-			total() { // 合计
-				var i = 0
-				for (var item of this.info.items) {
-					i += item.quantity
-				}
-			
-				return i
+			},
+			total() { // 合计
+				var i = 0
+				for (var item of this.info.items) {
+					i += item.quantity
+				}
+			
+				return i
 			},
 			titleColor() {
 				switch (String(this.info.status)) {
-					case '-1': // 审核未通过
+					case '-1': // 已驳回
 						return '#FA5A49'
 					case '1': // 已取消
 						return '#666666'
@@ -166,27 +166,27 @@
 				align-items: flex-start;
 				background-color: #FFFFFF;
 				border-radius: 12rpx;
-				.contacts-left-view {
-					position: relative;
-					.image-view {
-						width: 120rpx;
-						height: 120rpx;
-						border-radius: 12rpx;
-						position: relative;
-					}
-					.total-view {
-						position: absolute;
-						height: 32rpx;
-						border-radius: 16rpx;
-						font-size: 20rpx;
-						color: #FFFFFF;
-						background-color: rgba(0, 0, 0, 0.5);
-						bottom: 16rpx;
-						width: 100rpx;
-						text-align: center;
-						margin-left: 10rpx;
-						line-height: 32rpx;
-					}
+				.contacts-left-view {
+					position: relative;
+					.image-view {
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 12rpx;
+						position: relative;
+					}
+					.total-view {
+						position: absolute;
+						height: 32rpx;
+						border-radius: 16rpx;
+						font-size: 20rpx;
+						color: #FFFFFF;
+						background-color: rgba(0, 0, 0, 0.5);
+						bottom: 16rpx;
+						width: 100rpx;
+						text-align: center;
+						margin-left: 10rpx;
+						line-height: 32rpx;
+					}
 				}
 
 				.right-view {
@@ -197,7 +197,7 @@
 
 					.title-view {
 						font-weight: bold;
-						font-size: 32rpx;
+						font-size: 32rpx;
 						margin-bottom: 12rpx;
 					}
 
@@ -314,4 +314,4 @@
 
 		}
 	}
-</style>
+</style>

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''
 			};
@@ -162,9 +161,12 @@
 					param.status = status //不传值  全部；待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
 				}
 				this.$u.api.applyList(param).then((res) => {
-					if (res.code == 200) {
-						this.triggered = false;
-						this._freshing = false;
+					if (res.code == 200) {
+						if (this._freshing) {
+							this.triggered = false;
+							this._freshing = false;
+						}
+						
 						if (this.pageNumber == 1) {
 							this.partsList = []
 						}
@@ -244,9 +246,11 @@
 				this.loadStatus = 'loading'
 				this.getUnstockedList(this.currentTab.status)
 			},
-			reachBottom(e) {
+			reachBottom(e) {
+				console.log('------reachBottom------')
 				if (this.loadStatus != 'loadmore') return
-				this.loadStatus == 'loading'
+				this.loadStatus == 'loading'
+				console.log('------getUnstockedList------')
 				this.getUnstockedList(this.currentTab.status)
 			},
 			scroll() {

src/pages/mine/warehouse/partsDetail.vue

@@ -22,9 +22,9 @@
 				</view>
 			</view>
 			<view class="detail-view">
-				<view class="list-content">
-					<view class="list-item" v-for="(item, index) in info.items" :key="index">
-						<SpareCell :item="item" :noteText="noteText"/>
+				<view class="list-content">
+					<view class="list-item" v-for="(item, index) in info.items" :key="index">
+						<SpareCell :item="item" :noteText="noteText"/>
 					</view>
 				</view>
 				<view class="line-view"></view>
@@ -52,24 +52,24 @@
 			<u-button :custom-style="customStyle" shape="circle" @click="handleClick" type="primary">
 				{{buttonText}}
 			</u-button>
-		</view>
-		<view>
-			<u-toast ref="uToast" />
+		</view>
+		<view>
+			<u-toast ref="uToast" />
 		</view>
 	</view>
 </template>
 
-<script>
+<script>
 	import SpareCell from "@/components/parts/spareCell.vue"
-	export default {
-		components: {
-			SpareCell
+	export default {
+		components: {
+			SpareCell
 		},
 		data() {
 			return {
 				info: {
 					items: [],
-					express: {},
+					express: {},
 					status: '0'
 				},
 				logisticsRecords: [], // 物流
@@ -81,9 +81,9 @@
 					'1': '取消申请',
 					'10': '',
 					'15': '签收',
-					'20': '',
-					'-2': '',
-					'-1': '',
+					'20': '',
+					'-2': '',
+					'-1': '',
 					'100': ''
 				}
 			},
@@ -107,17 +107,17 @@
 				return this.titles[String(this.info.status)] || this.info.statusText
 			},
 			titles() {
-				// 待签收 15；  待发货 10；  待审核 1； 已取消 -1；  已驳回 -2； 已签收 20；已完成 100；已核销 91
-				 // 已核销展示为已签收
-				return {
-					'1': '待审核',
-					'10': '待发货',
-					'15': '待签收',
-					'20': '已签收',
-					'-2': '审核未通过',
-					'-1': '已取消',
-					'100': '已完成',
-					'91': '已签收' // 已核销
+				// 待签收 15；  待发货 10；  待审核 1； 已取消 -1；  已驳回 -2； 已签收 20；已完成 100；已核销 91
+				 // 已核销展示为已签收
+				return {
+					'1': '待审核',
+					'10': '待发货',
+					'15': '待签收',
+					'20': '已签收',
+					'-2': '已驳回',
+					'-1': '已取消',
+					'100': '已完成',
+					'91': '已签收' // 已核销
 				}
 			},
 			total() { // 合计
@@ -130,9 +130,9 @@
 			},
 			placeholderImage() {
 				return process.uniEnv.qn_base_url + 'morentupian.png'
-			},
-			shouhuodizhiImage() {
-				return process.uniEnv.qn_base_url + 'shouhuodizhi.png'
+			},
+			shouhuodizhiImage() {
+				return process.uniEnv.qn_base_url + 'shouhuodizhi.png'
 			},
 			customStyle() {
 				return {
@@ -147,48 +147,50 @@
 				return {
 					'orderNumber': this.info.orderNumber,
 					'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') : '',
+					'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() { // 详情
 				return {
 					'orderNumber': '申请单号：',
 					'createTime': '申请时间：',
-					'deliveryTime': '发货时间：',
-					'applyRemark': '备      注：'
+					'deliveryTime': '发货时间：',
+					'applyRemark': '备      注：',
+					'rejectReason': '驳回原因：'
+				}
+			},
+			operateTypes() {
+				return {
+					'1': 'cancelParts',
+					'10': '',
+					'15': 'receiveParts',
+					'20': '',
+					'-2': '',
+					'-1': '',
+					'100': '',
+					'91': ''
 				}
-			},
-			operateTypes() {
-				return {
-					'1': 'cancelParts',
-					'10': '',
-					'15': 'receiveParts',
-					'20': '',
-					'-2': '',
-					'-1': '',
-					'100': '',
-					'91': ''
-				}
-			},
-			buttonOperateType() {
-				return this.operateTypes[this.info.status]
-			},
-			// 待签收 15 -> 已签收 20； 待审核 1 -> 已取消 -1
-			willStatuses() {
-				return {
-					'1': '-1',
-					'10': '',
-					'15': '20',
-					'20': '',
-					'-2': '',
-					'-1': '',
-					'100': '',
-					'91': ''
-				}
-			},
-			willStatus() {
-				return this.willStatuses[this.info.status]
+			},
+			buttonOperateType() {
+				return this.operateTypes[this.info.status]
+			},
+			// 待签收 15 -> 已签收 20； 待审核 1 -> 已取消 -1
+			willStatuses() {
+				return {
+					'1': '-1',
+					'10': '',
+					'15': '20',
+					'20': '',
+					'-2': '',
+					'-1': '',
+					'100': '',
+					'91': ''
+				}
+			},
+			willStatus() {
+				return this.willStatuses[this.info.status]
 			},
 		},
 		onLoad() {
@@ -196,43 +198,43 @@
 			var pages = getCurrentPages();
 			if (pages.length >= 2) {
 				var page = pages[pages.length - 2];
-				this.info = page.info
+				this.info = page.info
 				this.info.express = this.info.express || {}
 			}
 		},
 		methods: {
 			handleClick() {
-				this.$u.api[this.buttonOperateType](this.info.id).then(res => {
-					var type = 'error'
-					var message = res.message
-					if (res.code == 200) {
-						type = 'success'
-						this.info.status = this.willStatus
-					} else {
-						console.log(res.message)
-					}
-					this.$refs.uToast.show({
-						title: message,
-						type: type,
-						duration: 1500,
-						callback: ()=> {
-							var pages = getCurrentPages();
-							if (pages.length >= 2) {
-								var page = pages[pages.length - 2];
-								page.needApplyList = true
-								uni.navigateBack()
-							}
-						}
-					})
-					
+				this.$u.api[this.buttonOperateType](this.info.id).then(res => {
+					var type = 'error'
+					var message = res.message
+					if (res.code == 200) {
+						type = 'success'
+						this.info.status = this.willStatus
+					} else {
+						console.log(res.message)
+					}
+					this.$refs.uToast.show({
+						title: message,
+						type: type,
+						duration: 1500,
+						callback: ()=> {
+							var pages = getCurrentPages();
+							if (pages.length >= 2) {
+								var page = pages[pages.length - 2];
+								page.needApplyList = true
+								uni.navigateBack()
+							}
+						}
+					})
+					
 				})
 			},
 			// 查看物流
-			handleClickExpress() {
-				var pages = getCurrentPages();
-				if (pages.length >= 1) {
-					var page = pages[pages.length - 1];
-					page.info = this.info
+			handleClickExpress() {
+				var pages = getCurrentPages();
+				if (pages.length >= 1) {
+					var page = pages[pages.length - 1];
+					page.info = this.info
 				}
 				uni.navigateTo({
 					url: 'pages/mine/warehouse/express'
@@ -295,7 +297,7 @@
 
 			.express-view {
 				color: #2272FF;
-				font-size: 26rpx;
+				font-size: 26rpx;
 				margin-bottom: 6rpx;
 			}
 		}
@@ -315,7 +317,7 @@
 
 				.image-view {
 					width: 72rpx;
-					height: 72rpx;
+					height: 72rpx;
 					flex-shrink: 0;
 				}
 
@@ -371,8 +373,8 @@
 						justify-content: space-between;
 						align-items: center;
 
-						.detail-left-view {
-							white-space:pre;
+						.detail-left-view {
+							white-space:pre;
 						}
 
 						.copy-view {
@@ -403,4 +405,4 @@
 
 		}
 	}
-</style>
+</style>

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"
           }