Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android

zengh

2022-03-07 a37b107842a508885e3b4344f492d62550ade83e

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android

 pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue

@@ -351,7 +351,7 @@
            },
            confirms() {
                let that = this;
                this.popupData["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                this.popupData["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                this.popupData["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                // return;
                uni.request({
@@ -376,8 +376,8 @@
                        }
                        // that.listData = data;
                        // that.getGrabOrders(this.);
                        that.current = 0;
                        that.swiperCurrent = 0;
                        that.current = 1;
                        that.swiperCurrent = 1;
                        that.$store.commit("changegotuGrabOrders");

                    },

 pages/grabOrders/grabOrdersZAFFPX/map.vue

@@ -68,6 +68,14 @@
            </view>
            <view class="once">
                <span class="once-left">
                    预计结束
                </span>
                <span class="once-right">
                    {{ourData.endtime}}
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    参培队伍
                </span>
                <span class="once-right">
@@ -215,7 +223,7 @@
                let that = this;
                if (type == "oks") {
                    let dataAppend = that.ourData;
                    dataAppend["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                    dataAppend["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                    dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                    uni.request({
                        url: that.$store.state.piAPI + "taskqd/Graborder",

 pages/grabOrders/grabOrdersZAXC/grabOrders.vue

@@ -377,8 +377,8 @@
                        }
                        // that.listData = data;
                        // that.getGrabOrders(this.);
                        that.current = 0;
                        that.swiperCurrent = 0;
                        that.current = 1;
                        that.swiperCurrent = 1;
                        that.$store.commit("changegotuGrabOrders");

                    },

 pages/grabOrders/grabOrdersZAXC/map.vue

@@ -70,6 +70,14 @@
            </view>
            <view class="once">
                <span class="once-left">
                    预计结束
                </span>
                <span class="once-right">
                    {{ourData.endtime}}
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    人数
                </span>
                <span class="once-right">

 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue

@@ -377,8 +377,8 @@
                        }
                        // that.listData = data;
                        // that.getGrabOrders(this.);
                        that.current = 0;
                        that.swiperCurrent = 0;
                        that.current = 1;
                        that.swiperCurrent = 1;
                        that.$store.commit("changegotuGrabOrders");

                    },

 pages/grabOrders/grabOrdersZAYWXC/map.vue

@@ -68,6 +68,14 @@
            </view>
            <view class="once">
                <span class="once-left">
                    预计结束
                </span>
                <span class="once-right">
                    {{ourData.endtime}}
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    人数
                </span>
                <span class="once-right">