+
liuyg
2022-03-07 59cc8145e83e465fc208f927ffd019d779fabaee
+
9 files modified
52 ■■■■■ changed files
pages/grabOrders/grabOrdersZAFFPX/feedback.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue 16 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/feedback.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/grabOrders.vue 9 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/feedback.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue 9 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/map.vue 2 ●●● patch | view | raw | blame | history
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)
                        }
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",
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)
                            }
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)
                        }
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);
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)
                            }
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)
                        }
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);
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)
                            }