From 59cc8145e83e465fc208f927ffd019d779fabaee Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 07 Mar 2022 16:28:38 +0800
Subject: [PATCH] +
---
pages/grabOrders/grabOrdersZAXC/feedback.vue | 4 ++--
pages/grabOrders/grabOrdersZAXC/map.vue | 2 +-
pages/grabOrders/grabOrdersZAFFPX/feedback.vue | 4 ++--
pages/grabOrders/grabOrdersZAXC/grabOrders.vue | 9 ++++++---
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue | 16 +++++++++-------
pages/grabOrders/grabOrdersZAYWXC/feedback.vue | 4 ++--
pages/grabOrders/grabOrdersZAYWXC/map.vue | 2 +-
pages/grabOrders/grabOrdersZAFFPX/map.vue | 2 +-
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue | 9 ++++++---
9 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/pages/grabOrders/grabOrdersZAFFPX/feedback.vue b/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
index 7957dd8..324ac07 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
@@ -67,7 +67,7 @@
onBackPress(e) {
console.log("监听返回按钮事件1", e);
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?detailData=0"
+ url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?in=1"
})
// 此处一定姚要return为true，否则页面不会返回到指定路径
return true;
@@ -148,7 +148,7 @@
clearTimeout(time);
time = null;
uni.redirectTo({
- url: './grabOrders?from="feedback"'
+ url: './grabOrders?from=feedback&in=2'
});
}, 1000)
}
diff --git a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
index 29f8c6c..4ae19cd 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -11,10 +11,10 @@
<swiper-item v-for="(item, index) in list" :key="index" :style="{ height: useHeight, width: '100%' }">
<view class="swiper-item">
<scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
- <page0 :listData="rightdata" :swiperCurrent="1" v-if="item.name == '正在进行'" @openOnce="openOnce"
+ <page0 :listData="rightdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
@getOrders="getOrders">
</page0>
- <page1 :listData="leftdata" :swiperCurrent="0" v-if="item.name == '可参与'" @openOnce="openOnce"
+ <page1 :listData="leftdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
@getOrders="getOrders">
</page1>
<page2 :listData="overdata" :swiperCurrent="2" v-if="item.name == '已完成'" @openOnce="openOnce"
@@ -108,9 +108,12 @@
this.current = 1;
this.swiperCurrent = 1;
}
- if (options.in) {
- this.current = 0;
- this.swiperCurrent = 0;
+ if (options.in == 1) {
+ this.current = 1;
+ this.swiperCurrent = 1;
+ } else if (options.in == 2) {
+ this.current = 2;
+ this.swiperCurrent = 2;
}
this.getGrabOrders(this.current);
@@ -339,7 +342,7 @@
// url: "./feedback"
});
}
- } else { //可参与
+ } else if (val == 1) { //可参与
//接单
this.appdetitle = "是否参与任务：" + item.rname;
this.showPopup = true;
@@ -350,7 +353,6 @@
let that = this;
this.popupData["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
this.popupData["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
- // console.log(item)
// return;
uni.request({
url: this.$store.state.piAPI + "taskqd/Graborder",
diff --git a/pages/grabOrders/grabOrdersZAFFPX/map.vue b/pages/grabOrders/grabOrdersZAFFPX/map.vue
index 5d3d8d2..669d946 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/map.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -273,7 +273,7 @@
});
setTimeout(function() {
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?in=true"
+ url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?in=1"
})
}, 2200)
}
diff --git a/pages/grabOrders/grabOrdersZAXC/feedback.vue b/pages/grabOrders/grabOrdersZAXC/feedback.vue
index 9865c28..a1c0776 100644
--- a/pages/grabOrders/grabOrdersZAXC/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAXC/feedback.vue
@@ -67,7 +67,7 @@
onBackPress(e) {
console.log("监听返回按钮事件1", e);
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?detailData=0"
+ url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=1"
})
// 此处一定姚要return为true，否则页面不会返回到指定路径
return true;
@@ -148,7 +148,7 @@
clearTimeout(time);
time = null;
uni.redirectTo({
- url: './grabOrders?from="feedback"'
+ url: './grabOrders?from=feedback&in=2'
});
}, 1000)
}
diff --git a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
index 94c92d6..089e6cd 100644
--- a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -108,9 +108,12 @@
this.current = 1;
this.swiperCurrent = 1;
}
- if (options.in) {
- this.current = 0;
- this.swiperCurrent = 0;
+ if (options.in == 1) {
+ this.current = 1;
+ this.swiperCurrent = 1;
+ } else if (options.in == 2) {
+ this.current = 2;
+ this.swiperCurrent = 2;
}
this.getGrabOrders(this.current);
diff --git a/pages/grabOrders/grabOrdersZAXC/map.vue b/pages/grabOrders/grabOrdersZAXC/map.vue
index 01fe50c..5426e4d 100644
--- a/pages/grabOrders/grabOrdersZAXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAXC/map.vue
@@ -315,7 +315,7 @@
});
setTimeout(function() {
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=true"
+ url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=1"
})
}, 2200)
}
diff --git a/pages/grabOrders/grabOrdersZAYWXC/feedback.vue b/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
index be16e46..f7e9109 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
@@ -67,7 +67,7 @@
onBackPress(e) {
console.log("监听返回按钮事件1", e);
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?detailData=0"
+ url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=1"
})
// 此处一定姚要return为true，否则页面不会返回到指定路径
return true;
@@ -148,7 +148,7 @@
clearTimeout(time);
time = null;
uni.redirectTo({
- url: './grabOrders?from="feedback"'
+ url: './grabOrders?from=feedback&in=2'
});
}, 1000)
}
diff --git a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
index de4eb91..bef65ad 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -108,9 +108,12 @@
this.current = 1;
this.swiperCurrent = 1;
}
- if (options.in) {
- this.current = 0;
- this.swiperCurrent = 0;
+ if (options.in == 1) {
+ this.current = 1;
+ this.swiperCurrent = 1;
+ } else if (options.in == 2) {
+ this.current = 2;
+ this.swiperCurrent = 2;
}
this.getGrabOrders(this.current);
diff --git a/pages/grabOrders/grabOrdersZAYWXC/map.vue b/pages/grabOrders/grabOrdersZAYWXC/map.vue
index 62a156e..4b25943 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -312,7 +312,7 @@
});
setTimeout(function() {
uni.redirectTo({
- url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=true"
+ url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=1"
})
}, 2200)
}
--
Gitblit v1.9.3