工单搜索问题修复

工单拒单问题修复

src/common/api/order.js

@@ -162,7 +162,7 @@ let orderApiFun = function(vm){
 	// 获取我的钱包-支付单一览
 	let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType);
 	// 获取我的钱包-师傅提现
-	let workerApplyPay = async (payableId) => await vm.$u.post(`/wxh-worker-rest/rest/${vm.vuex_token}/applypay/${payableId}/workerApplyPay`, {}, dataType);
+	let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay');
 
 	const orderApi = {
 		listByRecommendOrder,

src/pages/login/index.vue

@@ -67,7 +67,6 @@ export default {
 	methods: {
 		// 微信授权用户信息
 		getUserProfile() {
-			debugger
 			var that = this
 			if(uni.getUserProfile) {
 				// 每次触发 uni.getUserProfile 均会弹出授权窗口，用户授权后可成功获取用户信息

src/pages/mine/wallet/withdraw.vue

@@ -21,7 +21,6 @@
 		data() {
 			return {
 				amount: 0,
-				payableId: 0,
 			}
 		},
 		computed: {
@@ -40,13 +39,14 @@
 		methods: {
 			async handleClick() {
 				let self = this
-				self.payableId = 666
-				let res = await self.$u.api.workerApplyPay(self.payableId)
+				if(self.amount) {
+					let res = await self.$u.api.workerApplyPay()
 					if(res && res.code == 200) {
-					self.$u.ruote({type: 'redirect', url: 'pages/wallet/index'})
+						self.$u.route({type: 'redirect', url: 'pages/mine/wallet/index'})
 					} else {
 						self.$u.toast(res.message || '系统异常，提现失败！');
 					}
+				}
 			},
 			async loadAssets() {
 				let self = this

src/pages/order/detail.vue

@@ -682,6 +682,7 @@
 					if (res.code === 200 ) {
 						if( res.data && res.data.rejectable){
 							this.$u.route({
+								type: 'redirect',
 								url: 'pages/order/refuse',
 								params: {
 									orderId: this.order.orderId,

src/pages/order/refuse.vue

@@ -116,9 +116,8 @@
 				let res = await self.$u.api.rejectOrder(self.formData, self.orderId)
 				self.submiting = false
 				if(res && res.code == 200) {
-					uni.showToast({
-						title: res.message || res.data || '拒单成功',
-					})
+					self.$u.toast({title: res.message || res.data || '拒单成功'})
+					self.$u.route({type: 'reLaunch', url: 'pages/index/index'})
 				}
 			},
 		}

src/pages/order/search.vue

@@ -61,11 +61,20 @@
 				},
 				orderList: [],
 				loaded: false,
+				total: 10,
+				loadStaus: 'loadmore',
 			};
 		},
 		onLoad() {
 			// this.searchOrder()
 		},
+		onReachBottom() {
+			let len = this.orderList && this.orderList.length || 0
+			if(!this.loaded || len >= this.total) return;
+			this.loadStaus = 'loading';
+			this.search.pageNumber = ++ this.search.pageNumber;
+			this.getOrderList('onReachBottom')
+		},
 		computed: {
 			searchEmpty() {
 				return process.uniEnv.qn_base_url + 'SearchEmpty.png'
@@ -73,23 +82,29 @@
 		},
 		methods: {
 			searchOrder(index) {
-				this.search.pageNumber = 0
+				this.search.pageNumber = 1
+				this.loadStaus = 'loading';
 				this.getOrderList()
 			},
 			// 页面数据
-			getOrderList() {
+			getOrderList(event) {
 				let self = this;
 				if(!self.search.keyword) {
 					return false
 				}
 				
 				// 状态处理
-				self.search.pageNumber += 1
 				self.loaded = false
 				self.$u.api.listOrder(self.search).then((res) => {
 					if (res.code == 200) {
 						if (res.data) {
-							self.orderList = res.data.list || []
+							let list = res.data.list || []
+							self.total = res.data.total || 0
+							if(event == 'onReachBottom') {
+								self.orderList.push(...list)
+							} else {
+								self.orderList = list
+							}
 							self.loadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore'
 						}
 					} else {
@@ -97,7 +112,6 @@
 					}
 					self.loaded = true
 				});
-			
 			},
 			viewOderItem(orderId) { // 跳转工单详情页面
 				uni.navigateTo({