flat： 修改

api/resume.js

@@ -1,4 +1,6 @@
-import { request } from "@/untils/AxiosUtils.js";
+import {
+    request
+} from "@/untils/AxiosUtils.js";
 /*我的简历-查看*/
 export const myResume = () => {
     return request({
@@ -51,7 +53,14 @@ export const setLearn = (id, learnSkill) => {
 };
 
 /*保存我的简历信息*/
-export const setResume = ({id,education,wage,workplace,telephone}) => {
+export const setResume = ({
+    id,
+    education,
+    wage,
+    workplace,
+    telephone,
+    workExperience
+}) => {
     return request({
         url: "/api/jobslink-api/user/user/resume/update",
         method: "post",
@@ -60,7 +69,8 @@ export const setResume = ({id,education,wage,workplace,telephone}) => {
             education,
             wage,
             workplace,
-      telephone
+            telephone,
+            workExperience
         },
     });
 };

api/userrecruit.js

@@ -136,7 +136,7 @@ export const cancelUserInvite = (params) => request({
     params
 })
 export const getDeptAllTree = (params) => request({
-    url: '/api/jobslink-api/system/dept/all-tree',
+    url: '/api/jobslink-api/system/dept/town-tree',
     method: 'get',
     params
 })

components/companyList/companyList.vue

@@ -111,7 +111,7 @@
                     lon,
                     lat
                 } = item
-                if (this.position && lon) {
+                if (this.position && lon > 0) {
                     const {
                         longitude,
                         latitude

components/companyList/workList.vue

@@ -115,7 +115,7 @@
                     lon,
                     lat
                 } = item
-                if (this.position && lon) {
+                if (this.position && lon > 0) {
                     const {
                         longitude,
                         latitude

components/custom-popup/custom-popup.vue

@@ -0,0 +1,128 @@
+<template>
+    <view v-if="visible" class="tianditu-popop"
+        :style="{ height: (winHeight)+ 'px',width: winWidth+'px',top: winTop+'px'}">
+        <view class="popup-header" @click="close">
+            <slot name="header"></slot>
+        </view>
+        <view :style="{ minHeight: (contentHeight)+ 'vh'}" class="popup-content fadeInUp animated">
+            <slot></slot>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'custom-popup',
+        data() {
+            return {
+                winWidth: 0,
+                winHeight: 0,
+                winTop: 0,
+                contentHeight: 30,
+            }
+        },
+        props: {
+            visible: {
+                type: Boolean,
+                require: true,
+                default: false
+            },
+            hide: {
+                type: Number,
+                default: 0
+            },
+            contentH: {
+                type: Number,
+                default: 30
+            }
+        },
+        created() {
+            var that = this
+            if (this.contentH) {
+                this.contentHeight = this.contentH
+            }
+            uni.getSystemInfo({
+                success: function(res) {
+                    if (that.hide === 0) {
+                        that.winWidth = res.screenWidth
+                        that.winHeight = res.screenHeight
+                        that.winTop = 0
+                    } else {
+                        that.winWidth = res.windowWidth
+                        that.winHeight = res.windowHeight
+                        that.winTop = res.windowTop
+                    }
+
+                }
+            });
+        },
+        methods: {
+            close(e) {
+                this.$emit('onClose')
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .tianditu-popop {
+        position: fixed;
+        left: 0;
+        z-index: 403;
+        background-color: rgba(0, 0, 0, 0.6);
+        display: flex;
+        flex-direction: column;
+    }
+
+    .popup-header {
+        flex: 1;
+    }
+
+    .popup-content {
+        background-color: #FFFFFF;
+        min-height: 300px;
+        width: 100%;
+        /*     position: absolute;
+        bottom: 0;
+        left: 0; */
+    }
+
+    /*base code*/
+    .animated {
+        -webkit-animation-duration: 1s;
+        animation-duration: 1s;
+        -webkit-animation-fill-mode: both;
+        animation-fill-mode: both;
+    }
+
+    .animated.infinite {
+        -webkit-animation-iteration-count: infinite;
+        animation-iteration-count: infinite;
+    }
+
+    .animated.hinge {
+        -webkit-animation-duration: 2s;
+        animation-duration: 2s;
+    }
+
+    @keyframes fadeInUp {
+        0% {
+            opacity: 0;
+            -webkit-transform: translate3d(0, 100%, 0);
+            -ms-transform: translate3d(0, 100%, 0);
+            transform: translate3d(0, 100%, 0)
+        }
+
+        100% {
+            opacity: 1;
+            -webkit-transform: none;
+            -ms-transform: none;
+            transform: none
+        }
+    }
+
+    .fadeInUp {
+        -webkit-animation-name: fadeInUp;
+        animation-name: fadeInUp
+    }
+</style>

components/uMapView/uMapView.vue

@@ -185,7 +185,7 @@
                         latitude: lat,
                         longitude: lon,
                         iconPath: mypoint,
-                        title: '我的位置',
+                        title: '',
                         width: 20,
                         height: 20
                     }])

config.js

@@ -3,7 +3,7 @@ module.exports = {
     // 图片地址
     imageUrl: '',
     // 天地图tk
-    apiKey: 'e122b0518f43b32dcc256edbae20a5d1',
+    apiKey: 'e4266a5e84fe6c10f60c559967f0a03f',
     // 显示标题
     showTitle: false,
     // map 1、黑色模块 2、白色模块

pageMy/my/resume/index.vue

@@ -95,18 +95,73 @@
                     placeholder="请输入您的电话" border="none" clearable></u--input>
             </view>
         </view>
+        <view class="workexperience">
+            工作经历
+            <view class="workexperience-right" @click="cardaddshow = true; gzInfo = {}">+</view>
+        </view>
+        <view class="border"></view>
+        <view class="card" v-for="(item, index) in gzList" :key="index" @click="updataGz(item)"
+            @longtap="removeGz(item)">
+            <view class="card-title">
+                {{item.name}}
+                <view class="card-right">{{item.stime}}-{{item.etime}}</view>
+            </view>
+            <view class="card-subTitle">
+                <view class="card-sub1">{{item.work}}</view>
+                <view class="card-sub1">{{item.department}}</view>
+            </view>
+            <view class="card-content">
+                {{item.content}}
+            </view>
+        </view>
+        <custom-popup :content-h="100" :visible="cardaddshow" :hide="0" @onClose="cardaddshow = false; gzInfo = {}">
+            <view class="s-header">
+                <view class="heade-lf" @click="cardaddshow = false; gzInfo = {}">取消</view>
+                <view class="heade-ri" @click="confimPopup1">确认</view>
+            </view>
+            <u--form style="padding: 6px 14px;" labelPosition="left" :model="gzInfo" ref="form1">
+                <u-form-item label="企业名称:" labelWidth="80" prop="name" borderBottom>
+                    <u--input v-model="gzInfo.name" placeholder="请输入企业名称"></u--input>
+                </u-form-item>
+                <u-form-item label="工作岗位:" labelWidth="80" prop="work" borderBottom>
+                    <u--input v-model="gzInfo.work" placeholder="请输入工作岗位"></u--input>
+                </u-form-item>
+                <u-form-item label="开始时间" labelWidth="80" prop="stime" borderBottom
+                    @click="showStime = true; hideKeyboard()" ref="item1">
+                    <u--input v-model="gzInfo.stime" disabledColor="#ffffff" placeholder="请选择开始时间"
+                        border="none"></u--input>
+                    <u-icon slot="right" name="arrow-right"></u-icon>
+                </u-form-item>
+                <u-form-item label="结束时间" labelWidth="80" prop="etime" borderBottom
+                    @click="showEtime = true; hideKeyboard()" ref="item2">
+                    <u--input v-model="gzInfo.etime" disabledColor="#ffffff" placeholder="请选择结束时间"
+                        border="none"></u--input>
+                    <u-icon slot="right" name="arrow-right"></u-icon>
+                </u-form-item>
+                <u-form-item label="部门:" labelWidth="80" prop="department" borderBottom>
+                    <u--input v-model="gzInfo.department" placeholder="请输入部门"></u--input>
+                </u-form-item>
+                <u-form-item label="工作内容:" labelWidth="70" prop="content" borderBottom>
+                    <u--textarea v-model="gzInfo.content" placeholder="请输入工作内容"></u--textarea>
+                </u-form-item>
+            </u--form>
+        </custom-popup>
+
 
         <view v-if="isShowButton" class="saveWrapper">
             <u-button @click="subMitResume" type="primary" shape="circle" text="保存"></u-button>
         </view>
 
-        <view class="border"></view>
 
         <u-picker @confirm="pickerButtonFunc" @cancel="showPicker = false" :show="showPicker" :columns="columns"
             keyName="label"></u-picker>
 
         <u-toast ref="uToast"></u-toast>
 
+        <u-datetime-picker :show="showStime" :value="birthday" mode="date" closeOnClickOverlay @confirm="stimeConfirm"
+            @cancel="stimeClose" @close="stimeClose"></u-datetime-picker>
+        <u-datetime-picker :show="showEtime" :value="birthday" mode="date" closeOnClickOverlay @confirm="etimeConfirm"
+            @cancel="etimeClose" @close="etimeClose"></u-datetime-picker>
         <!-- 省市 -->
         <data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
             @close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
@@ -129,14 +184,32 @@
     } from '@/api/resume.js';
     import mSlideList from '@/components/mark-slide-list/mark-slide-list.vue';
     import controller from '@/components/mark-slide-list/controller';
-
+    import customPopup from '@/components/custom-popup/custom-popup.vue'
+    import {
+        cloneDeep,
+        forIn
+    } from 'lodash';
+    const validateForm = {
+        name: '请输入企业名称',
+        work: '请输入工作岗位',
+        stime: '请输入开始时间',
+        etime: '请选择结束时间',
+        department: '请输入部门',
+        content: '请输入工作内容',
+    }
     export default {
         components: {
-            mSlideList
+            mSlideList,
+            customPopup
         },
         data() {
             return {
                 controller: new controller(),
+                cardaddshow: false,
+                showStime: false,
+                showEtime: false,
+                gzInfo: {},
+                gzList: [],
                 myResume: {
                     city: {},
                     education: {},
@@ -156,12 +229,11 @@
                 columns: [
                     []
                 ],
-
                 canSubMit: false,
                 isShowButton: false,
                 isShowBorder: false,
                 isShowAddSkill: true,
-
+                birthday: Number(new Date()),
                 areaModal: {
                     address: '',
                     addressShow: false,
@@ -196,9 +268,70 @@
             }
         },
         methods: {
+            removeGz(item) {
+                const that = this
+                uni.showModal({
+                    content: '删除该条工作经历?',
+                    success(res) {
+                        if (res.confirm) {
+                            that.isShowButton = true
+                            that.gzList = that.gzList.filter((vItem) => item.id !== vItem.id)
+                        }
+                    },
+
+                })
+            },
+            updataGz(item) {
+                this.cardaddshow = true
+                this.gzInfo = item
+            },
+            confimPopup1() {
+                const copy = cloneDeep(this.gzInfo)
+                const keys = Object.keys(validateForm)
+                console.log(keys, copy)
+                for (let i = 0; i < keys.length; i++) {
+                    if (!copy[keys[i]]) {
+                        return this.$api.msg(validateForm[keys[i]])
+                    }
+                }
+                if (copy.id) {
+                    this.gzList = this.gzList.map((item) => {
+                        if (item.id === copy.id) {
+                            return copy
+                        } else {
+                            return item
+                        }
+                    })
+                } else {
+                    copy.id = Date.now()
+                    this.gzList.push(copy)
+                }
+                this.isShowButton = true
+                this.cardaddshow = false
+            },
+            stimeClose() {
+                this.showStime = false
+            },
+            stimeConfirm(e) {
+                this.showStime = false
+                this.gzInfo.stime = uni.$u.timeFormat(e.value, 'yyyy.mm.dd')
+            },
+            etimeClose() {
+                this.showStime = false
+            },
+            etimeConfirm(e) {
+                this.showEtime = false
+                this.gzInfo.etime = uni.$u.timeFormat(e.value, 'yyyy.mm.dd')
+            },
+            hideKeyboard() {
+                uni.hideKeyboard()
+            },
             getResume() {
                 myResume().then(res => {
                     const data = res.data.data
+                    if (data.workExperience) {
+                        this.gzList = JSON.parse(data.workExperience)
+                    }
                     this.myResume = {
                         city: {
                             workplace: data.workplace
@@ -381,6 +514,7 @@
                 // 中国大陆座机号码正则表达式
                 const landlineRegex = /\b(0\d{2,3}-\d{7,8}(-\d{1,4})?)\b/;
 
+                const workList = JSON.stringify(this.gzList)
 
                 if (mobileRegex.test(phone) || landlineRegex.test(phone)) {
                     // 电话号码格式正确
@@ -390,7 +524,8 @@
                         education: education.label,
                         workplace: city.workplace ? city.workplace : city.parentLabel + '-' + city.label,
                         telephone: phone,
-                        wage
+                        wage,
+                        workExperience: workList
                     }).then(res => {
                         this.isShowButton = false;
                         this.getResume()
@@ -421,6 +556,121 @@
     }
 </script>
 
+<style lang="scss" scoped>
+    .s-header {
+        display: flex;
+        justify-content: space-between;
+        text-align: center;
+        font-size: 13px;
+        padding: 10px 14px 0 14px;
+
+        .heade-lf {
+            line-height: 24px;
+            width: 38px;
+            height: 24px;
+            border-radius: 4px;
+            border: 1px solid #666666;
+            color: #666666;
+        }
+
+        .heade-ri {
+            line-height: 24px;
+            width: 38px;
+            height: 24px;
+            border-radius: 4px;
+            border: 1px solid #57ff36;
+            background-color: #57ff36;
+            color: #FFFFFF;
+        }
+    }
+
+    .workexperience {
+        font-weight: bold;
+        padding: 14px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+
+        .workexperience-right {
+            border-radius: 50%;
+            width: 16px;
+            height: 16px;
+            line-height: 13px;
+            text-align: center;
+            font-size: 20px;
+            color: #666666;
+            border: 1px solid #666666;
+        }
+    }
+
+    .card {
+        display: flex;
+        flex-direction: column;
+        padding: 14px;
+
+
+        .card-title {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            font-size: 16px;
+
+            .card-right {
+                font-size: 12px;
+                color: #666666;
+                position: relative;
+                padding: 0 10px;
+                text-wrap: nowrap;
+            }
+
+            .card-right::after {
+                position: absolute;
+                content: '';
+                right: 0;
+                top: 5px;
+                width: 6px;
+                height: 6px;
+                border-top: 1px solid #666666;
+                border-right: 1px solid #666666;
+                transform: rotate(45deg);
+            }
+
+            .card-right:active {
+                color: #e8e8e8;
+            }
+        }
+
+        .card-subTitle {
+            margin-top: 6px;
+            display: flex;
+            justify-content: flex-start;
+            font-size: 12px;
+            color: #666666;
+
+            .card-sub1 {
+                margin-right: 10px;
+            }
+        }
+
+        .card-content {
+            margin-top: 4px;
+            font-size: 13px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            display: -webkit-box;
+            -webkit-line-clamp: 3;
+            -webkit-box-orient: vertical;
+            color: #666666;
+            text-indent: 2em;
+            border-bottom: 1rpx solid #f2f2f2;
+        }
+    }
+
+    .card:active {
+        background-color: #f2f2f2;
+    }
+</style>
 <style>
     .border {
         margin-left: 30rpx;

pages/project/userrecruitList.vue

@@ -103,6 +103,24 @@
             }
         },
         methods: {
+            distance(item) {
+                const {
+                    lon,
+                    lat
+                } = item
+                if (this.position && lon > 0) {
+                    const {
+                        longitude,
+                        latitude
+                    } = this.position
+                    const {
+                        m,
+                        km
+                    } = getDistanceFromLatLonInKm(lat, lon, latitude, longitude)
+                    return m > 1000 ? `${km.toFixed(2)}km` : `${m.toFixed(2)}m`
+                }
+                return '--km'
+            },
             goComment: function(no) {
                 uni.navigateTo({
                     url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`

pages/projectInfo/projectInfo.vue

@@ -95,10 +95,10 @@
                 用工单位地址：{{info.companyAddress || '暂无'}}
             </view> -->
             <view class="prolist">
-                工作地址：{{info.cityId || '暂无'}}
+                注册地址：{{info.cityId || '暂无'}}
             </view>
             <view class="prolist">
-                详细地址：{{info.address || '暂无'}}
+                工作地址：{{info.address || '暂无'}}
             </view>
             <view class="map">
                 <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
@@ -337,10 +337,13 @@
                     // self.longitude = self.info.lon;
                     // self.covers[0].latitude = self.info.lat;
                     // self.covers[0].longitude = self.info.lon;
+                    if (!(self.info.lat && self.info.lat === -1)) {
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
                         })
+                    }
+
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {

pages/projectInfo/userrecruitInfo.vue

@@ -98,10 +98,10 @@
 		        公司地址：{{info.companyAddress || '暂无'}}
 		    </view> -->
             <view class="prolist">
-                工作地址：{{info.cityId || '暂无'}}
+                注册地址：{{info.cityId || '暂无'}}
             </view>
             <view class="prolist">
-                详细地址：{{info.address || '暂无'}}
+                工作地址：{{info.address || '暂无'}}
             </view>
             <view class="map">
                 <!-- <seeLocation ref="cMap" :apikey="$config.apiKey"></seeLocation> -->
@@ -336,10 +336,12 @@
                     self.longitude = self.info.lon;
                     self.covers[0].latitude = self.info.lat;
                     self.covers[0].longitude = self.info.lon;
+                    if (!(self.info.lat && self.info.lat === -1)) {
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
                         })
+                    }
                     // this.$refs.cMap.open()
                     self.showDetail = true;
                     if (!this.seeDeatil) {

pages/projectInfo/userrecruitWorkInfo.vue

@@ -103,10 +103,10 @@
         		座机号：{{info.callNumber}}
         	</view> -->
             <view class="prolist">
-                工作地址：{{ info.cityId || '暂无'}}
+                注册地址：{{ info.cityId || '暂无'}}
             </view>
             <view class="prolist">
-                详细地址：{{info.address || '暂无'}}
+                工作地址：{{info.address || '暂无'}}
             </view>
             <view class="map">
                 <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
@@ -338,10 +338,12 @@
                     self.longitude = self.info.lon;
                     self.covers[0].latitude = self.info.lat;
                     self.covers[0].longitude = self.info.lon;
+                    if (!(self.info.lat && self.info.lat === -1)) {
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
                         })
+                    }
                     self.showDetail = true;
                     if (!this.seeDeatil) {
                         self.getCollectStatus();

pages/projectInfo/workInfo.vue

@@ -100,10 +100,10 @@
 				座机号：{{info.callNumber}}
 			</view> -->
             <view class="prolist">
-                工作地址：{{ info.cityId || '暂无'}}
+                注册地址：{{ info.cityId || '暂无'}}
             </view>
             <view class="prolist">
-                详细地址：{{info.address || '暂无'}}
+                工作地址：{{info.address || '暂无'}}
             </view>
             <view class="map">
                 <super-map ref="uMap" style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude"
@@ -320,10 +320,12 @@
                     self.longitude = self.info.lon;
                     self.covers[0].latitude = self.info.lat;
                     self.covers[0].longitude = self.info.lon;
+                    if (!(self.info.lat && self.info.lat === -1)) {
                         self.$refs.uMap.initMap({
                             lat: self.info.lat,
                             lon: self.info.lon,
                         })
+                    }
                     self.showDetail = true;
                     self.getCollectStatus();
                     if (self.type === 1) {

pages/recruit/components/userrecruitList.vue

@@ -53,7 +53,7 @@
 			</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>{{distance(companyitem)}}</view>
             </view>
         </view>
         <view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
@@ -76,7 +76,9 @@
         dateFormat
     } from "../../../untils/format.js";
     import dictionary from '@/common/textdata.js';
-
+    import {
+        getDistanceFromLatLonInKm
+    } from '@/untils/tools.js'
     export default {
         beforeCreate: function() {},
         props: {
@@ -97,6 +99,9 @@
             near: {
                 type: Boolean,
                 default: false
+            },
+            position: {
+                default: null
             }
         },
         data() {
@@ -113,6 +118,24 @@
             }
         },
         methods: {
+            distance(item) {
+                const {
+                    lon,
+                    lat
+                } = item
+                if (this.position && lon > 0) {
+                    const {
+                        longitude,
+                        latitude
+                    } = this.position
+                    const {
+                        m,
+                        km
+                    } = getDistanceFromLatLonInKm(lat, lon, latitude, longitude)
+                    return m > 1000 ? `${km.toFixed(2)}km` : `${m.toFixed(2)}m`
+                }
+                return '--km'
+            },
             getReviewState(type) {
                 switch (type) {
                     case 1:

pages/recruit/subPage/index.vue

@@ -10,38 +10,36 @@
         <view class="condition">
             <view class="cond_list" v-if="pageType === 'enterprise'">
                 <view v-for="(item, index) in arrTitle" :key="index"
-                :class="['cond_item', index === currentArrTitleID ? 'activeButton' : '']"
+                    :class="['cond_item', index === currentArrTitleID ? 'activeButton' : '']" @click="changeTab(item)">
-                @click="changeTab(item)">
                     {{ item.text }}
                 </view>
             </view>
             <view class="cond_list" v-else>
                 <view style="font-weight: 700;">个体户招工</view>
             </view>
-            <view 
+            <view class="cond_item item_com" @click="openPicker = true">{{ reviewStatus[currentReviewStatusID] }}</view>
-                class="cond_item item_com"
-                @click="openPicker = true"
-            >{{ reviewStatus[currentReviewStatusID] }}</view>
         </view>
         <view class="container" v-if="dataSource.length">
             <block v-for="(item, index) in dataSource" :key="item.id">
-            	<userrecruitList :companyitem="item"></userrecruitList>
+                <userrecruitList :companyitem="item" :position="userLocation"></userrecruitList>
             </block>
         </view>
         <empty v-else content="暂无数据" mr-top="200"></empty>
         <CustomTabbar :currentpage="0"></CustomTabbar>
-        <u-picker :show="openPicker" :columns="pickerColumns" @cancel="openPicker = false" @confirm="changeReviewStatus"></u-picker>
+        <u-picker :show="openPicker" :columns="pickerColumns" @cancel="openPicker = false"
+            @confirm="changeReviewStatus"></u-picker>
     </view>
 </template>
 
 <script>
     import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
     import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue';
-    import { getuserrecruitListApp } from '@/api/userrecruit.js'
+    import {
+        getuserrecruitListApp
+    } from '@/api/userrecruit.js'
     import userrecruitList from '../components/userrecruitList.vue'
     let arrGuide = ['在线填写招工需求', '后台审核沟通发布', '平台展示招工信息'];
-    let arrTitle = [
+    let arrTitle = [{
-        {
             text: "发布零工岗位",
             id: 0
         }, {
@@ -54,15 +52,22 @@
         //       }
     ];
     let reviewStatus = {
-		'-1': "全选择",
+        '-1': "全部",
         '0': "待审核",
         '1': "已审核",
         '9': "已驳回",
     };
     let pickerColumns = [Object.values(reviewStatus)]
-    import { mapState } from 'vuex'
+    import {
+        mapState,
+        mapGetters
+    } from 'vuex'
     export default {
-        components: {CustomTabbar, CustomNavbar, userrecruitList},
+        components: {
+            CustomTabbar,
+            CustomNavbar,
+            userrecruitList
+        },
         data() {
             return {
                 pageType: null, // null： 个人 enterprise： 企业
@@ -77,8 +82,10 @@
                 dataSource: [],
             }
         },
-        onLoad({type}) {
+        onLoad({
-            if(this.enterprise){
+            type
+        }) {
+            if (this.enterprise) {
                 this.pageType = 'enterprise'
                 this.currentArrTitleID = 0
             }
@@ -88,10 +95,17 @@
             this.getList('add')
         },
         computed: {
-            ...mapState({enterprise: (state) => state.user.seeEnterprise}),
+            ...mapState({
+                enterprise: (state) => state.user.seeEnterprise
+            }),
+            ...mapGetters(['userLocation']),
         },
         methods: {
-            changeReviewStatus({value, index, values}) {
+            changeReviewStatus({
+                value,
+                index,
+                values
+            }) {
                 const val = Object.keys(reviewStatus).filter((item) => reviewStatus[item] === value[0])[0]
                 this.currentReviewStatusID = val
                 this.openPicker = false
@@ -102,7 +116,9 @@
                 this.getList('refresh')
             },
             back() {
-                uni.reLaunch({ url: '/pages/my/my' })
+                uni.reLaunch({
+                    url: '/pages/my/my'
+                })
             },
             async getList(type = "add") {
                 if (type === "refresh") {
@@ -114,14 +130,21 @@
                     size: 10,
                     jobType: this.currentArrTitleID,
                 }
-                if(this.currentReviewStatusID !== '-1') {
+                if (this.currentReviewStatusID !== '-1') {
                     params.reviewState = this.currentReviewStatusID
                 }
-                uni.showLoading({title: '加载中...' })
+                uni.showLoading({
+                    title: '加载中...'
+                })
                 let resData = await getuserrecruitListApp(params);
                 uni.hideLoading()
                 if (resData.data?.code === 200) {
-                   const { records, total, page, size } = resData.data.data;
+                    const {
+                        records,
+                        total,
+                        page,
+                        size
+                    } = resData.data.data;
                     if (!records.length) {
                         return this.$api.msg("没有更多数据");
                     }
@@ -142,15 +165,16 @@
 </script>
 
 <style lang="scss" scoped>
- 
+    .app_container {
-    .app_container{
         background-color: #f3f4f8;
         min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-        .container{
+
+        .container {
             padding: 0 23rpx;
             padding-bottom: calc(env(safe-area-inset-bottom) + 123rpx)
         }
-        .condition{
+
+        .condition {
             display: flex;
             flex-wrap: nowrap;
             padding: 20rpx;
@@ -159,13 +183,15 @@
             top: 78rpx;
             z-index: 999;
             background-color: #f3f4f8;
-            .cond_list{
+
+            .cond_list {
                 display: flex;
                 flex-wrap: nowrap;
                 flex: 1;
                 // justify-content: space-between;
             }
-            .cond_item{
+
+            .cond_item {
                 font-size: 14px;
                 padding: 10rpx 40rpx;
                 background: #fff;
@@ -173,16 +199,19 @@
                 margin-right: 10rpx;
                 white-space: nowrap;
             }
+
             .activeButton {
                 color: #4171f9;
                 background-color: #cfdaf8;
             }
-            .item_com{
+
+            .item_com {
                 margin-right: 0;
                 padding: 10rpx 20rpx;
             }
         }
-        .guide{
+
+        .guide {
             padding: 20rpx;
             display: flex;
             align-items: center;
@@ -191,22 +220,24 @@
             color: #FFFFFF;
             font-size: 28rpx;
             background-color: #4071f8;
-            .guide_content{
+
+            .guide_content {
                 display: flex;
                 align-items: center;
-                .guide_item{
+
+                .guide_item {
                     width: 160rpx;
                     text-align: center;
                     background-color: rgba(76, 120, 249, 1);
                     border-radius: 10rpx;
                     padding: 10rpx;
                 }
-                .guide_arrow{
+
+                .guide_arrow {
                     margin-left: 40rpx;
                 }
             }
 
         }
     }
-    
 </style>

pages/recruit/subPage/task.vue

@@ -125,14 +125,17 @@
                 <u-form-item label="座机" prop="callNumber" borderBottom labelWidth="80" ref="item1">
                     <u--input v-model="info.callNumber" border="none" placeholder="请输入座机"></u--input>
                 </u-form-item>
-                <u-form-item label="工作地址" labelWidth="70" prop="cityId" borderBottom ref="item1"
+                <u-form-item label="注册地址" labelWidth="70" prop="cityId" borderBottom ref="item1"
                     @click="showCityId = true; hideKeyboard()">
-                    <PickerTree placeholder="请选择工作地址" :tree="area.data" valueName="value" :visibel="showCityId"
+                    <PickerTree placeholder="请选择注册地址" :tree="area.data" valueName="value" :visibel="showCityId"
                         v-model="info.cityId" @cancel="showCityId = false" border="none" returnValue="label" :deep="3">
                     </PickerTree>
                 </u-form-item>
-                <u-form-item label="详细地址" prop="address" borderBottom labelWidth="80" ref="item1">
+                <u-form-item label="工作地址" prop="address" borderBottom labelWidth="80" ref="item1">
-                    <view class="addressinfo" @click="selectMap">{{info.address}}</view>
+                    <view class="addressinfo" @click="selectMap"
+                        :style="`fontSize: 15px;color: ${info.address ? '#333333' : '#c0c4cc'}`">
+                        {{info.address || '请选择'}}
+                    </view>
                     <!--  <textarea placeholder-style="color: rgb(192, 196, 204); fontSize: 15px" @focus="selectMap"
                         v-model="info.address" placeholder="请输入详细地址" style="width: 100%;" /> -->
                     <!-- <lin-select :list="addressOptions" value-key="location" name-key="title" max-height="180"
@@ -354,7 +357,7 @@
                     cityId: {
                         type: 'string',
                         required: true,
-                        message: '请选择工作地址',
+                        message: '请选择注册地址',
                         trigger: ['change']
                     },
                     jobCompanyName: {
@@ -402,7 +405,7 @@
                     address: {
                         type: 'string',
                         required: true,
-                        message: '请输入详细地址',
+                        message: '请输入工作地址',
                         trigger: ['change']
                     },
                     createDept: {

pages/recruit/subPage/work.vue

@@ -131,12 +131,15 @@
                 </u-form-item>
                 <u-form-item label="工作地址" labelWidth="70" prop="cityId" borderBottom ref="item1"
                     @click="showCityId = true; hideKeyboard()">
-                    <PickerTree placeholder="请选择工作地址" :tree="area.data" valueName="value" :visibel="showCityId"
+                    <PickerTree placeholder="请选择注册地址" :tree="area.data" valueName="value" :visibel="showCityId"
                         v-model="info.cityId" @cancel="showCityId = false" border="none" returnValue="label" :deep="3">
                     </PickerTree>
                 </u-form-item>
                 <u-form-item label="详细地址" prop="address" borderBottom labelWidth="80" ref="item1">
-                    <view class="addressinfo" @click="selectMap">{{info.address}}</view>
+                    <view class="addressinfo" @click="selectMap"
+                        :style="`fontSize: 15px;color: ${info.address ? '#333333' : '#c0c4cc'}`">
+                        {{info.address || '请选择'}}
+                    </view>
                     <!-- <u--input v-model="info.address" border="none" placeholder="请输入详细地址"></u--input> -->
                 </u-form-item>
                 <!--   <view class="map">
@@ -343,7 +346,7 @@
                     cityId: {
                         type: 'string',
                         required: true,
-                        message: '请选择工作地址',
+                        message: '请选择注册地址',
                         trigger: ['change']
                     },
                     jobCompanyName: {
@@ -391,7 +394,7 @@
                     address: {
                         type: 'string',
                         required: true,
-                        message: '请输入详细地址',
+                        message: '请输入工作地址',
                         trigger: ['change']
                     },
                     createDept: {

pages/user/policyContent.vue

@@ -23,7 +23,9 @@
                 // #endif
                 // this.strings=decodeURIComponent(option.val) ;
                 getPolicyContent(1, option.id).then(res => {
+                    if (res.data.data.records.length) {
                         this.strings = res.data.data.records[0].note
+                    }
                 })
             }
         },