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

zengh

2022-03-08 3b783544d029bc79207ecce289cfde5b2a92c681

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

 manifest.json

@@ -1,6 +1,6 @@
{
    "name" : "洪城义警",
    "appid" : "__UNI__ECA0186",
    "appid" : "__UNI__7672DEF",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",

 package-lock.json

@@ -1,8 +1,242 @@
{
  "name": "qfqk-android",
  "version": "1.0.0",
  "lockfileVersion": 1,
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "qfqk-android",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
        "@smallwei/avue": "^2.8.14",
        "axios": "^0.21.1",
        "js-md5": "^0.7.3",
        "uni-read-pages": "^1.0.5",
        "uview-ui": "^1.8.4",
        "weex-bindingx": "0.0.49"
      },
      "devDependencies": {}
    },
    "node_modules/@smallwei/avue": {
      "version": "2.8.17",
      "resolved": "https://registry.nlark.com/@smallwei/avue/download/@smallwei/avue-2.8.17.tgz?cache=0&sync_timestamp=1626353632228&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40smallwei%2Favue%2Fdownload%2F%40smallwei%2Favue-2.8.17.tgz",
      "integrity": "sha1-h4o+2Cl0caOqXDBwfWkkynkmrQI=",
      "dependencies": {
        "axios": "^0.21.1",
        "countup.js": "^1.9.3",
        "dayjs": "^1.10.4",
        "deepmerge": "^3.1.0",
        "element-ui": "^2.15.1",
        "nprogress": "^0.2.0",
        "vue": "^2.5.17",
        "vuedraggable": "^2.17.0"
      }
    },
    "node_modules/animation-util": {
      "version": "1.0.11",
      "resolved": "https://registry.nlark.com/animation-util/download/animation-util-1.0.11.tgz",
      "integrity": "sha1-T2SFUT0KAVjl/DatMfGj+7sXEI8=",
      "dependencies": {
        "object-assign": "^4.1.1"
      }
    },
    "node_modules/async-validator": {
      "version": "1.8.5",
      "resolved": "https://registry.nlark.com/async-validator/download/async-validator-1.8.5.tgz",
      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
      "dependencies": {
        "babel-runtime": "6.x"
      }
    },
    "node_modules/axios": {
      "version": "0.21.1",
      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
      "dependencies": {
        "follow-redirects": "^1.10.0"
      }
    },
    "node_modules/babel-helper-vue-jsx-merge-props": {
      "version": "2.0.3",
      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
      "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
    },
    "node_modules/babel-runtime": {
      "version": "6.26.0",
      "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
      "dependencies": {
        "core-js": "^2.4.0",
        "regenerator-runtime": "^0.11.0"
      }
    },
    "node_modules/bindingx-parser": {
      "version": "0.0.3",
      "resolved": "https://registry.nlark.com/bindingx-parser/download/bindingx-parser-0.0.3.tgz",
      "integrity": "sha1-sV6bVhFcOZFGqlbjqW+sNAmCl60="
    },
    "node_modules/bindingx-web-polyfill": {
      "version": "0.1.18",
      "resolved": "https://registry.npm.taobao.org/bindingx-web-polyfill/download/bindingx-web-polyfill-0.1.18.tgz",
      "integrity": "sha1-RTG87woseAcxudCg9lGAcQnygnA=",
      "dependencies": {
        "animation-util": "^1.0.10",
        "object-assign": "^4.1.1",
        "simple-lodash": "^0.0.3"
      }
    },
    "node_modules/bindingx-web-polyfill/node_modules/simple-lodash": {
      "version": "0.0.3",
      "resolved": "https://registry.npm.taobao.org/simple-lodash/download/simple-lodash-0.0.3.tgz",
      "integrity": "sha1-YSrhwF9pCEgdjDQuy+NmPSN5QeA="
    },
    "node_modules/core-js": {
      "version": "2.6.12",
      "resolved": "https://registry.nlark.com/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1624966102256&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz",
      "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=",
      "hasInstallScript": true
    },
    "node_modules/countup.js": {
      "version": "1.9.3",
      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
      "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
    },
    "node_modules/dayjs": {
      "version": "1.10.6",
      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz",
      "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
    },
    "node_modules/deepmerge": {
      "version": "3.3.0",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-3.3.0.tgz",
      "integrity": "sha1-08R/1vOpPVF7FEJrBiihewEl9fc=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/element-ui": {
      "version": "2.15.3",
      "resolved": "https://registry.nlark.com/element-ui/download/element-ui-2.15.3.tgz",
      "integrity": "sha1-VRCKuCo7zGRuewVwhxxIupYwBlI=",
      "dependencies": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
        "deepmerge": "^1.2.0",
        "normalize-wheel": "^1.0.1",
        "resize-observer-polyfill": "^1.5.0",
        "throttle-debounce": "^1.0.1"
      }
    },
    "node_modules/element-ui/node_modules/deepmerge": {
      "version": "1.5.2",
      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/follow-redirects": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
      "engines": {
        "node": ">=4.0"
      }
    },
    "node_modules/js-md5": {
      "version": "0.7.3",
      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
    },
    "node_modules/normalize-wheel": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
    },
    "node_modules/nprogress": {
      "version": "0.2.0",
      "resolved": "https://registry.nlark.com/nprogress/download/nprogress-0.2.0.tgz",
      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
    },
    "node_modules/object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
      "engines": {
        "node": ">=0.10.0"
      }
    },
    "node_modules/regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
      "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
    },
    "node_modules/resize-observer-polyfill": {
      "version": "1.5.1",
      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
    },
    "node_modules/simple-lodash": {
      "version": "0.0.2",
      "resolved": "https://registry.npm.taobao.org/simple-lodash/download/simple-lodash-0.0.2.tgz",
      "integrity": "sha1-2OtKYOmWpVClwa3ajvu3YpiSRrE="
    },
    "node_modules/sortablejs": {
      "version": "1.10.2",
      "resolved": "https://registry.nlark.com/sortablejs/download/sortablejs-1.10.2.tgz",
      "integrity": "sha1-bkA2TZE/mLhaFPZnj5K1wSIfUpA="
    },
    "node_modules/throttle-debounce": {
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1604313880785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz",
      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=",
      "engines": {
        "node": ">=4"
      }
    },
    "node_modules/uni-read-pages": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
      "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==",
      "hasInstallScript": true
    },
    "node_modules/universal-env": {
      "version": "0.6.6",
      "resolved": "https://registry.nlark.com/universal-env/download/universal-env-0.6.6.tgz",
      "integrity": "sha1-3VrfgWqOw+kI1ISOFxTf4w3YqXA="
    },
    "node_modules/uview-ui": {
      "version": "1.8.4",
      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz",
      "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ="
    },
    "node_modules/vue": {
      "version": "2.6.14",
      "resolved": "https://registry.nlark.com/vue/download/vue-2.6.14.tgz?cache=0&sync_timestamp=1625229652956&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue%2Fdownload%2Fvue-2.6.14.tgz",
      "integrity": "sha1-5RqlJQJQ1Wmj+606ilpofWA24jU="
    },
    "node_modules/vuedraggable": {
      "version": "2.24.3",
      "resolved": "https://registry.nlark.com/vuedraggable/download/vuedraggable-2.24.3.tgz",
      "integrity": "sha1-Q8k4SbdGokzlA+Ej1bJZxwG6DRk=",
      "dependencies": {
        "sortablejs": "1.10.2"
      }
    },
    "node_modules/weex-bindingx": {
      "version": "0.0.49",
      "resolved": "https://registry.npm.taobao.org/weex-bindingx/download/weex-bindingx-0.0.49.tgz",
      "integrity": "sha1-h4/LcX+2oifA+NQJi6HhPT4EYJQ=",
      "dependencies": {
        "bindingx-parser": "0.x.x",
        "bindingx-web-polyfill": "0.x.x",
        "object-assign": "^4.1.1",
        "simple-lodash": "^0.0.2",
        "universal-env": "0.x.x"
      }
    }
  },
  "dependencies": {
    "@smallwei/avue": {
      "version": "2.8.17",
@@ -171,8 +405,8 @@
    },
    "uni-read-pages": {
      "version": "1.0.5",
      "resolved": "https://registry.npm.taobao.org/uni-read-pages/download/uni-read-pages-1.0.5.tgz",
      "integrity": "sha1-RSyNyqiXe7rvYAkJvpJsjZcEOHw="
      "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
      "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
    },
    "universal-env": {
      "version": "0.6.6",

 pages/exam/examResultPage.vue

@@ -39,8 +39,9 @@
        <view class="btnArea">
            <u-button class="btnClass" type="primary" :ripple="true" shape="circle" @click="backToHome">返回首页
            </u-button>
            <u-button class="btnClass" type="primary" :ripple="true" shape="circle" @click="goExam">继续模拟考试
            </u-button>
        </view>

    </view>
</template>

@@ -62,6 +63,11 @@
                uni.switchTab({
                    url: '/pages/home/home',
                })
            },
            goExam() {
                uni.navigateTo({
                    url: '/pages/exam/examTextPage'
                })
            }
        },
        computed: {

 pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue

@@ -12,7 +12,7 @@
                <view class="swiper-item">
                    <scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
                        <page0 :listData="rightdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
                            @getOrders="getOrders">
                            @getOrders="getOrders" @outOrders="outOrders">
                        </page0>
                        <page1 :listData="leftdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
                            @getOrders="getOrders">
@@ -122,6 +122,29 @@
            }
        },
        methods: {
            //取消任务
            outOrders(d) {
                let that = this;
                uni.request({
                    url: this.$store.state.piAPI +
                        `taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
                    method: "get",
                    // data: d,
                    header: {
                        "content-type": "application/x-www-form-urlencoded",
                    },
                    success(res) {
                        const data = res.data.msg;
                        if (data == "操作成功") {
                            uni.showToast({
                                title: data,
                                duration: 2000,
                            });
                        }
                        that.$store.commit("changegotuGrabOrders");
                    }
                })
            },
            //实时位置传递
            setNowposition(rid, jd, wd) {
                console.log(uni.getStorageSync("ids") || this.$store.state.puserID, rid, jd, wd);

 pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue

@@ -19,7 +19,7 @@
                    </view>
                    <view class="o-l-m-center" style="padding-left: 13px;">
                        <!-- <u-icon name="volume" color="#d0d0d0" size="28"></u-icon> -->
                    <!--     时间： -->
                        <!--     时间： -->
                        {{item.time}}
                    </view>
                </view>
@@ -34,6 +34,9 @@
                    :disabled="item.type == 1" v-if="item.iscation == 1" @click="getOrders(swiperCurrent,item)">
                    <!-- <span class="Cation">队长</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
                </u-button>
                <u-button class="o-r-down" :plain="true" size="mini" type="error" @click="outOrders(item)">
                    {{item.iscation == 0?'退出任务':'取消任务'}}
                </u-button>
                <view class="o-r-$">
                    积分：{{item.integral}}
@@ -77,6 +80,13 @@
                    item: item
                }
                this.$emit("getOrders", b);
            },
            outOrders(val) {
                let b = {
                    rid: val.id,
                    serid: this.$store.state.puserID
                };
                this.$emit("outOrders", b);
            }
        }
    }
@@ -142,8 +152,8 @@
            justify-content: center;
            flex-direction: column;

            view {
                margin-top: 10px;
            .o-r-down {
                margin-top: 4px;
            }
        }


 pages/grabOrders/grabOrdersZAFFPX/inPage/page2.vue

@@ -39,10 +39,9 @@
                </view>
            </view>
            <view class="onve-right">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true"
                    @click="getOrders(swiperCurrent,item)">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true">
                    <!-- <span class="Cation notCation">队员</span> -->
                    {{"完成反馈"}}
                    {{"已完成"}}
                </u-button>
                <view class="o-r-$">
                    积分：{{item.integral}}

 pages/grabOrders/grabOrdersZAXC/grabOrders.vue

@@ -12,7 +12,7 @@
                <view class="swiper-item">
                    <scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
                        <page0 :listData="leftdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
                            @getOrders="getOrders"></page0>
                            @getOrders="getOrders" @outOrders="outOrders"></page0>
                        <page1 :listData="rightdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
                            @getOrders="getOrders"></page1>
                        <page2 :listData="overdata" :swiperCurrent="2" v-if="item.name == '已完成'" @openOnce="openOnce"
@@ -122,6 +122,29 @@
            }
        },
        methods: {
            //取消任务
            outOrders(d) {
                let that = this;
                uni.request({
                    url: this.$store.state.piAPI +
                        `taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
                    method: "get",
                    // data: d,
                    header: {
                        "content-type": "application/x-www-form-urlencoded",
                    },
                    success(res) {
                        const data = res.data.msg;
                        if (data == "操作成功") {
                            uni.showToast({
                                title: data,
                                duration: 2000,
                            });
                        }
                        that.$store.commit("changegotuGrabOrders");
                    }
                })
            },
            //实时位置传递
            setNowposition(rid, jd, wd) {
                console.log(uni.getStorageSync("ids") || this.$store.state.puserID, rid, jd, wd);

 pages/grabOrders/grabOrdersZAXC/inPage/page0.vue

@@ -30,6 +30,9 @@
                    <!-- <span class="Cation">队长</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
                </u-button>
                <u-button class="o-r-down" :plain="true" size="mini" type="error" @click="outOrders(item)">
                    {{item.iscation == 0?'退出任务':'取消任务'}}
                </u-button>
                <view class="o-r-$">
                    积分：{{item.integral}}
                </view>
@@ -72,6 +75,13 @@
                    item: item
                }
                this.$emit("getOrders", b);
            },
            outOrders(val) {
                let b = {
                    rid: val.id,
                    serid: this.$store.state.puserID
                };
                this.$emit("outOrders", b);
            }
        }
    }
@@ -137,8 +147,8 @@
            justify-content: center;
            flex-direction: column;

            view {
                margin-top: 10px;
            .o-r-down {
                margin-top: 4px;
            }
        }


 pages/grabOrders/grabOrdersZAXC/inPage/page2.vue

@@ -22,7 +22,7 @@
            <view class="onve-right">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true" <!--
                    <span class="Cation notCation">队员</span> -->
                    {{"完成反馈"}}
                    {{"已完成"}}
                </u-button>
                <view class="o-r-$">
                    积分：{{item.integral}}

 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue

@@ -12,7 +12,7 @@
                <view class="swiper-item">
                    <scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
                        <page0 :listData="leftdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
                            @getOrders="getOrders"></page0>
                            @getOrders="getOrders" @outOrders="outOrders"></page0>
                        <page1 :listData="rightdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
                            @getOrders="getOrders"></page1>
                        <page2 :listData="rightdata" :swiperCurrent="2" v-if="item.name == '已完成'" @openOnce="openOnce"
@@ -122,6 +122,29 @@
            }
        },
        methods: {
            //取消任务
            outOrders(d) {
                let that = this;
                uni.request({
                    url: this.$store.state.piAPI +
                        `taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
                    method: "get",
                    // data: d,
                    header: {
                        "content-type": "application/x-www-form-urlencoded",
                    },
                    success(res) {
                        const data = res.data.msg;
                        if (data == "操作成功") {
                            uni.showToast({
                                title: data,
                                duration: 2000,
                            });
                        }
                        that.$store.commit("changegotuGrabOrders");
                    }
                })
            },
            //实时位置传递
            setNowposition(rid, jd, wd) {
                console.log(uni.getStorageSync("ids") || this.$store.state.puserID, rid, jd, wd);
@@ -148,7 +171,8 @@
            openOnce(val) {
                //打开地图
                // console.log(this.swiperCurrent)
                val["buttype"] = this.swiperCurrent == 1 ? 0 : (this.swiperCurrent == 0 ? 1 : 2); //tab标识，0正在进行，1可参与
                val["buttype"] = this.swiperCurrent == 1 ? 0 : (this.swiperCurrent == 0 ? 1 :
                    2); //tab标识，0正在进行，1可参与
                val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                val["appenUrl"] = this.$store.state.piAPI;
                //打开地图

 pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue

@@ -20,11 +20,20 @@
                </view>
            </view>
            <view class="onve-right">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true"
                    v-if="item.iscation == 0" @click="getOrders(swiperCurrent,item)">
                    <!-- <span class="Cation notCation">队员</span> -->
                    {{"完成反馈"}}
                    {{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
                </u-button>
                <view class="o-r-$">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini"
                    :disabled="item.type == 1" v-if="item.iscation == 1" @click="getOrders(swiperCurrent,item)">
                    <!-- <span class="Cation orange">队长</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
                </u-button>
                <u-button class="o-r-down" :plain="true" size="mini" type="error" @click="outOrders(item)">
                    {{item.iscation == 0?'退出任务':'取消任务'}}
                </u-button>
                <view class="o-r-down">
                    积分：{{item.integral}}
                </view>
            </view>
@@ -66,6 +75,13 @@
                    item: item
                }
                this.$emit("getOrders", b);
            },
            outOrders(val) {
                let b = {
                    rid: val.id,
                    serid: this.$store.state.puserID
                };
                this.$emit("outOrders", b);
            }
        }
    }
@@ -131,8 +147,8 @@
            justify-content: center;
            flex-direction: column;

            view {
                margin-top: 10px;
            .o-r-down {
                margin-top: 4px;
            }
        }


 pages/grabOrders/grabOrdersZAYWXC/inPage/page2.vue

@@ -20,15 +20,9 @@
                </view>
            </view>
            <view class="onve-right">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true"
                    v-if="item.iscation == 0" @click="getOrders(swiperCurrent,item)">
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true">
                    <!-- <span class="Cation notCation">队员</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
                </u-button>
                <u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini"
                    :disabled="item.type == 1" v-if="item.iscation == 1" @click="getOrders(swiperCurrent,item)">
                    <!-- <span class="Cation orange">队长</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
                    {{"已完成"}}
                </u-button>
                <view class="o-r-$">
                    积分：{{item.integral}}