From f3eef9f396a09ff8047e5c3e939fe3bfe920895c Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Mon, 20 May 2024 10:48:23 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyList/applyList.vue         | 458 +++++++--------
 components/companyList/collectionList.vue    | 486 ++++++++--------
 components/companyList/companyList.vue       | 450 +++++++--------
 components/companyList/newJobList.vue        | 462 +++++++--------
 components/companyList/newTaskList.vue       | 462 +++++++--------
 components/companyList/workList.vue          | 466 +++++++--------
 pages/index/index.vue                        |  12 +-
 pages/market/market.vue                      | 434 +++++++-------
 pages/project/userrecruitList.vue            | 466 +++++++--------
 pages/recruit/components/userrecruitList.vue | 578 +++++++++----------
 pages/user/policyContent.vue                 |  99 ++--
 11 files changed, 2198 insertions(+), 2175 deletions(-)

diff --git a/components/companyList/applyList.vue b/components/companyList/applyList.vue
index 1cdbecf..32b97d2 100644
--- a/components/companyList/applyList.vue
+++ b/components/companyList/applyList.vue
@@ -1,230 +1,230 @@
-<template>
-    <view class="body" @click="goInfo(companyitem)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-
-        </view>
-
-
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-            <view style="flex:1;"></view>
-            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
-            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
-            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
-        </view>
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
-            </view>
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .missionTitle +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames?.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(item) {
-                // const isCan = this.noApply === false ? '0' : '1'
-                if (item.type == 0) {
-                    uni.navigateTo({
-                        url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
-                    })
-                } else if (item.type == 1) {
-                    uni.navigateTo({
-                        url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
-                    })
-                }
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+
+        </view>
+
+
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+            <view style="flex:1;"></view>
+            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
+        </view>
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+            </view>
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .missionTitle +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames?.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(item) {
+                // const isCan = this.noApply === false ? '0' : '1'
+                if (item.type == 0) {
+                    uni.navigateTo({
+                        url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+                    })
+                } else if (item.type == 1) {
+                    uni.navigateTo({
+                        url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+                    })
+                }
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/components/companyList/collectionList.vue b/components/companyList/collectionList.vue
index afbd6d9..ea2e6e4 100644
--- a/components/companyList/collectionList.vue
+++ b/components/companyList/collectionList.vue
@@ -1,244 +1,244 @@
-<template>
-    <view class="body" @click="goInfo(companyitem)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-
-        </view>
-
-
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-            <view style="flex:1;"></view>
-            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
-            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
-            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
-        </view>
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
-            </view>
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-    import {
-        defaults
-    } from "lodash";
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .missionTitle +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                if (this.companyitem.skillNames) {
-                    return this.companyitem.skillNames?.split(',')
-                } else {
-                    return []
-                }
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(item) {
-                // const isCan = this.noApply === false ? '0' : '1'
-                switch (item.type) {
-                    case 0:
-                        this.navTo(
-                            `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
-                            )
-                        break
-                    case 1:
-                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
-                        break
-                    case 2:
-                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
-                        break
-                    default:
-                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
-                }
-
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+
+        </view>
+
+
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+            <view style="flex:1;"></view>
+            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
+        </view>
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+            </view>
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+    import {
+        defaults
+    } from "lodash";
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .missionTitle +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                if (this.companyitem.skillNames) {
+                    return this.companyitem.skillNames?.split(',')
+                } else {
+                    return []
+                }
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(item) {
+                // const isCan = this.noApply === false ? '0' : '1'
+                switch (item.type) {
+                    case 0:
+                        this.navTo(
+                            `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+                            )
+                        break
+                    case 1:
+                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
+                        break
+                    case 2:
+                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
+                        break
+                    default:
+                        this.navTo(`/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`)
+                }
+
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue
index 71564bb..9096a5b 100644
--- a/components/companyList/companyList.vue
+++ b/components/companyList/companyList.vue
@@ -1,226 +1,226 @@
-<template>
-    <view class="body" @click="goInfo(companyitem.missionNo)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }} {{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-        </view>
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-        </view>
-        <!-- <view class="allName">
-			{{ companyitem.companyName }}
-		</view> -->
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
-            </view>
-            <!-- <view v-if="near">
-				{{ companyitem.distanceStr }}km
-			</view>
-			<view v-else>
-				{{ getCity(companyitem.cityId) }}
-			</view> -->
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .missionTitle +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(no) {
-                const isCan = this.noApply === false ? '0' : '1'
-                uni.navigateTo({
-                    url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=${isCan}`
-                })
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem.missionNo)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }} {{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+        </view>
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+        </view>
+        <!-- <view class="allName">
+			{{ companyitem.companyName }}
+		</view> -->
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+            </view>
+            <!-- <view v-if="near">
+				{{ companyitem.distanceStr }}km
+			</view>
+			<view v-else>
+				{{ getCity(companyitem.cityId) }}
+			</view> -->
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .missionTitle +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(no) {
+                const isCan = this.noApply === false ? '0' : '1'
+                uni.navigateTo({
+                    url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=${isCan}`
+                })
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/components/companyList/newJobList.vue b/components/companyList/newJobList.vue
index 59f7579..db1a1cf 100644
--- a/components/companyList/newJobList.vue
+++ b/components/companyList/newJobList.vue
@@ -1,232 +1,232 @@
-<template>
-    <view class="body" @click="goInfo(companyitem)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-
-        </view>
-
-
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-            <view style="flex:1;"></view>
-            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
-            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
-            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
-        </view>
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
-            </view>
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            },
-            befor: Function,
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .jobName +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(item) {
-                this.$emit('befor', item)
-                // const isCan = this.noApply === false ? '0' : '1'
-                // if(item.type == 0) {
-                // 	uni.navigateTo({
-                // 		url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
-                // 	})
-                // } else if(item.type == 1) {
-                uni.navigateTo({
-                    url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
-                })
-                // }
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+
+        </view>
+
+
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+            <view style="flex:1;"></view>
+            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
+        </view>
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
+            </view>
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            },
+            befor: Function,
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .jobName +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(item) {
+                this.$emit('befor', item)
+                // const isCan = this.noApply === false ? '0' : '1'
+                // if(item.type == 0) {
+                // 	uni.navigateTo({
+                // 		url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+                // 	})
+                // } else if(item.type == 1) {
+                uni.navigateTo({
+                    url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+                })
+                // }
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/components/companyList/newTaskList.vue b/components/companyList/newTaskList.vue
index 0a81328..d3b563f 100644
--- a/components/companyList/newTaskList.vue
+++ b/components/companyList/newTaskList.vue
@@ -1,232 +1,232 @@
-<template>
-    <view class="body" @click="goInfo(companyitem)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-
-        </view>
-
-
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-            <view style="flex:1;"></view>
-            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
-            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
-            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
-        </view>
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
-            </view>
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            },
-            befor: Function,
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .missionTitle +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(item) {
-                this.$emit('befor', item)
-                // const isCan = this.noApply === false ? '0' : '1'
-                // if(item.type == 0) {
-                uni.navigateTo({
-                    url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
-                })
-                // } else if(item.type == 1) {
-                // 	uni.navigateTo({
-                // 		url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
-                // 	})
-                // }
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+
+        </view>
+
+
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+            <view style="flex:1;"></view>
+            <u-tag text="零工岗位" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+            <u-tag text="全职岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+            <u-tag text="招工" v-if="companyitem.type == 2" plain size="mini"></u-tag>
+        </view>
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+            </view>
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            },
+            befor: Function,
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .missionTitle +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(item) {
+                this.$emit('befor', item)
+                // const isCan = this.noApply === false ? '0' : '1'
+                // if(item.type == 0) {
+                uni.navigateTo({
+                    url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+                })
+                // } else if(item.type == 1) {
+                // 	uni.navigateTo({
+                // 		url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+                // 	})
+                // }
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue
index 1c57a0d..d6ada40 100644
--- a/components/companyList/workList.vue
+++ b/components/companyList/workList.vue
@@ -1,234 +1,234 @@
-<template>
-    <view class="body" @click="goInfo(companyitem.id)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-        </view>
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-        </view>
-        <!-- <view class="allName">
-			{{ companyitem.jobCompanyName }}
-		</view> -->
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <!-- <view v-if="companyitem.missionCompanyName">
-				{{ companyitem.missionCompanyName }}
-			</view> -->
-            <!-- <view>
-				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
-				{{ companyitem.jobCompanyName }}
-			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
-            </view>
-            <!-- <view v-if="near">
-				{{ companyitem.distanceStr }}km
-			</view>
-			<view v-else>
-				{{ getCity(companyitem.cityId) }}
-			</view> -->
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .jobName +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(no) {
-                console.log('11111')
-                const isCan = this.noApply === false ? '0' : '1'
-                uni.navigateTo({
-                    url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=${isCan}`
-                })
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        ont-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem.id)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+        </view>
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+        </view>
+        <!-- <view class="allName">
+			{{ companyitem.jobCompanyName }}
+		</view> -->
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <!-- <view v-if="companyitem.missionCompanyName">
+				{{ companyitem.missionCompanyName }}
+			</view> -->
+            <!-- <view>
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
+				{{ companyitem.jobCompanyName }}
+			</view> -->
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
+            </view>
+            <!-- <view v-if="near">
+				{{ companyitem.distanceStr }}km
+			</view>
+			<view v-else>
+				{{ getCity(companyitem.cityId) }}
+			</view> -->
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .jobName +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(no) {
+                console.log('11111')
+                const isCan = this.noApply === false ? '0' : '1'
+                uni.navigateTo({
+                    url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=${isCan}`
+                })
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        ont-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e7bfeae..5044a49 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -164,7 +164,7 @@
 						<view class="font24" style="margin-top: 22rpx !important;">在线咨询</view>
 					</view>
 				</button> -->
-                <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
+                <!--   <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
                     <view class="cardItemIcon">
                         <image src="../../static/img/index/consult.png" mode=""></image>
                     </view>
@@ -175,9 +175,9 @@
                         <image src="../../static/img/index/bangzhu.png" mode=""></image>
                     </view>
                     <view class="font24">就业帮助</view>
-                </view>
+                </view> -->
                 <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
-                    <view class="cardItemIcon">
+                    <view class="cardItemIcon" @click="navTo('/pageMy/setUserBase/applicationsRecord')">
                         <image src="../../static/img/index/legal.png" mode=""></image>
                     </view>
                     <view class="font24">问卷调查</view>
@@ -196,10 +196,10 @@
                 <view class="top_log"></view>
                 <view class="next_market" @click="navTo('/pages/market/market')">去市场</view>
             </view>
-            <view class="market_bottom">
+            <!-- <view class="market_bottom">
                 <view>了解市场<u-icon name="arrow-right" color="#666666" size="13"></u-icon></view>
                 <view>我要咨询<u-icon name="arrow-right" color="#666666" size="13"></u-icon></view>
-            </view>
+            </view> -->
         </view>
 
         <view class="latestMission">
@@ -223,7 +223,7 @@
                         <image :src="item.headPic"
                             style="width: 80rpx;height: 80rpx;margin-right: 20rpx;border-radius: 10rpx;" mode="">
                         </image>
-                        <view style="font-size: 28rpx;">{{ item.articleTitle }}</view>
+                        <view style="flex: 1; font-size: 28rpx;">{{ item.articleTitle }}</view>
                     </view>
                 </view>
                 <view v-if="policyContentList.length<=0">
diff --git a/pages/market/market.vue b/pages/market/market.vue
index 349e87e..3cafc39 100644
--- a/pages/market/market.vue
+++ b/pages/market/market.vue
@@ -1,207 +1,227 @@
-<template>
-	<view class="app_container">
-		<view class="container_head">
-            <view class="row">
-                <view class="head_left">
-                    <view class="left_title">在德阳市开设</view>
-                    <view class="left_content">
-                        <view class="content_item">
-                            <view class="fs_28">1</view>
-                            <view class="fs_24">主市场</view>
-                        </view>
-						<view class="content_item">
-						    <view class="fs_28">15</view>
-						    <view class="fs_24">分市场</view>
-						</view>
-						<view class="content_item">
-						    <view class="fs_28">136</view>
-						    <view class="fs_24">服务站</view>
-						</view>
-                    </view>
-                </view>
-                <view class="head_right">
-                    <image src="../../static/img/deyang.png"></image>
-                </view>
-            </view>
-            <view class="broadcast">
-                <view class="cast-l"><u-icon style="margin-right: 10rpx;" name="volume" color="#fb6a09" size="20"></u-icon>周六常态化招聘会通知</view>
-                <u-icon name="arrow-right" color="#666666" size="16"></u-icon>
-            </view>
-        </view>
-        
-        <view class="conatiner_card">
-            <view class="row blod fs_34">德阳市智慧就业市场</view>
-            <view class="row color_666 fs_30 marT_30">
-                <u-icon style="margin-right: 10rpx;" name="calendar" color="#666666" size="16"></u-icon>营业时间
-            </view>
-            <view class="row color_666 fs_30">上午9:00-12:00 下午14:00-18:00</view>
-            <view class="row color_666 fs_30 marT_30">
-                <u-icon style="margin-right: 10rpx;" name="map" color="#666666" size="16"></u-icon>
-                四川省德阳市旌阳区天山南路1段108号 
-                <u-icon style="margin-left: 10rpx;" name="arrow-right" color="#666666" size="16"></u-icon>
-            </view>
-            <view class="row color_666 fs_28 marT_10">
-                <view class="column">距离我7km</view>
-            </view>
-        </view>
-        
-        <view class="conatiner_card">
-            <view class="row blod fs_34">关于市场</view>
-            <view class="row color_666 fs_30">德阳市公共就业服务市场，为进一步促进公共就业服务提质增效，保障重点企业用工需求，助力高校毕业生等重点群体实现更充分更高质量就业，德阳市人社局进一步加强统筹、靶向施力，充分利用市本级和各区(市、县)现有招聘网站、微信小程序、抖音号等以及线下人力资源招聘市场，全力打造集“手机端”+“电脑端”+“线下端”三位一体立体招聘矩阵，通过深挖收集企业用工岗位信息，坚持定向推送，进一步拓宽招聘信息发布渠道，提升招聘求职成功率。</view>
-        </view>
-        
-        <view class="container_chioe">
-            <view class="chioe_share color_666 fs_24">
-                <u-icon name="share" color="#666666" size="16"></u-icon>分享
-            </view>
-            <view class="chioe_btn">电话咨询</view>
-            <view class="chioe_btn btn_Blue">到这去</view>
-        </view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-@function designTo($num) {
-    @return ($num / 620rpx) * 750rpx
-}
-
-@for $i from 10 to 60{
-    .fs_#{$i} {
-      font-size : #{$i}rpx;
-    }
-}
-@for $i from 1 to 60{
-    .marT_#{$i} {
-      margin-top : #{$i}rpx;
-    }
-}
-.color_666{
-    color: #666666;
-}
-.bold{
-    font-weight: bold;
-}
-image{
-    width: 100%;
-    height: 100%;
-}
-.app_container{
-    background-color: #f3f4f8;
-    min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    .container_head{
-        min-height: 300rpx;
-        padding: 28rpx;
-        background: linear-gradient(to bottom, rgba(69, 112, 250, 1), rgba(69, 112, 250, .0));
-        .row{
-            display: flex;
-            align-content: center;
-            justify-content: space-between;
-            .head_left{
-                color: #FFFFFF;
-                display: flex;
-                align-items: flex-start;
-                flex-direction: column;
-                .left_title{}
-                .left_content{
-                    height: designTo(87rpx);
-                    width: designTo(313rpx);
-                    background-color: rgba(69, 104, 252, 0.4);
-                    border-radius: 20rpx;
-                    margin-top: 20rpx;
-                    display: flex;
-                    justify-content: space-around;
-                    align-items: center;
-                    flex-wrap: nowrap;
-                    .content_item{
-                        text-align: center;
-                        white-space: nowrap;
-                    }
-                }
-            }
-            .head_right{
-                width: designTo(220rpx);
-                height: designTo(148rpx);
-                border-radius: 20rpx;
-                overflow: hidden;
-            }
-        }
-       
-        .broadcast{
-            margin-top: designTo(65rpx);
-            height: designTo(77rpx);
-            background-color: rgba(244, 230, 224, 1);
-            border-radius: 20rpx;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 24rpx;
-            .cast-l{
-                font-size: 32rpx;
-                display: flex;
-            }
-        }
-    }
-
-    .conatiner_card{
-        margin: 28rpx;
-        background-color: #FFFFFF;
-        height: fit-content;
-        border-radius: 20rpx;
-        padding: designTo(28rpx);
-        .row{
-            display: flex;
-            align-items: center;
-        }
-        .column{
-            padding: 10rpx 20rpx;
-            border-radius: 40rpx;
-            background-color: #f3f4f8;
-        }
-    }
-    
-    .container_chioe{
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        background-color: #FFFFFF;
-        height: designTo(108rpx);
-        padding: 0 28rpx designTo(30rpx) 28rpx;
-        .chioe_share{
-            display: flex;
-            align-items: center;
-            flex-direction: column;
-            justify-content: center;
-        }
-        .chioe_btn{
-            color: #FFFFFF;
-            background: linear-gradient(to right, #fbaf1a, #fbaf1a);
-            height: designTo(66rpx);
-            width: designTo(228rpx);
-            text-align: center;
-            line-height: designTo(66rpx);
-            border-radius: designTo(33rpx);
-        }
-        .btn_Blue{
-             background: linear-gradient(to right, #95aefb, #4b74f7);
-        }
-    }
-}
-</style>
+<template>
+    <view class="app_container">
+        <view class="container_head">
+            <view class="row">
+                <view class="head_left">
+                    <view class="left_title">在德阳市开设</view>
+                    <view class="left_content">
+                        <view class="content_item">
+                            <view class="fs_28">1</view>
+                            <view class="fs_24">主市场</view>
+                        </view>
+                        <view class="content_item">
+                            <view class="fs_28">15</view>
+                            <view class="fs_24">分市场</view>
+                        </view>
+                        <view class="content_item">
+                            <view class="fs_28">136</view>
+                            <view class="fs_24">服务站</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="head_right">
+                    <image src="../../static/img/deyang.png"></image>
+                </view>
+            </view>
+            <!-- <view class="broadcast">
+                <view class="cast-l"><u-icon style="margin-right: 10rpx;" name="volume" color="#fb6a09"
+                        size="20"></u-icon>周六常态化招聘会通知</view>
+                <u-icon name="arrow-right" color="#666666" size="16"></u-icon>
+            </view> -->
+        </view>
+
+        <view class="conatiner_card">
+            <view class="row blod fs_34">德阳市智慧就业市场</view>
+            <view class="row color_666 fs_30 marT_30">
+                <u-icon style="margin-right: 10rpx;" name="calendar" color="#666666" size="16"></u-icon>营业时间
+            </view>
+            <view class="row color_666 fs_30">上午9:00-12:00 下午14:00-18:00</view>
+            <view class="row color_666 fs_30 marT_30">
+                <u-icon style="margin-right: 10rpx;" name="map" color="#666666" size="16"></u-icon>
+                四川省德阳市旌阳区天山南路1段108号
+                <!-- <u-icon style="margin-left: 10rpx;" name="arrow-right" color="#666666" size="16"></u-icon> -->
+            </view>
+            <!--     <view class="row color_666 fs_28 marT_10">
+                <view class="column">距离我7km</view>
+            </view> -->
+        </view>
+
+        <view class="conatiner_card">
+            <view class="row blod fs_34">关于市场</view>
+            <view class="row color_666 fs_30">
+                德阳市公共就业服务市场，为进一步促进公共就业服务提质增效，保障重点企业用工需求，助力高校毕业生等重点群体实现更充分更高质量就业，德阳市人社局进一步加强统筹、靶向施力，充分利用市本级和各区(市、县)现有招聘网站、微信小程序、抖音号等以及线下人力资源招聘市场，全力打造集“手机端”+“电脑端”+“线下端”三位一体立体招聘矩阵，通过深挖收集企业用工岗位信息，坚持定向推送，进一步拓宽招聘信息发布渠道，提升招聘求职成功率。
+            </view>
+        </view>
+
+        <!-- <view class="container_chioe">
+            <view class="chioe_share color_666 fs_24">
+                <u-icon name="share" color="#666666" size="16"></u-icon>分享
+            </view>
+            <view class="chioe_btn">电话咨询</view>
+            <view class="chioe_btn btn_Blue">到这去</view>
+        </view> -->
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+
+            }
+        },
+        methods: {
+
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @function designTo($num) {
+        @return ($num / 620rpx) * 750rpx
+    }
+
+    @for $i from 10 to 60 {
+        .fs_#{$i} {
+            font-size : #{$i}rpx;
+        }
+    }
+
+    @for $i from 1 to 60 {
+        .marT_#{$i} {
+            margin-top : #{$i}rpx;
+        }
+    }
+
+    .color_666 {
+        color: #666666;
+    }
+
+    .bold {
+        font-weight: bold;
+    }
+
+    image {
+        width: 100%;
+        height: 100%;
+    }
+
+    .app_container {
+        background-color: #f3f4f8;
+        min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+
+        .container_head {
+            min-height: 300rpx;
+            padding: 28rpx;
+            background: linear-gradient(to bottom, rgba(69, 112, 250, 1), rgba(69, 112, 250, .0));
+
+            .row {
+                display: flex;
+                align-content: center;
+                justify-content: space-between;
+
+                .head_left {
+                    color: #FFFFFF;
+                    display: flex;
+                    align-items: flex-start;
+                    flex-direction: column;
+
+                    .left_title {}
+
+                    .left_content {
+                        height: designTo(87rpx);
+                        width: designTo(313rpx);
+                        background-color: rgba(69, 104, 252, 0.4);
+                        border-radius: 20rpx;
+                        margin-top: 20rpx;
+                        display: flex;
+                        justify-content: space-around;
+                        align-items: center;
+                        flex-wrap: nowrap;
+
+                        .content_item {
+                            text-align: center;
+                            white-space: nowrap;
+                        }
+                    }
+                }
+
+                .head_right {
+                    width: designTo(220rpx);
+                    height: designTo(148rpx);
+                    border-radius: 20rpx;
+                    overflow: hidden;
+                }
+            }
+
+            .broadcast {
+                margin-top: designTo(65rpx);
+                height: designTo(77rpx);
+                background-color: rgba(244, 230, 224, 1);
+                border-radius: 20rpx;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                padding: 0 24rpx;
+
+                .cast-l {
+                    font-size: 32rpx;
+                    display: flex;
+                }
+            }
+        }
+
+        .conatiner_card {
+            margin: 28rpx;
+            background-color: #FFFFFF;
+            height: fit-content;
+            border-radius: 20rpx;
+            padding: designTo(28rpx);
+
+            .row {
+                display: flex;
+                align-items: center;
+            }
+
+            .column {
+                padding: 10rpx 20rpx;
+                border-radius: 40rpx;
+                background-color: #f3f4f8;
+            }
+        }
+
+        .container_chioe {
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            background-color: #FFFFFF;
+            height: designTo(108rpx);
+            padding: 0 28rpx designTo(30rpx) 28rpx;
+
+            .chioe_share {
+                display: flex;
+                align-items: center;
+                flex-direction: column;
+                justify-content: center;
+            }
+
+            .chioe_btn {
+                color: #FFFFFF;
+                background: linear-gradient(to right, #fbaf1a, #fbaf1a);
+                height: designTo(66rpx);
+                width: designTo(228rpx);
+                text-align: center;
+                line-height: designTo(66rpx);
+                border-radius: designTo(33rpx);
+            }
+
+            .btn_Blue {
+                background: linear-gradient(to right, #95aefb, #4b74f7);
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/project/userrecruitList.vue b/pages/project/userrecruitList.vue
index 11ee747..a26d4f9 100644
--- a/pages/project/userrecruitList.vue
+++ b/pages/project/userrecruitList.vue
@@ -1,234 +1,234 @@
-<template>
-    <view class="body" @click="goInfo(companyitem.id)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-        </view>
-        <view class="ask">
-            <view class="askList">
-                {{ companyitem.tradeNames }}
-            </view>
-            <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                {{ item }}
-            </view>
-        </view>
-        <!-- <view class="allName">
-			{{ companyitem.jobCompanyName }}
-		</view> -->
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <!-- <view v-if="companyitem.missionCompanyName">
-				{{ companyitem.missionCompanyName }}
-			</view> -->
-            <!-- <view>
-				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
-				{{ companyitem.jobCompanyName }}
-			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
-                </image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobAddress }}</view>
-            </view>
-            <!-- <view v-if="near">
-				{{ companyitem.distanceStr }}km
-			</view>
-			<view v-else>
-				{{ getCity(companyitem.cityId) }}
-			</view> -->
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .jobName +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function(no) {
-                console.log('11111')
-                const isCan = this.noApply === false ? '0' : '1'
-                uni.navigateTo({
-                    url: `/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(no)}&isCan=${isCan}`
-                })
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        margin: 20rpx 0;
-    }
-
-    .head_right {
-        font-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-top: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem.id)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+        </view>
+        <view class="ask">
+            <view class="askList">
+                {{ companyitem.tradeNames }}
+            </view>
+            <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                {{ item }}
+            </view>
+        </view>
+        <!-- <view class="allName">
+			{{ companyitem.jobCompanyName }}
+		</view> -->
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <!-- <view v-if="companyitem.missionCompanyName">
+				{{ companyitem.missionCompanyName }}
+			</view> -->
+            <!-- <view>
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
+				{{ companyitem.jobCompanyName }}
+			</view> -->
+            <view style="display: flex;align-items: center;">
+                <image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode="">
+                </image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobAddress }}</view>
+            </view>
+            <!-- <view v-if="near">
+				{{ companyitem.distanceStr }}km
+			</view>
+			<view v-else>
+				{{ getCity(companyitem.cityId) }}
+			</view> -->
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .jobName +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function(no) {
+                console.log('11111')
+                const isCan = this.noApply === false ? '0' : '1'
+                uni.navigateTo({
+                    url: `/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(no)}&isCan=${isCan}`
+                })
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        margin: 20rpx 0;
+    }
+
+    .head_right {
+        font-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/recruit/components/userrecruitList.vue b/pages/recruit/components/userrecruitList.vue
index 767778e..e9e6b54 100644
--- a/pages/recruit/components/userrecruitList.vue
+++ b/pages/recruit/components/userrecruitList.vue
@@ -1,290 +1,290 @@
-<template>
-    <view class="body" @click="goInfo(companyitem)">
-        <view class="heads">
-            <view class="head_left">
-                <rich-text :nodes="string">
-                </rich-text>
-            </view>
-
-            <view class="head_right">
-                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
-            </view>
-        </view>
-        <view class="ask">
-            <view class="asj_content">
-                <view class="askList">
-                    {{ companyitem.tradeNames }}
-                </view>
-                <view class="askList" v-for="(item, index) in skillNames" :key="index">
-                    {{ item }}
-                </view>
-            </view>
-            <view class="ask_right">
-                <u-tag v-if="companyitem.reviewState == 1" :text="getReviewState(companyitem.reviewState)"
-                    type="success" plain shape="circle"></u-tag>
-                <u-tag v-if="companyitem.reviewState == 9" :text="getReviewState(companyitem.reviewState)" type="error"
-                    plain shape="circle"></u-tag>
-                <u-tag v-if="companyitem.reviewState == 0" :text="getReviewState(companyitem.reviewState)" plain
-                    shape="circle"></u-tag>
-            </view>
-        </view>
-        <!-- <view class="allName">
-			{{ companyitem.jobCompanyName }}
-		</view> -->
-        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
-        <view class="timeAddress" style="position: relative;">
-            <!-- <view v-if="companyitem.missionCompanyName">
-				{{ companyitem.missionCompanyName }}
-			</view> -->
-            <!-- <view>
-				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
-				{{ companyitem.jobCompanyName }}
-			</view> -->
-            <view style="display: flex;align-items: center;">
-                <image src="../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"
-                    mode=""></image>
-                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
-            </view>
-            <!-- <view v-if="near">
-				{{ companyitem.distanceStr }}km
-			</view>
-			<view v-else>
-				{{ getCity(companyitem.cityId) }}
-			</view> -->
-            <view style="display: flex;align-items: center;position:absolute;right:0;">
-                <image src="../../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
-                <view>2.2km</view>
-            </view>
-        </view>
-        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
-                <image class="commentimg_image" src="../../../static/img/star.full.svg"
-                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
-                <image class="commentimg_image" src="../../../static/img/star.empty.svg"
-                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
-            </view>
-            <view class="comment_content allName gocomment" v-else>
-                评价
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    import {
-        toDoller,
-        dateFormat
-    } from "../../../untils/format.js";
-    import dictionary from '@/common/textdata.js';
-
-    export default {
-        beforeCreate: function() {},
-        props: {
-            companyitem: {
-                type: Object,
-                default () {
-                    return []
-                }
-            },
-            comment: {
-                type: Boolean,
-                default: false
-            },
-            noApply: {
-                type: Boolean,
-                default: true
-            },
-            near: {
-                type: Boolean,
-                default: false
-            }
-        },
-        data() {
-            return {
-                ...dictionary,
-                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
-                    .jobName +
-                    "</div>"
-            };
-        },
-        computed: {
-            skillNames() {
-                return this.companyitem.skillNames.split(',')
-            }
-        },
-        methods: {
-            getReviewState(type) {
-                switch (type) {
-                    case 1:
-                        return '已审核'
-                    case 0:
-                        return '待审核'
-                    case 9:
-                        return '已驳回'
-                }
-            },
-            goComment: function(no) {
-                uni.navigateTo({
-                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-                })
-            },
-            goInfo: function({
-                id,
-                reviewState,
-                jobType
-            }) {
-                if (reviewState === 9) {
-                    this.navTo(
-                        `/pages/recruit/subPage/updataTaskorWork/updataTaskorWork?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${this.companyitem.jobType}&id=${this.companyitem.id}`
-                    )
-                    return
-                }
-                const isCan = this.noApply === false ? '0' : '1'
-                switch (jobType) {
-                    case 0:
-                        this.navTo(`/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
-                        this.companyitem.jobType}&id=${this.companyitem.id}`)
-                        break
-                    case 1:
-                        this.navTo(`/pages/projectInfo/userrecruitWorkInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
-                        this.companyitem.jobType}&id=${this.companyitem.id}`)
-                        break
-                }
-            },
-            getCity: function(val) {
-                if (val) {
-                    let areas = this.$store.getters.getAreaParents(val)
-                    if (areas.length === 3) {
-                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-                    }
-                }
-            },
-            toDoller,
-            dateFormat
-        }
-    }
-</script>
-
-<style>
-    .commentimg_image {
-        width: 40rpx;
-        height: 40rpx;
-    }
-
-    .commentimg {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-    }
-
-    .gocomment {
-        font-size: 26rpx !important;
-        border-radius: 5rpx;
-        border: 1rpx solid #c3c3c3;
-        width: 160rpx;
-        text-align: center;
-        float: right;
-        height: 50rpx;
-        line-height: 50rpx;
-    }
-
-    .timeAddress {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #999999;
-        margin: 10rpx 0;
-        padding: 10rpx 0;
-    }
-
-    .allName {
-        font-family: PingFangSC-Regular;
-        font-size: 28rpx;
-        color: #666666;
-    }
-
-    .askList {
-        /* width: 14%; */
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: #666666;
-        background-color: #f6f6f6;
-        padding: 5rpx 15rpx;
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .ask {
-        overflow: hidden;
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        margin: 20rpx 0;
-    }
-
-    .asj_content {
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        flex: 1;
-    }
-
-    .ask_right {
-        font-family: PingFangSC-Regular;
-        font-size: 24rpx;
-        color: blue;
-        background-color: #FFFFFF;
-        /* border: 2rpx solid blue; */
-        border-radius: 6px;
-        /* padding: 2rpx 10rpx; */
-        margin-right: 10rpx;
-        margin-bottom: 10rpx;
-    }
-
-    .head_right {
-        font-family: PingFangSC-Medium;
-        font-size: 28rpx;
-        color: #F46161;
-        font-weight: bold;
-    }
-
-    .head_left {
-        font-family: PingFangSC-Medium;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        width: 350rpx;
-        overflow: hidden;
-        white-space: nowrap;
-        /*不换行*/
-        text-overflow: ellipsis;
-        /*超出部分文字以...显示*/
-    }
-
-    .highlight {
-        color: #F46161;
-    }
-
-    .body {
-        width: 690rpx;
-        margin: 0rpx auto;
-        background-color: #fefefe;
-        overflow: hidden;
-        box-sizing: border-box;
-        padding: 20rpx;
-        padding-bottom: 0;
-        border-radius: 20rpx;
-        margin-bottom: 20rpx;
-    }
-
-    .heads {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
+<template>
+    <view class="body" @click="goInfo(companyitem)">
+        <view class="heads">
+            <view class="head_left">
+                <rich-text :nodes="string">
+                </rich-text>
+            </view>
+
+            <view class="head_right">
+                {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+            </view>
+        </view>
+        <view class="ask">
+            <view class="asj_content">
+                <view class="askList">
+                    {{ companyitem.tradeNames }}
+                </view>
+                <view class="askList" v-for="(item, index) in skillNames" :key="index">
+                    {{ item }}
+                </view>
+            </view>
+            <view class="ask_right">
+                <u-tag v-if="companyitem.reviewState == 1" :text="getReviewState(companyitem.reviewState)"
+                    type="success" plain shape="circle"></u-tag>
+                <u-tag v-if="companyitem.reviewState == 9" :text="getReviewState(companyitem.reviewState)" type="error"
+                    plain shape="circle"></u-tag>
+                <u-tag v-if="companyitem.reviewState == 0" :text="getReviewState(companyitem.reviewState)" plain
+                    shape="circle"></u-tag>
+            </view>
+        </view>
+        <!-- <view class="allName">
+			{{ companyitem.jobCompanyName }}
+		</view> -->
+        <view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+        <view class="timeAddress" style="position: relative;">
+            <!-- <view v-if="companyitem.missionCompanyName">
+				{{ companyitem.missionCompanyName }}
+			</view> -->
+            <!-- <view>
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
+				{{ companyitem.jobCompanyName }}
+			</view> -->
+            <view style="display: flex;align-items: center;">
+                <image src="../../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"
+                    mode=""></image>
+                <view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
+            </view>
+            <!-- <view v-if="near">
+				{{ companyitem.distanceStr }}km
+			</view>
+			<view v-else>
+				{{ getCity(companyitem.cityId) }}
+			</view> -->
+            <view style="display: flex;align-items: center;position:absolute;right:0;">
+                <image src="../../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+                <view>--km</view>
+            </view>
+        </view>
+        <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+            <view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+                <image class="commentimg_image" src="../../../static/img/star.full.svg"
+                    v-for="index1 in companyitem.scoreAll" mode="" :key="index1"></image>
+                <image class="commentimg_image" src="../../../static/img/star.empty.svg"
+                    v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+            </view>
+            <view class="comment_content allName gocomment" v-else>
+                评价
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {
+        toDoller,
+        dateFormat
+    } from "../../../untils/format.js";
+    import dictionary from '@/common/textdata.js';
+
+    export default {
+        beforeCreate: function() {},
+        props: {
+            companyitem: {
+                type: Object,
+                default () {
+                    return []
+                }
+            },
+            comment: {
+                type: Boolean,
+                default: false
+            },
+            noApply: {
+                type: Boolean,
+                default: true
+            },
+            near: {
+                type: Boolean,
+                default: false
+            }
+        },
+        data() {
+            return {
+                ...dictionary,
+                string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem
+                    .jobName +
+                    "</div>"
+            };
+        },
+        computed: {
+            skillNames() {
+                return this.companyitem.skillNames.split(',')
+            }
+        },
+        methods: {
+            getReviewState(type) {
+                switch (type) {
+                    case 1:
+                        return '已审核'
+                    case 0:
+                        return '待审核'
+                    case 9:
+                        return '已驳回'
+                }
+            },
+            goComment: function(no) {
+                uni.navigateTo({
+                    url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+                })
+            },
+            goInfo: function({
+                id,
+                reviewState,
+                jobType
+            }) {
+                if (reviewState === 9) {
+                    this.navTo(
+                        `/pages/recruit/subPage/updataTaskorWork/updataTaskorWork?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${this.companyitem.jobType}&id=${this.companyitem.id}`
+                    )
+                    return
+                }
+                const isCan = this.noApply === false ? '0' : '1'
+                switch (jobType) {
+                    case 0:
+                        this.navTo(`/pages/projectInfo/userrecruitInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
+                        this.companyitem.jobType}&id=${this.companyitem.id}`)
+                        break
+                    case 1:
+                        this.navTo(`/pages/projectInfo/userrecruitWorkInfo?workId=${encodeURIComponent(id)}&isCan=${isCan}&jobType=${
+                        this.companyitem.jobType}&id=${this.companyitem.id}`)
+                        break
+                }
+            },
+            getCity: function(val) {
+                if (val) {
+                    let areas = this.$store.getters.getAreaParents(val)
+                    if (areas.length === 3) {
+                        return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+                    }
+                }
+            },
+            toDoller,
+            dateFormat
+        }
+    }
+</script>
+
+<style>
+    .commentimg_image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .commentimg {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+    }
+
+    .gocomment {
+        font-size: 26rpx !important;
+        border-radius: 5rpx;
+        border: 1rpx solid #c3c3c3;
+        width: 160rpx;
+        text-align: center;
+        float: right;
+        height: 50rpx;
+        line-height: 50rpx;
+    }
+
+    .timeAddress {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #999999;
+        margin: 10rpx 0;
+        padding: 10rpx 0;
+    }
+
+    .allName {
+        font-family: PingFangSC-Regular;
+        font-size: 28rpx;
+        color: #666666;
+    }
+
+    .askList {
+        /* width: 14%; */
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: #666666;
+        background-color: #f6f6f6;
+        padding: 5rpx 15rpx;
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .ask {
+        overflow: hidden;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin: 20rpx 0;
+    }
+
+    .asj_content {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        flex: 1;
+    }
+
+    .ask_right {
+        font-family: PingFangSC-Regular;
+        font-size: 24rpx;
+        color: blue;
+        background-color: #FFFFFF;
+        /* border: 2rpx solid blue; */
+        border-radius: 6px;
+        /* padding: 2rpx 10rpx; */
+        margin-right: 10rpx;
+        margin-bottom: 10rpx;
+    }
+
+    .head_right {
+        font-family: PingFangSC-Medium;
+        font-size: 28rpx;
+        color: #F46161;
+        font-weight: bold;
+    }
+
+    .head_left {
+        font-family: PingFangSC-Medium;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        width: 350rpx;
+        overflow: hidden;
+        white-space: nowrap;
+        /*不换行*/
+        text-overflow: ellipsis;
+        /*超出部分文字以...显示*/
+    }
+
+    .highlight {
+        color: #F46161;
+    }
+
+    .body {
+        width: 690rpx;
+        margin: 0rpx auto;
+        background-color: #fefefe;
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 20rpx;
+        padding-bottom: 0;
+        border-radius: 20rpx;
+        margin-bottom: 20rpx;
+    }
+
+    .heads {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/user/policyContent.vue b/pages/user/policyContent.vue
index 95e25a8..1d1f4be 100644
--- a/pages/user/policyContent.vue
+++ b/pages/user/policyContent.vue
@@ -1,48 +1,51 @@
-<template>
-	<view class="policy-content">
-		<view v-html="strings"></view>
-	</view>
-</template>
-
-<script>
-	import {getPolicyContent} from '@/api/newIndex.js'
-	export default {
-		data() {
-			return {
-				strings:'',
-				contentShow:false
-			}
-		},
-		onLoad(option) {
-			if(option.id){
-				// #ifdef H5 
-				//h5中如果有% 会报错，需单独处理
-				// option.val=this.percent2percent25(option.val)
-				// #endif
-				// this.strings=decodeURIComponent(option.val) ;
-				getPolicyContent (1, option.id).then(res => {
-					this.strings = res.data.data.records[0].note
-				})
-			}
-		},
-		methods: {
-			percent2percent25 (URI)  {
-			if(URI.indexOf('%') > -1) {
-			return URI.replace(/%/g,'%25')
-			}else{
-			return URI;
-			}
-			},
-		}
-	}
-</script>
-
-<style>
-	/* page{
-		padding: 20px 20px 20px 20px;
-		overflow: auto;
-	} */
-	.policy-content {
-		padding: 30rpx;
-	}
-</style>
+<template>
+    <view class="policy-content">
+        <view v-html="strings"></view>
+    </view>
+</template>
+
+<script>
+    import {
+        getPolicyContent
+    } from '@/api/newIndex.js'
+    export default {
+        data() {
+            return {
+                strings: '',
+                contentShow: false
+            }
+        },
+        onLoad(option) {
+            if (option.id) {
+                // #ifdef H5 
+                //h5中如果有% 会报错，需单独处理
+                // option.val=this.percent2percent25(option.val)
+                // #endif
+                // this.strings=decodeURIComponent(option.val) ;
+                getPolicyContent(1, option.id).then(res => {
+                    this.strings = res.data.data.records[0].note
+                })
+            }
+        },
+        methods: {
+            percent2percent25(URI) {
+                if (URI.indexOf('%') > -1) {
+                    return URI.replace(/%/g, '%25')
+                } else {
+                    return URI;
+                }
+            },
+        }
+    }
+</script>
+
+<style>
+    /* page{
+		padding: 20px 20px 20px 20px;
+		overflow: auto;
+	} */
+    .policy-content {
+        padding: 30rpx;
+        font-family: PingFangSC-Regular, PingFang SC;
+    }
+</style>
\ No newline at end of file